FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-26 10:34:52 +00:00
Code Issues Releases Wiki Activity

93_DbRep: V7.13.2, fix of aggregation month

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@16257 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2018-02-24 21:37:17 +00:00
parent 9a94d8f04d
commit 62a732bcb8
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# 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: V7.13.2, fix of aggregation month
- feature: 00_MQTT: topic with space or colon - feature: 00_MQTT: topic with space or colon
- bugfix: 98_GOOGLECAST: fix open connections and state value - bugfix: 98_GOOGLECAST: fix open connections and state value
- feature: 10_MQTT_DEVICE: add SetExtensions - feature: 10_MQTT_DEVICE: add SetExtensions

20
fhem/FHEM/93_DbRep.pm
View File

@ -37,6 +37,7 @@
########################################################################################################################### ###########################################################################################################################
# Versions History: # Versions History:
# #
# 7.13.2 24.02.2018 DbRep_firstconnect changed, bug fix in DbRep_collaggstr for aggregation = month
# 7.13.1 20.02.2018 commandref revised # 7.13.1 20.02.2018 commandref revised
# 7.13.0 17.02.2018 changeValue can handle perl code {} as "new string" # 7.13.0 17.02.2018 changeValue can handle perl code {} as "new string"
# 7.12.0 16.02.2018 compression of dumpfile, restore of compressed files possible # 7.12.0 16.02.2018 compression of dumpfile, restore of compressed files possible
@ -318,7 +319,7 @@ no if $] >= 5.017011, warnings => 'experimental::smartmatch';
sub DbRep_Main($$;$); sub DbRep_Main($$;$);
sub DbLog_cutCol($$$$$$$); # DbLog-Funktion nutzen um Daten auf maximale Länge beschneiden sub DbLog_cutCol($$$$$$$); # DbLog-Funktion nutzen um Daten auf maximale Länge beschneiden
my $DbRepVersion = "7.13.1"; my $DbRepVersion = "7.13.2";
my %dbrep_col = ("DEVICE" => 64, my %dbrep_col = ("DEVICE" => 64,
"TYPE" => 64, "TYPE" => 64,
@ -1235,6 +1236,7 @@ sub DbRep_firstconnect($) {
$hash->{dbloghash} = $defs{$dblogdevice}; $hash->{dbloghash} = $defs{$dblogdevice};
my $dbconn = $hash->{dbloghash}{dbconn}; my $dbconn = $hash->{dbloghash}{dbconn};
RemoveInternalTimer($hash, "DbRep_firstconnect");
return if(IsDisabled($name)); return if(IsDisabled($name));
if ($init_done == 1) { if ($init_done == 1) {
if ( !DbRep_Connect($hash) ) { if ( !DbRep_Connect($hash) ) {
@ -1246,7 +1248,6 @@ sub DbRep_firstconnect($) {
$dbh->disconnect(); $dbh->disconnect();
} }
} else { } else {
RemoveInternalTimer($hash, "DbRep_firstconnect");
InternalTimer(time+1, "DbRep_firstconnect", $hash, 0); InternalTimer(time+1, "DbRep_firstconnect", $hash, 0);
} }
@ -1791,7 +1792,7 @@ sub DbRep_createTimeArray($$$) {
} elsif ($aggregation eq "week") { } elsif ($aggregation eq "week") {
$aggsec = 604800; $aggsec = 604800;
} elsif ($aggregation eq "month") { } elsif ($aggregation eq "month") {
$aggsec = 2678400; $aggsec = 2678400; # Initialwert, wird in DbRep_collaggstr für jeden Monat berechnet
} elsif ($aggregation eq "no") { } elsif ($aggregation eq "no") {
$aggsec = 1; $aggsec = 1;
} else { } else {
@ -1866,15 +1867,17 @@ sub DbRep_collaggstr($$$$) {
# Monatsaggregation # Monatsaggregation
if ($aggregation eq "month") { if ($aggregation eq "month") {
$runtime_orig = $runtime; $runtime_orig = $runtime;
$runtime = $runtime+3600 if(DbRep_dsttest($hash,$runtime,$aggsec) && (strftime "%m", localtime($runtime)) > 6); # Korrektur Winterzeitumstellung (Uhr wurde 1 Stunde zurück gestellt)
# Hilfsrechnungen # Hilfsrechnungen
my $rm = strftime "%m", localtime($runtime); # Monat des aktuell laufenden Startdatums d. SQL-Select my $rm = strftime "%m", localtime($runtime); # Monat des aktuell laufenden Startdatums d. SQL-Select
my $ry = strftime "%Y", localtime($runtime); # Jahr des aktuell laufenden Startdatums d. SQL-Select my $ry = strftime "%Y", localtime($runtime); # Jahr des aktuell laufenden Startdatums d. SQL-Select
my $dim = $rm-2?30+($rm*3%7<4):28+!($ry%4||$ry%400*!($ry%100)); # Anzahl Tage des aktuell laufenden Monats f. SQL-Select my $dim = $rm-2?30+($rm*3%7<4):28+!($ry%4||$ry%400*!($ry%100)); # Anzahl Tage des aktuell laufenden Monats
Log3 ($name, 5, "DbRep $name - act year: $ry, act month: $rm, days in month: $dim, endyear: $yestr, endmonth: $mestr"); Log3 ($name, 5, "DbRep $name - act year: $ry, act month: $rm, days in month: $dim, endyear: $yestr, endmonth: $mestr");
$aggsec = $dim * 86400;
$runtime_string = strftime "%Y-%m", localtime($runtime); # für Readingname
$runtime = $runtime+3600 if(DbRep_dsttest($hash,$runtime,$aggsec) && (strftime "%m", localtime($runtime)) > 6); # Korrektur Winterzeitumstellung (Uhr wurde 1 Stunde zurück gestellt)
$runtime_string = strftime "%Y-%m", localtime($runtime); # für Readingname
if ($i==1) { if ($i==1) {
# nur im ersten Durchlauf # nur im ersten Durchlauf
@ -1888,7 +1891,8 @@ sub DbRep_collaggstr($$$$) {
} else { } else {
if(($runtime) > $epoch_seconds_end) { if(($runtime) > $epoch_seconds_end) {
$runtime_string_first = strftime "%Y-%m-01", localtime($runtime) if($i>11); #$runtime_string_first = strftime "%Y-%m-01", localtime($runtime) if($i>11); # ausgebaut 24.02.2018
$runtime_string_first = strftime "%Y-%m-01", localtime($runtime);
$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);
$ll=1; $ll=1;
} else { } else {