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

configdb - fixed: minor typos in output

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5594 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2014-04-21 15:09:27 +00:00
parent 5b1d73687d
commit a8e5d2df39
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/FHEM/98_configdb.pm
View File

@ -151,7 +151,7 @@ sub CommandConfigdb($$) {
my $val = $attr{configdb}{$c};
$val =~ s/;/;;/g;
$val =~ s/\n/\\\n/g;
$ret .= "attr configdb $c $val";
$ret .= "attr configdb $c $val\n";
}
} elsif($param2 eq "") {
# delete attribute

9
fhem/configDB.pm
View File

@ -534,7 +534,8 @@ sub _cfgDB_Info {
# count files stored in database
$row = $fhem_dbh->selectall_arrayref("SELECT filename from fhemfilesave group by filename");
$count = @$row;
$f = ($count>1) ? "s" : "";
$count = ($count)?$count:'No';
$f = ("$count" ne '1') ? "s" : "";
$row = " fhemfilesave: $count file$f stored in database";
push @r, $row;
push @r, $l;
@ -687,8 +688,9 @@ sub _cfgDB_Fileexport($) {
}
# import file from filesystem into database
sub _cfgDB_Fileimport($) {
my ($filename) = @_;
sub _cfgDB_Fileimport($;$) {
my ($filename,$doDelete) = @_;
$doDelete = (defined($doDelete)) ? 1 : 0;
my $counter = 0;
my $fhem_dbh = _cfgDB_Connect;
$fhem_dbh->do("delete from fhemfilesave where filename = '$filename'");
@ -703,6 +705,7 @@ sub _cfgDB_Fileimport($) {
$sth->finish();
$fhem_dbh->commit();
$fhem_dbh->disconnect();
unlink($filename) if($attr{configdb}{deleteimported} || $doDelete );
return "$counter lines written from file $filename to database";
}