FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-28 23:14:10 +00:00
Code Issues Releases Wiki Activity

configDB.pm: debug version

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@25843 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2022-03-15 08:49:58 +00:00
parent 690632693c
commit ae7e33c0cb
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fhem/contrib/betateilchen/debug/configDB.pm
View File

@ -1,6 +1,5 @@
# $Id$ # $Id$
=for comment (License) =for comment (License)
############################################################################## ##############################################################################
@ -177,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
@ -351,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") {
@ -443,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);
@ -808,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");
@ -1289,15 +1290,22 @@ sub _cfgDB_deleteStatefiles {
my $sth = $fhem_dbh->prepare( "SELECT filename FROM fhemb64filesave where filename like '%.fhem.save'" ); my $sth = $fhem_dbh->prepare( "SELECT filename FROM fhemb64filesave where filename like '%.fhem.save'" );
$sth->execute(); $sth->execute();
while ($filename = $sth->fetchrow_array()) { while ($filename = $sth->fetchrow_array()) {
Log 1, "file: >$filename<";
if (length($filename) > 42) { # malformed filename from postgresql
Log 1, "del1 >$filename<";
# $fhem_dbh->do("delete from fhemb64filesave where filename = '$filename'");
next;
}
my $uuid = ""; my $uuid = "";
$uuid = substr($filename,0,32); $uuid = substr($filename,0,32);
my $found = $fhem_dbh->selectrow_array("SELECT versionuuid FROM fhemversions WHERE versionuuid = '$uuid'");
$found //= -1; # to prevent perl warning
Log 1, "file: >$filename<";
Log 1, "uuid: >$uuid<"; Log 1, "uuid: >$uuid<";
my $found = $fhem_dbh->selectrow_array("SELECT versionuuid FROM fhemversions WHERE versionuuid = '$uuid'");
$found //= 'notfound'; # to prevent perl warning
Log 1, "found: >$found<";
$found = substr($found,0,32);
Log 1, "found: >$found<"; Log 1, "found: >$found<";
unless ($uuid eq $found) { unless ($uuid eq $found) {
Log 1, "del >$filename<"; Log 1, "del2 >$filename<";
# $fhem_dbh->do("delete from fhemb64filesave where filename = '$filename'"); # $fhem_dbh->do("delete from fhemb64filesave where filename = '$filename'");
} }
} }