Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-01 20:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

98_GAEBUS.pm : add support for values listed by find -p

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@18984 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jamesgo 2019-03-21 15:25:17 +00:00
parent 77ad20fe1f
commit 544b1b7a22
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
FHEM/98_GAEBUS.pm
View File

@ -47,6 +47,7 @@
# 03.01.2019 : A.Goebel : fix mask tilde in set/get # 03.01.2019 : A.Goebel : fix mask tilde in set/get
# 03.01.2019 : A.Goebel : fix change regexp for parsing commands from "/^w$delimiter.{1,7}$delimiter.*/" to "/^w$delimiter[^$delimiter]{1,}$delimiter.*/" to support "feuerung" as class # 03.01.2019 : A.Goebel : fix change regexp for parsing commands from "/^w$delimiter.{1,7}$delimiter.*/" to "/^w$delimiter[^$delimiter]{1,}$delimiter.*/" to support "feuerung" as class
# 28.02.2019 : A.Goebel : fix port 8888 was hardcoded in GAEBUS_OpenDev, use $port instead (highlighted by user freetz) # 28.02.2019 : A.Goebel : fix port 8888 was hardcoded in GAEBUS_OpenDev, use $port instead (highlighted by user freetz)
# 21.03.2019 : A.Goebel : add support for find -p
package main; package main;
@ -479,8 +480,8 @@ GAEBUS_Get($@)
$readingname =~ s/ .*//; $readingname =~ s/ .*//;
$readingname =~ s/:.*//; $readingname =~ s/:.*//;
# only for "r" commands # only for "r" and "u" commands
if ($oneattr =~ /^r$delimiter[^$delimiter]{1,}$delimiter.*/) if ($oneattr =~ /^[ru]$delimiter[^$delimiter]{1,}$delimiter.*/)
{ {
$readings{$readingname} = $readingcmdname; $readings{$readingname} = $readingcmdname;
$readingsCmdaddon{$readingname} = $cmdaddon; $readingsCmdaddon{$readingname} = $cmdaddon;
@ -543,7 +544,7 @@ GAEBUS_Get($@)
if (defined($a[1])) { $a[1] =~ s/\xe2\x88\xbc/~/g }; if (defined($a[1])) { $a[1] =~ s/\xe2\x88\xbc/~/g };
if (defined($a[2])) { $a[2] =~ s/\xe2\x88\xbc/~/g }; if (defined($a[2])) { $a[2] =~ s/\xe2\x88\xbc/~/g };
if ($a[1] =~ /^[r]$delimiter/) if ($a[1] =~ /^[ru]$delimiter/ )
{ {
my $readingname = ""; my $readingname = "";
my $readingcmdname = $a[1].$delimiter.$a[2]; my $readingcmdname = $a[1].$delimiter.$a[2];
@ -735,8 +736,8 @@ GAEBUS_Attr(@)
$reading =~ s/:.*//; $reading =~ s/:.*//;
foreach my $r (split /;/, $reading) { foreach my $r (split /;/, $reading) {
Log3 ($name, 3, "$name: delete reading: $reading"); Log3 ($name, 3, "$name: delete reading: $r");
delete($defs{$name}{READINGS}{$reading}); delete($defs{$name}{READINGS}{$r});
} }
} }
@ -918,7 +919,7 @@ GAEBUS_doEbusCmd($$$$$$$)
} elsif ($action eq "f") { } elsif ($action eq "f") {
$cmd = "find -f -r -w"; $cmd = "find -f -r -w -p";
} elsif ($action eq "i") { } elsif ($action eq "i") {
@ -927,15 +928,14 @@ GAEBUS_doEbusCmd($$$$$$$)
} elsif ($action eq "r") { } elsif ($action eq "r") {
my $force = " -f "; my $force = " -f ";
$force = "" if ($io eq "h"); $force = "" if ($io eq "u");
if ($cmdaddon =~ /\+f/) { if ($cmdaddon =~ /\+f/) {
$force = ""; $force = "";
$cmdaddon =~ s/\+f//; $cmdaddon =~ s/\+f//;
} }
$cmd = "$io "; $cmd = "r ";
#$cmd .= " -f " if ($io ne "h");
$cmd .= "$force"; $cmd .= "$force";
$cmd .= "-c $class " if ($class ne ""); $cmd .= "-c $class " if ($class ne "");
$cmd .= "$var "; $cmd .= "$var ";
@ -943,8 +943,8 @@ GAEBUS_doEbusCmd($$$$$$$)
} elsif ($action eq "v") { } elsif ($action eq "v") {
$cmd = "$io "; $cmd = "r ";
$cmd .= " -f " if ($io ne "h"); $cmd .= " -f " if ($io ne "u");
$cmd .= "-v "; $cmd .= "-v ";
$cmd .= "-c $class " if ($class ne ""); $cmd .= "-c $class " if ($class ne "");
$cmd .= "$var "; $cmd .= "$var ";
@ -1041,11 +1041,13 @@ GAEBUS_doEbusCmd($$$$$$$)
next if ($class =~ /^scan/); next if ($class =~ /^scan/);
push @{$sets{$io.$delimiter.$class}}, $var.$delimiter.$comment if ($io eq "r" or $io eq "h"); push @{$sets{"r".$delimiter.$class}}, $var.$delimiter.$comment if ($io =~ /r/);
push @{$sets{"u".$delimiter.$class}}, $var.$delimiter.$comment if ($io =~ /u/);
push @{$setsForWriting{$io.$delimiter.$class}}, $var.$delimiter.$comment if ($io eq "w" or $io eq "wi"); push @{$setsForWriting{"w".$delimiter.$class}}, $var.$delimiter.$comment if ($io =~ /w/);
push @{$gets{$io.$delimiter.$class}}, $var.$delimiter.$comment if ($io eq "r" or $io eq "h"); push @{$gets{"r".$delimiter.$class}}, $var.$delimiter.$comment if ($io =~ /r/);
push @{$gets{"u".$delimiter.$class}}, $var.$delimiter.$comment if ($io =~ /u/);
} }