FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00
Code Issues Releases Wiki Activity

93_DbLog, back to V2.22.0, Forum:#75039

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14842 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2017-08-03 21:45:51 +00:00
parent a3c9e7fae9
commit c0a73de6e6
2 changed files with 5 additions and 5 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_DbLog, back to V2.22.0, Forum:#75039
- bugfix: 93_DbLog, V2.22.1, Forum:#74690, warning unitialized value - bugfix: 93_DbLog, V2.22.1, Forum:#74690, warning unitialized value
- feature: 70_WINCONNECT: [WinWebGUI] - Fenster verstecken - feature: 70_WINCONNECT: [WinWebGUI] - Fenster verstecken
- feature: 57_Calendar: added attribute cutoffOlderThan (forum #74481) - feature: 57_Calendar: added attribute cutoffOlderThan (forum #74481)

7
fhem/FHEM/93_DbLog.pm
View File

@ -16,7 +16,6 @@
############################################################################################################################################ ############################################################################################################################################
# Versions History done by DS_Starter & DeeSPe: # Versions History done by DS_Starter & DeeSPe:
# #
# 2.22.1 25.07.2017 Forum:#74690, bug unitialized in row 734,4318 -> "if($fld[0] && $fld[1])"
# 2.22.0 25.07.2017 attribute "addStateEvent" added # 2.22.0 25.07.2017 attribute "addStateEvent" added
# 2.21.3 24.07.2017 commandref revised # 2.21.3 24.07.2017 commandref revised
# 2.21.2 19.07.2017 changed readCfg to report more error-messages # 2.21.2 19.07.2017 changed readCfg to report more error-messages
@ -144,7 +143,7 @@ use Blocking;
use Time::HiRes qw(gettimeofday tv_interval); use Time::HiRes qw(gettimeofday tv_interval);
use Encode qw(encode_utf8); use Encode qw(encode_utf8);
my $DbLogVersion = "2.22.1"; my $DbLogVersion = "2.22.0";
my %columns = ("DEVICE" => 64, my %columns = ("DEVICE" => 64,
"TYPE" => 64, "TYPE" => 64,
@ -732,7 +731,7 @@ sub DbLog_regexpFn($$) {
my @fld = split(":", $a[$i]); my @fld = split(":", $a[$i]);
$ret .= '|' if( $ret ); $ret .= '|' if( $ret );
$ret .= $fld[0] .'.'. $fld[1] if($fld[0] && $fld[1]); $ret .= $fld[0] .'.'. $fld[1];
} }
return $ret; return $ret;
@ -4315,7 +4314,7 @@ DbLog_sampleDataFn($$$$$)
for(my $r=0; $r < $max; $r++) { for(my $r=0; $r < $max; $r++) {
my @f = split(":", ($dlog->[$r] ? $dlog->[$r] : ":::"), 4); my @f = split(":", ($dlog->[$r] ? $dlog->[$r] : ":::"), 4);
my $ret = ""; my $ret = "";
$ret .= SVG_txt("par_${r}_0", "", "$f[0]:$f[1]:$f[2]:$f[3]", 20) if($f[0]&&$f[1]&&$f[2]&&$f[3]); $ret .= SVG_txt("par_${r}_0", "", "$f[0]:$f[1]:$f[2]:$f[3]", 20);
# $ret .= SVG_txt("par_${r}_2", "", $f[2], 1); # Default not yet implemented # $ret .= SVG_txt("par_${r}_2", "", $f[2], 1); # Default not yet implemented
# $ret .= SVG_txt("par_${r}_3", "", $f[3], 3); # Function # $ret .= SVG_txt("par_${r}_3", "", $f[3], 3); # Function
# $ret .= SVG_txt("par_${r}_4", "", $f[4], 3); # RegExp # $ret .= SVG_txt("par_${r}_4", "", $f[4], 3); # RegExp