mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configDB.pm: code cleanup

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@7578 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen
2015-01-15 09:50:15 +00:00
parent fc1c54a9bc
commit 2647af77ee
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
fhem/configDB.pm
View File

@@ -88,6 +88,11 @@
# #
# 2014-09-30 - added support for device based userattr # 2014-09-30 - added support for device based userattr
# #
# 2015-01-12 - changed use fhem function createUniqueId()
# instead of database calls
#
# 2015-01-15 - changed remove 99_Utils.pm from filelist
#
############################################################################## ##############################################################################
# #
@@ -548,8 +553,8 @@ sub cfgDB_FW_fileList($$@) {
foreach my $f (@files) { foreach my $f (@files) {
next if( $f !~ m/^$dir/ ); next if( $f !~ m/^$dir/ );
$f =~ s,$dir\/,,; $f =~ s,$dir\/,,;
next if($f !~ m,^$re$,); next if($f !~ m,^$re$, || $f eq '99_Utils.pm');
push @ret, "$f.configDB" unless $f eq '99_Utils.pm'; push @ret, "$f.configDB";
} }
return @ret; return @ret;
} }
@@ -666,17 +671,6 @@ sub _cfgDB_Rotate($) {
return $uuid; return $uuid;
} }
# return a UUID based on DB-model
#sub _cfgDB_Uuid() {
# my $fhem_dbh = _cfgDB_Connect;
# my $uuid;
# $uuid = $fhem_dbh->selectrow_array('select lower(hex(randomblob(16)))') if($cfgDB_dbtype eq 'SQLITE');
# $uuid = $fhem_dbh->selectrow_array('select uuid()') if($cfgDB_dbtype eq 'MYSQL');
# $uuid = $fhem_dbh->selectrow_array('select uuid_generate_v4()') if($cfgDB_dbtype eq 'POSTGRESQL');
# $fhem_dbh->disconnect();
# return $uuid;
#}
# 2015-01-12 use the fhem default function # 2015-01-12 use the fhem default function
sub _cfgDB_Uuid() { sub _cfgDB_Uuid() {
return createUniqueId(); return createUniqueId();