FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-25 22:09:21 +00:00
Code Issues Releases Wiki Activity

93_DbRep: change of day aggregation

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12718 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2016-12-05 22:17:29 +00:00
parent cb6f856175
commit 69dcc4d176
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fhem/CHANGED
View File

@ -1,6 +1,7 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # 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 - bugfix: 74_AMAD: 74_AMADautomagicFlowset_2.6.7.xml fix Problems with zero
Global Variables Global Variables
- feature: 18_CUL_HOERMANN has toggle. culfw 1.67 needed - feature: 18_CUL_HOERMANN has toggle. culfw 1.67 needed

3
fhem/FHEM/93_DbRep.pm
View File

@ -40,6 +40,7 @@
########################################################################################################### ###########################################################################################################
# Versions History: # 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.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.3 20.11.2016 new diffValue function made suitable to SQLite
# 4.7.2 20.11.2016 commandref adapted, state = Warnings adapted # 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_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) $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", localtime($runtime);
$runtime_string_first = strftime "%Y-%m-%d %H:%M:%S", localtime($runtime) if( $dsstr eq $destr); $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); $runtime_string_next = strftime "%Y-%m-%d %H:%M:%S", localtime($epoch_seconds_end);