FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

93_DbRep: get svrinfo has only used /opt/fhem/fhem.db (SQLite)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13717 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2017-03-16 21:17:35 +00:00
parent 68adb7d369
commit e0a54bad23
2 changed files with 4 additions and 2 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: get svrinfo has only used /opt/fhem/fhem.db (SQLite)
- new: 98_expandJSON: initial check in - new: 98_expandJSON: initial check in
- update: 98_DOIFtools: added hints to the derived operands - update: 98_DOIFtools: added hints to the derived operands
- update: 98_Text2Speech: some small improvements - update: 98_Text2Speech: some small improvements

5
fhem/FHEM/93_DbRep.pm
View File

@ -40,6 +40,7 @@
########################################################################################################### ###########################################################################################################
# Versions History: # 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.1 28.02.2017 commandref completed
# 4.11.0 18.02.2017 added [current|previous]_[month|week|day|hour]_begin and # 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 # [current|previous]_[month|week|day|hour]_end as options of timestamp
@ -175,7 +176,7 @@ use Blocking;
use Time::Local; use Time::Local;
# no if $] >= 5.017011, warnings => 'experimental'; # no if $] >= 5.017011, warnings => 'experimental';
my $DbRepVersion = "4.11.1"; my $DbRepVersion = "4.11.2";
my %dbrep_col = ("DEVICE" => 64, my %dbrep_col = ("DEVICE" => 64,
"TYPE" => 64, "TYPE" => 64,
@ -3447,7 +3448,7 @@ sub dbmeta_DoParse($) {
my $key = "SQLITE_DB_FILENAME"; my $key = "SQLITE_DB_FILENAME";
push(@row_array, $key." ".$sf) if($key =~ m/($param)/i); 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"; my $key = "SQLITE_FILE_SIZE_MB";
push(@row_array, $key." ".$a[0]) if($key =~ m/($param)/i); push(@row_array, $key." ".$a[0]) if($key =~ m/($param)/i);
} }