From e03d9074a16585f5399109139a031bc24e4d4188 Mon Sep 17 00:00:00 2001
From: parix <>
Date: Tue, 13 Apr 2010 19:18:33 +0000
Subject: [PATCH] Bugfixes IODEVSTATS

git-svn-id: https://svn.fhem.de/fhem/trunk@617 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/contrib/rrd/95_RRD_Log.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/fhem/contrib/rrd/95_RRD_Log.pm b/fhem/contrib/rrd/95_RRD_Log.pm
index ebbb91ffb..71b9f711b 100644
--- a/fhem/contrib/rrd/95_RRD_Log.pm
+++ b/fhem/contrib/rrd/95_RRD_Log.pm
@@ -4,8 +4,8 @@
 # Feedback: http://groups.google.com/group/fhem-users 
 # Logging to RRDs
 # Autor: a[PUNKT]r[BEI]oo2p[PUNKT]net
-# Stand: 26.01.2010
-# Version: 0.5.0
+# Stand: 13.04.2010
+# Version: 0.9.0
 #*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA
 #######################################################################
 #*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA*BETA
@@ -103,7 +103,7 @@ RRD_Log_Initialize($)
   # IODEVSTATS=CUL_RFR
   $data{RRD_LOG}{READING}{CUL_RFR}{'msg'} = "RRD_Log_5minCOUNTER";
   $data{RRD_LOG}{READING}{CUL_RFR}{'rssi'} = "RRD_Log_5minGAUGE";
-  $data{RRD_LOG}{READING}{CUL_RFR}{'RAWMSGCOUNT'} = "RRD_Log_5minGAUGE";
+  $data{RRD_LOG}{READING}{CUL_RFR}{'RAWMSGCOUNT'} = "RRD_Log_5minGAUGE";
   #WBS
   $data{RRD_LOG}{READING}{WBS}{'Temperature'} = "RRD_Log_5minGAUGE";
   # temp. save Path to RRDs
@@ -336,7 +336,7 @@ sub RRD_Log_disptach_reading($$$) {
     my $changed_device_type = $defs{$changed_device}{TYPE};
     #CUL-Weiche
     if($changed_device_type eq "CUL" && $changed_device_type eq "FHZ" && $changed_device_type eq "CUL_RFR"){
-    if(!defined($data{RRD_LOG}{READING}{$changed_device_type}{$changed_reading})) {
+    if(!defined($data{RRD_LOG}{READING}{$changed_device_type})) {
         Log $ll, "RRDLOG|Disptach|CUL_WEICHE: $changed_device Type $changed_device_type not configured";
         return undef;}
     }
@@ -376,7 +376,7 @@ sub RRD_Log_disptach_reading($$$) {
     no strict "refs";
     
     my $rrd_create_func;
-    if($changed_device_type eq "CUL" && $changed_device_type eq "FHZ" && $changed_device_type eq "CUL_RFR"){
+    if($changed_device_type eq "CUL" || $changed_device_type eq "FHZ" || $changed_device_type eq "CUL_RFR"){
         my $cul_reading;
         if(lc($changed_reading) =~ m/_rssi$/){$cul_reading = "rssi";}
         if(lc($changed_reading) =~ m/_msg$/){$cul_reading = "msg";}
@@ -386,7 +386,7 @@ sub RRD_Log_disptach_reading($$$) {
         }
     else {$rrd_create_func =  $data{RRD_LOG}{READING}{$changed_device_type}{$changed_reading};}
     if(!defined($rrd_create_func)){
-      Log $ll, "RRDLOG|Disptach|rrd_create_func|ERROR: Function not defined";
+      Log $ll, "RRDLOG[ERRROR] dispatch rrd_create_func $changed_device_type:$changed_reading Function not defined";
       return undef;
     }
     $rrd_file = &$rrd_create_func($self,$changed_device,$changed_reading,$rrd_file,$timestamp);