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

10_EnOcean: function EnOcean_Delete changed

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9428 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
klaus-schauer 2015-10-11 10:20:47 +00:00
parent d97ec96c4c
commit 82d0bb9377
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fhem/FHEM/10_EnOcean.pm
View File

@ -1,5 +1,12 @@
##############################################
# $Id$
# 2015-10-11
# Added new EEP:
# EnOcean_Notify():
# EnOcean_Attr():
# Remote Management (incomplete, experimental)
# commandref: further explanations added
# EnOcean Security in Perl, teach-in, VAES, MAC and message handling
# Copyright: Jan Schneider (timberwolf at tec-observer dot de)
@ -8052,7 +8059,6 @@ sub EnOcean_Parse($$)
if (defined $deleteDevice) {
# delete device and save config
CommandDelete(undef, $deleteDevice);
#CommandDelete(undef, "FileLog_" . $deleteDevice);
Log3 $name, 2, "EnOcean $name device $deleteDevice deleted";
if (defined $oldDevice) {
Log3 $name, 2, "EnOcean $name renamed $oldDevice to $deleteDevice";
@ -10107,9 +10113,6 @@ sub EnOcean_CommandDelete($) {
my $name = $hash->{NAME};
my $oldDevice = $functionHash->{oldDevice};
CommandDelete(undef, $deleteDevice);
#CommandDelete(undef, "FileLog_" . $deleteDevice);
delete $defs{$deleteDevice};
delete $modules{EnOcean}{defptr}{$hash->{DEF}};
if (defined $oldDevice) {
Log3 $name, 2, "EnOcean $name: $oldDevice renamed to $deleteDevice";
CommandRename(undef, "$oldDevice $deleteDevice");
@ -10117,7 +10120,6 @@ sub EnOcean_CommandDelete($) {
} else {
Log3 $name, 2, "EnOcean $name: $deleteDevice deleted";
CommandSave(undef, undef);
#CommandRereadCfg(undef, undef);
}
return;
}
@ -10946,13 +10948,12 @@ EnOcean_Delete($$)
if (exists $defs{$logName}) {
my $count;
my $logFile = $defs{$logName}{logfile};
Log3 $hash->{NAME}, 2, "EnOcean_Delete (1): $logName $logFile";
$logFile =~ /^(.*)($name).*\.(.*)$/;
$logFile = $1 . $2 . "*." . $3;
CommandDelete(undef, "FileLog_$name");
#unlink glob "./log/$name*.log";
$count = unlink glob $logFile;
Log3 $hash->{NAME}, 2, "EnOcean_Delete (2): $logFile >> $count files deleted";
Log3 $hash->{NAME}, 5, "EnOcean_Delete: $logFile >> $count files deleted";
}
return undef;
}