From 30e923fa26b4fe5cca6a3b2019cb59b003bd4527 Mon Sep 17 00:00:00 2001
From: rapster <>
Date: Sun, 4 Oct 2015 18:37:43 +0000
Subject: [PATCH] 93_DbLog: Rollback to revision 9373, because wrong file
 commited

git-svn-id: https://svn.fhem.de/fhem/trunk@9375 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED           |  1 -
 fhem/FHEM/42_SYSMON.pm |  4 ++--
 fhem/FHEM/93_DbLog.pm  | 20 ++++++++++----------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index 0e7b4fe20..d3c60dbcb 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,6 +1,5 @@
 # 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.
-  - change:  93_DbLog: changed min/max val 999999 to system specific (~0 >> 1)
   - feature: HUEbridge: added get touchlink
                         added get whitelist, set deletewhitelist
                         new and extendet internals
diff --git a/fhem/FHEM/42_SYSMON.pm b/fhem/FHEM/42_SYSMON.pm
index 0b583c40b..5640dcc8c 100644
--- a/fhem/FHEM/42_SYSMON.pm
+++ b/fhem/FHEM/42_SYSMON.pm
@@ -4319,7 +4319,7 @@ sub SYSMON_ShowBarChartHtml($;$) {
   my $sysmon = {};
   my $html='';
   if(defined($main::defs{$dev}{READINGS})) {
-    foreach my $r (keys %{$main::defs{$dev}->{READINGS}}){
+    foreach my $r (keys($main::defs{$dev}{READINGS})){
       $sysmon->{$r} = $main::defs{$dev}{READINGS}{$r}{VAL};
     }
   } else {
@@ -4597,7 +4597,7 @@ sub SYSMON_ShowBarChartHtml_alt($;$$){
   # access sysmon data..
   #my $sysmon = SYSMON_getValues($dev);
   my $sysmon = {};  
-  foreach my $r (keys %{$main::defs{$dev}->{READINGS}}){
+  foreach my $r (keys($main::defs{$dev}{READINGS})){
     $sysmon->{$r} = $main::defs{$dev}{READINGS}{$r}{VAL};
   }
   
diff --git a/fhem/FHEM/93_DbLog.pm b/fhem/FHEM/93_DbLog.pm
index 1302ea096..7793659f2 100644
--- a/fhem/FHEM/93_DbLog.pm
+++ b/fhem/FHEM/93_DbLog.pm
@@ -917,16 +917,16 @@ DbLog_Get($@)
   for(my $i=0; $i<int(@readings); $i++) {
     # ueber alle Readings
     # Variablen initialisieren
-    $min[$i]   =  (~0 >> 1);
-    $max[$i]   = -(~0 >> 1);
+    $min[$i]   =  999999;
+    $max[$i]   = -999999;
     $sum[$i]   = 0;
     $cnt[$i]   = 0;
     $lastv[$i] = 0;
     $lastd[$i] = "undef";
     $mind[$i]  = "undef";
     $maxd[$i]  = "undef";
-    $minval    =  (~0 >> 1);
-    $maxval    = -(~0 >> 1);
+    $minval    =  999999;
+    $maxval    = -999999;
     $deltacalc = 0;
 
     if($readings[$i]->[3] && ($readings[$i]->[3] eq "delta-h" || $readings[$i]->[3] eq "delta-d")) {
@@ -1131,9 +1131,9 @@ DbLog_Get($@)
             $sum[$i] += $out_value;
             $cnt[$i]++;
             $out_tstamp = DbLog_implode_datetime($lasttstamp{year}, $lasttstamp{month}, $lasttstamp{day}, $lasttstamp{hour}, "30", "00");
-            #$minval =  (~0 >> 1);
+            #$minval =  999999;
             $minval = $maxval;
-#            $maxval = -(~0 >> 1);
+#            $maxval = -999999;
             $writeout=1;
           }
         } elsif ($readings[$i]->[3] && $readings[$i]->[3] eq "delta-d") {
@@ -1150,9 +1150,9 @@ DbLog_Get($@)
             $sum[$i] += $out_value;
             $cnt[$i]++;
             $out_tstamp = DbLog_implode_datetime($lasttstamp{year}, $lasttstamp{month}, $lasttstamp{day}, "12", "00", "00");
-#            $minval =  (~0 >> 1);
+#            $minval =  999999;
             $minval = $maxval;
-#            $maxval = -(~0 >> 1);
+#            $maxval = -999999;
             $writeout=1;
           }
         } else {
@@ -1254,8 +1254,8 @@ DbLog_Get($@)
   #Ueberfuehren der gesammelten Werte in die globale Variable %data
   for(my $j=0; $j<int(@readings); $j++) {
     my $k = $j+1;
-    $data{"min$k"} = $min[$j] == (~0 >> 1) ? "undef" : $min[$j];
-    $data{"max$k"} = $max[$j] == -(~0 >> 1) ? "undef" : $max[$j];
+    $data{"min$k"} = $min[$j] == 999999 ? "undef" : $min[$j];
+    $data{"max$k"} = $max[$j] == -999999 ? "undef" : $max[$j];
     $data{"avg$k"} = $cnt[$j] ? sprintf("%0.2f", $sum[$j]/$cnt[$j]) : "undef";
     $data{"sum$k"} = $sum[$j];
     $data{"cnt$k"} = $cnt[$j] ? $cnt[$j] : "undef";