From 5d47d62da16ab76d43518f33329f388ebae5999f Mon Sep 17 00:00:00 2001
From: risiko79 <>
Date: Mon, 28 Mar 2016 14:28:21 +0000
Subject: [PATCH] 98_weekprofile: handle references

git-svn-id: https://svn.fhem.de/fhem/trunk@11138 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED                |  1 +
 fhem/FHEM/98_weekprofile.pm | 35 +++++++++++++++++++----------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index c30acce6f..2dd8becb0 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,5 +1,6 @@
 # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
 # Do not insert empty lines here, update check depends on it.
+  - bugfix:  98_weekprofile: send reference profile to device
   - feature: 10_pilight_ctrl | 30_pilight_switch: support protocol daycom 
   - feature: 59_Weather: rewritten to use JSON API
   - bugfix:  49_SSCAM: "link_open" doesn't work after last update
diff --git a/fhem/FHEM/98_weekprofile.pm b/fhem/FHEM/98_weekprofile.pm
index f2227dbe5..1e41bd4b9 100644
--- a/fhem/FHEM/98_weekprofile.pm
+++ b/fhem/FHEM/98_weekprofile.pm
@@ -193,7 +193,9 @@ sub weekprofile_sendDevProfile(@)
 {
   my ($device,$prf,$me) = @_;
   my $type = weekprofile_getDeviceType($device,"SND");
-  return "Error device type not supported" if (!defined ($type));
+  
+  return "Error device type not supported" if (!defined ($type));  
+  return "profile has no data" if (!defined($prf->{DATA}));
 
   if ($type eq "WEEKPROFILE") {
       my $json = JSON->new;
@@ -472,14 +474,9 @@ sub weekprofile_Get($$@)
     
     my ($topic, $name) = weekprofile_splitName($params[0]);
 
-    my ($prf,$idx) = weekprofile_findPRF($hash,$name,$topic);
-    return "profile $params[0] not found" if (!defined($prf));
-
-    if (defined($prf->{REF})) {
-      ($topic, $name) = weekprofile_splitName($prf->{REF});
-      ($prf,$idx) = weekprofile_findPRF($hash,$name,$topic);
-    }
+    my ($prf,$idx) = weekprofile_findPRF($hash,$name,$topic,1);
     
+    return "profile $params[0] not found" if (!defined($prf));    
     return "profile $params[0] has no data" if (!defined($prf->{DATA}));
     
     my $json = JSON->new;
@@ -518,7 +515,7 @@ sub weekprofile_Get($$@)
       $refs = substr($refs, 0, -1);
     } else {
       my ($topic, $name) = weekprofile_splitName($params[0]);
-      my ($prf,$idx) = weekprofile_findPRF($hash,$name,$topic);
+      my ($prf,$idx) = weekprofile_findPRF($hash,$name,$topic,0);
       return "profile $params[0] not found" unless ($prf);
       $refs = '0';
       $refs = "$prf->{REF}" if ($prf->{REF});
@@ -551,11 +548,12 @@ sub weekprofile_Get($$@)
   return "Unknown argument $cmd choose one of $list"; 
 }
 ############################################## 
-sub weekprofile_findPRF(@)
+sub weekprofile_findPRF($$$$)
 {
-  my ($hash, $name, $topic) = @_;
+  my ($hash, $name, $topic, $followRef) = @_;
   
-  $topic = 'default' if (!$topic);
+  $topic      = 'default' if (!$topic);
+  $followRef  = '0'       if (!$followRef);
   
   my $found = undef;
   my $idx = 0;
@@ -569,6 +567,11 @@ sub weekprofile_findPRF(@)
   }
   $idx = -1 if (!defined($found));
   
+  if ($followRef == 1 && defined($found) && defined($found->{REF})) {
+    ($topic, $name) = weekprofile_splitName($found->{REF});
+    ($found,$idx) = weekprofile_findPRF($hash,$name,$topic,0);
+  }
+  
   return ($found,$idx);
 }
 ############################################## 
@@ -623,7 +626,7 @@ sub weekprofile_Set($$@)
       return "Error parsing profile data. No valid json format";
     };
     
-    my ($found,$idx) = weekprofile_findPRF($hash,$name,$topic);
+    my ($found,$idx) = weekprofile_findPRF($hash,$name,$topic,1);
     if (defined($found)) {
       $found->{DATA} = $data;
       # automatic we send master profile to master device
@@ -664,7 +667,7 @@ sub weekprofile_Set($$@)
     
     return "Error no devices given and no master device" if (@devices == 0);
     
-    my ($found,$idx) = weekprofile_findPRF($hash,$name,$topic);
+    my ($found,$idx) = weekprofile_findPRF($hash,$name,$topic,1);
     if (!defined($found)) {
       Log3 $me, 1, "$me(Set): Error unknown profile $params[0]";
       return "Error unknown profile $params[0]";
@@ -761,7 +764,7 @@ sub weekprofile_Set($$@)
     
      return "Error topics not enabled" if (!$useTopics && ($topic ne 'default'));
     
-    my ($delprf,$idx)  = weekprofile_findPRF($hash,$name,$topic);
+    my ($delprf,$idx)  = weekprofile_findPRF($hash,$name,$topic,0);
     return "Error unknown profile $params[0]" unless($delprf);
     my $ref = weekprofile_hasREF($hash,$delprf);
     return "Error profile $params[0] is referenced from $ref" if ($ref);
@@ -787,7 +790,7 @@ sub weekprofile_Set($$@)
       
       Log3 $me, 5, "$me(Set): found device $dev->{NAME}";
       
-      my ($prf,$idx)  = weekprofile_findPRF($hash,$prfName,$topic);
+      my ($prf,$idx)  = weekprofile_findPRF($hash,$prfName,$topic,1);
       next if (!defined($prf));
       
       Log3 $me, 4, "$me(Set): Send profile $topic:$prfName to $dev->{NAME}";