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

: minor code cleanup

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21564 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2020-03-31 19:08:51 +00:00
parent e9d9bd6c0f
commit 9f9d532003
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
fhem/configDB.pm
View File

@ -564,12 +564,12 @@ sub cfgDB_MigrationImport() {
my $modpath = AttrVal("global","modpath",".");
# find eventTypes file
$filename = '';
# $filename = '';
@def = '';
@def = _cfgDB_findDef('TYPE=eventTypes');
foreach $filename (@def) {
next unless $filename;
push @files, $filename;
foreach my $fn (@def) {
next unless $fn;
push @files, $fn;
}
# import templateDB.gplot
@ -583,60 +583,60 @@ sub cfgDB_MigrationImport() {
push @files, $filename;
# find used gplot files
$filename ='';
# $filename ='';
@def = '';
@def = _cfgDB_findDef('TYPE=SVG','GPLOTFILE');
foreach $filename (@def) {
next unless $filename;
push @files, "$modpath/www/gplot/".$filename.".gplot";
foreach my $fn (@def) {
next unless $fn;
push @files, "$modpath/www/gplot/".$fn.".gplot";
}
# find DbLog configs
$filename ='';
# $filename ='';
@def = '';
@def = _cfgDB_findDef('TYPE=DbLog','CONFIGURATION');
foreach $filename (@def) {
next unless $filename;
push @files, $filename;
foreach my $fn (@def) {
next unless $fn;
push @files, $fn;
}
# find RSS layouts
$filename ='';
# $filename ='';
@def = '';
@def = _cfgDB_findDef('TYPE=RSS','LAYOUTFILE');
foreach $filename (@def) {
next unless $filename;
push @files, $filename;
foreach my $fn (@def) {
next unless $fn;
push @files, $fn;
}
# find InfoPanel layouts
$filename ='';
# $filename ='';
@def = '';
@def = _cfgDB_findDef('TYPE=InfoPanel','LAYOUTFILE');
foreach $filename (@def) {
next unless $filename;
push @files, $filename;
foreach my $fn (@def) {
next unless $fn;
push @files, $fn;
}
# find weekprofile configurations
$filename ='';
# $filename ='';
@def = '';
@def = _cfgDB_findDef('TYPE=weekprofile','CONFIGFILE');
foreach $filename (@def) {
next unless $filename;
push @files, $filename;
foreach my $fn (@def) {
next unless $fn;
push @files, $fn;
}
# find holiday files
$filename ='';
# $filename ='';
@def = '';
@def = _cfgDB_findDef('TYPE=holiday','NAME');
foreach $filename (@def) {
next unless $filename;
if(defined($defs{$filename}{HOLIDAYFILE})) {
push @files, $defs{$filename}{HOLIDAYFILE};
foreach my $fn (@def) {
next unless $fn;
if(defined($defs{$fn}{HOLIDAYFILE})) {
push @files, $defs{$fn}{HOLIDAYFILE};
} else {
push @files, "$modpath/FHEM/".$filename.".holiday";
push @files, "$modpath/FHEM/".$fn.".holiday";
}
}
@ -646,12 +646,12 @@ sub cfgDB_MigrationImport() {
# do the import
$filename = '';
foreach $filename (@files) {
if ( -r $filename ) {
my $filesize = -s $filename;
_cfgDB_binFileimport($filename,$filesize);
$ret .= "importing: $filename\n";
# $filename = '';
foreach my $fn (@files) {
if ( -r $fn ) {
my $filesize = -s $fn;
_cfgDB_binFileimport($fn,$filesize);
$ret .= "importing: $fn\n";
}
}