From 69dcc4d1763a892e27a285ac4dbdf7dfa7be4994 Mon Sep 17 00:00:00 2001
From: nasseeder1 <>
Date: Mon, 5 Dec 2016 22:17:29 +0000
Subject: [PATCH] 93_DbRep: change of day aggregation

git-svn-id: https://svn.fhem.de/fhem/trunk@12718 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED          | 3 ++-
 fhem/FHEM/93_DbRep.pm | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index 6cac1fdc6..225bdb0eb 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,6 +1,7 @@
 # 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   93_DbRep: Syntaxerror due to Forum #msg529312
+  - change:  93_DbRep: change of day aggregation
+  - bugfix:  93_DbRep: Syntaxerror due to Forum #msg529312
   - bugfix:  74_AMAD: 74_AMADautomagicFlowset_2.6.7.xml fix Problems with zero
                       Global Variables
   - feature: 18_CUL_HOERMANN has toggle. culfw 1.67 needed
diff --git a/fhem/FHEM/93_DbRep.pm b/fhem/FHEM/93_DbRep.pm
index acf2a7da7..4d6851777 100644
--- a/fhem/FHEM/93_DbRep.pm
+++ b/fhem/FHEM/93_DbRep.pm
@@ -40,6 +40,7 @@
 ###########################################################################################################
 #  Versions History:
 #
+# 4.7.5        05.12.2016       collaggstr day aggregation changed
 # 4.7.4        28.11.2016       sub calcount changed due to Forum #msg529312
 # 4.7.3        20.11.2016       new diffValue function made suitable to SQLite
 # 4.7.2        20.11.2016       commandref adapted, state = Warnings adapted
@@ -3479,7 +3480,7 @@ sub collaggstr($$$$) {
              $runtime_string_first = strftime "%Y-%m-%d", localtime($runtime) if($i>1);
              $runtime = $runtime+3600 if(dsttest($hash,$runtime,$aggsec));                          # Korrektur Winterzeitumstellung (Uhr wurde 1 Stunde zurück gestellt)
                                                
-             if((($tsstr gt $testr) ? $runtime : ($runtime+$aggsec)) > $epoch_seconds_end) {
+             if((($tsstr gt $testr) ? $runtime : ($runtime+$aggsec-1)) > $epoch_seconds_end) {
                  $runtime_string_first = strftime "%Y-%m-%d", localtime($runtime);                    
                  $runtime_string_first = strftime "%Y-%m-%d %H:%M:%S", localtime($runtime) if( $dsstr eq $destr);
                  $runtime_string_next  = strftime "%Y-%m-%d %H:%M:%S", localtime($epoch_seconds_end);