From e0a54bad23d4951fde675e3804549047cb7fda88 Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Thu, 16 Mar 2017 21:17:35 +0000 Subject: [PATCH] 93_DbRep: get svrinfo has only used /opt/fhem/fhem.db (SQLite) git-svn-id: https://svn.fhem.de/fhem/trunk@13717 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/93_DbRep.pm | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 7518a3b55..8667bd522 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # 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: get svrinfo has only used /opt/fhem/fhem.db (SQLite) - new: 98_expandJSON: initial check in - update: 98_DOIFtools: added hints to the derived operands - update: 98_Text2Speech: some small improvements diff --git a/fhem/FHEM/93_DbRep.pm b/fhem/FHEM/93_DbRep.pm index ee5685361..e47171208 100644 --- a/fhem/FHEM/93_DbRep.pm +++ b/fhem/FHEM/93_DbRep.pm @@ -40,6 +40,7 @@ ########################################################################################################### # Versions History: # +# 4.11.2 16.03.2017 bugfix in func dbmeta_DoParse (SQLITE_DB_FILENAME) # 4.11.1 28.02.2017 commandref completed # 4.11.0 18.02.2017 added [current|previous]_[month|week|day|hour]_begin and # [current|previous]_[month|week|day|hour]_end as options of timestamp @@ -175,7 +176,7 @@ use Blocking; use Time::Local; # no if $] >= 5.017011, warnings => 'experimental'; -my $DbRepVersion = "4.11.1"; +my $DbRepVersion = "4.11.2"; my %dbrep_col = ("DEVICE" => 64, "TYPE" => 64, @@ -3447,7 +3448,7 @@ sub dbmeta_DoParse($) { my $key = "SQLITE_DB_FILENAME"; push(@row_array, $key." ".$sf) if($key =~ m/($param)/i); } - my @a = split(' ',qx(du -m /opt/fhem/fhem.db)) if ($^O =~ m/linux/i || $^O =~ m/unix/i); + my @a = split(' ',qx(du -m $hash->{DATABASE})) if ($^O =~ m/linux/i || $^O =~ m/unix/i); my $key = "SQLITE_FILE_SIZE_MB"; push(@row_array, $key." ".$a[0]) if($key =~ m/($param)/i); }