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

configDB.pm: minor code cleanup

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@25841 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2022-03-14 20:15:24 +00:00
parent 0f36f77cff
commit c9273002f6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/configDB.pm
View File

@ -176,6 +176,8 @@
# 2022-02-20 - added statefile versioning - begin # 2022-02-20 - added statefile versioning - begin
# 2022-03-03 statefile versioning - completed # 2022-03-03 statefile versioning - completed
# #
# 2022-03-14 - fixed statefile problems with POSTGRESQL
#
############################################################################## ##############################################################################
=cut =cut
@ -350,7 +352,7 @@ sub cfgDB_Init {
} }
# create TABLE fhemstate if nonexistent # create TABLE fhemstate if nonexistent
# $fhem_dbh->do("CREATE TABLE IF NOT EXISTS fhemstate(stateString TEXT)"); $fhem_dbh->do("CREATE TABLE IF NOT EXISTS fhemstate(stateString TEXT)");
# create TABLE fhemb64filesave if nonexistent # create TABLE fhemb64filesave if nonexistent
if($cfgDB_dbtype eq "MYSQL") { if($cfgDB_dbtype eq "MYSQL") {
@ -442,7 +444,7 @@ sub cfgDB_FileUpdate {
return; return;
} }
# read and execute fhemconfig and fhemstate # read and execute fhemconfig and statefile
sub cfgDB_ReadAll { ## prototype used in fhem.pl sub cfgDB_ReadAll { ## prototype used in fhem.pl
my ($cl) = @_; my ($cl) = @_;
my ($ret, @dbconfig); my ($ret, @dbconfig);
@ -807,7 +809,7 @@ sub _cfgDB_ReadState {
my $stateFileName = $configDB{loaded}.".fhem.save"; my $stateFileName = $configDB{loaded}.".fhem.save";
my ($err,@state) = cfgDB_FileRead($stateFileName); my ($err,@state) = cfgDB_FileRead($stateFileName);
if ($err eq "") { if ($err eq "") {
Log 4, "configDB read state ".$stateFileName; Log 4, "configDB read state ".$stateFileName;
map { my $a = $_; $a =~ s/\$xyz\$/\\n/g; push @dbconfig, $a } @state; map { my $a = $_; $a =~ s/\$xyz\$/\\n/g; push @dbconfig, $a } @state;
my $fhem_dbh = _cfgDB_Connect; my $fhem_dbh = _cfgDB_Connect;
$fhem_dbh->do("delete from fhemstate"); $fhem_dbh->do("delete from fhemstate");