From 2dbc3ba36946dad03a5576504019dc7b4492fa62 Mon Sep 17 00:00:00 2001 From: betateilchen Date: Thu, 5 Feb 2015 16:22:02 +0000 Subject: [PATCH] configDB: minor bugfixing, code cleanup git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@7884 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_configdb.pm | 2 +- fhem/configDB.pm | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/fhem/FHEM/98_configdb.pm b/fhem/FHEM/98_configdb.pm index 39196d00e..005727629 100644 --- a/fhem/FHEM/98_configdb.pm +++ b/fhem/FHEM/98_configdb.pm @@ -35,7 +35,7 @@ sub CommandConfigdb($$) { given ($cmd) { when ('attr') { - Log3('configdb', 4, 'configdb: attr $param1 $param2 requested.'); + Log3('configdb', 4, "configdb: attr $param1 $param2 requested."); if ($param1 eq "" && $param2 eq "") { # list attributes foreach my $c (sort keys %{$configDB{attr}}) { diff --git a/fhem/configDB.pm b/fhem/configDB.pm index 7f4eed775..9b5193b1f 100644 --- a/fhem/configDB.pm +++ b/fhem/configDB.pm @@ -982,17 +982,16 @@ sub _cfgDB_Fileexport($;$) { $sth->execute(); my $blobContent = $sth->fetchrow_array(); my $counter = length($blobContent); + $sth->finish(); + $fhem_dbh->disconnect(); return "No data found for file $filename" unless $counter; - + return ($blobContent,$counter) if $raw; + open( FILE,">$filename" ); binmode(FILE); print FILE $blobContent; close( FILE ); - - $sth->finish(); - $fhem_dbh->disconnect(); - return "$counter bytes written from database into file $filename" unless $raw; - return ($blobContent,$counter); + return "$counter bytes written from database into file $filename"; } # import file into database