From 33a93b419e91fed8c1623efa774082a22f0e2eb7 Mon Sep 17 00:00:00 2001 From: betateilchen Date: Tue, 19 Sep 2017 12:55:19 +0000 Subject: [PATCH] configDB: minor changes for FileDelete() git-svn-id: https://svn.fhem.de/fhem/trunk@15096 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_configdb.pm | 5 ++++- fhem/configDB.pm | 11 ++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/fhem/FHEM/98_configdb.pm b/fhem/FHEM/98_configdb.pm index 3145ef41c..054ba00a1 100644 --- a/fhem/FHEM/98_configdb.pm +++ b/fhem/FHEM/98_configdb.pm @@ -129,7 +129,10 @@ sub CommandConfigdb($$) { $filename = $attr{global}{modpath}; $filename .= "/$param1"; } - $ret = _cfgDB_Filedelete $filename; +# $ret = _cfgDB_Filedelete $filename; + $ret = "File $filename "; + $ret .= defined(_cfgDB_Filedelete($filename)) ? "deleted from" : "not found in"; + $ret .= " database."; } when ('fileexport') { diff --git a/fhem/configDB.pm b/fhem/configDB.pm index e3c4db741..f8a86faa7 100644 --- a/fhem/configDB.pm +++ b/fhem/configDB.pm @@ -1154,11 +1154,12 @@ sub _cfgDB_Filedelete($) { my $ret = $fhem_dbh->do("delete from fhemb64filesave where filename = '$filename'"); $fhem_dbh->commit(); $fhem_dbh->disconnect(); - if($ret > 0) { - $ret = "File $filename deleted from database."; - } else { - $ret = "File $filename not found in database."; - } + $ret = ($ret > 0) ? 1 : undef; +# if($ret > 0) { +# $ret = "File $filename deleted from database."; +# } else { +# $ret = "File $filename not found in database."; +# } return $ret; }