From cae105747e22338307e96da46a4802f385c648af Mon Sep 17 00:00:00 2001 From: justme-1968 Date: Fri, 3 Jan 2014 21:09:58 +0000 Subject: [PATCH] allow multiparam get git-svn-id: https://svn.fhem.de/fhem/trunk@4551 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/34_SWAP.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fhem/FHEM/34_SWAP.pm b/fhem/FHEM/34_SWAP.pm index 27d78e8bd..a5a52b64c 100755 --- a/fhem/FHEM/34_SWAP.pm +++ b/fhem/FHEM/34_SWAP.pm @@ -375,7 +375,7 @@ SWAP_Set($@) if( $cmd ne '?' ) { if( my @a = grep( $_ =~ /^$cmd($|:)/, keys %{$sl} ) ) { - return "set $cmd requires $sl->{$a[0]} parameter(s)" if( $sl->{$a[0]} != -99 && $sl->{$a[0]} != $cnt-1 ); + return "set $cmd requires $sl->{$a[0]} parameter(s)" if( defined($sl->{$cmd}) && $sl->{$cmd} != $cnt-1 ); if( my $set = $modules{$hash->{TYPE}}{SWAP_SetFn} ) { no strict "refs"; @@ -393,7 +393,7 @@ SWAP_Set($@) foreach my $cmd ( sort keys ( %{$sl} ) ) { $list .= " "; $list .= $cmd; - $list .= ":noArg" if( !$sl->{$cmd} ); + $list .= ":noArg" if( defined($sl->{$cmd}) && !$sl->{$cmd} ); } #$list .= " " . join(" ", sort keys %{$sl}); } @@ -634,8 +634,8 @@ SWAP_Get($@) if( my $gl = $modules{$hash->{TYPE}}{SWAP_GetList} ) { - if(defined($gl->{$cmd}) ) { - return "get $cmd requires $gl->{$cmd} parameter(s)" if( $gl->{$cmd} != int(@args) ); + if(exists($gl->{$cmd}) ) { + return "get $cmd requires $gl->{$cmd} parameter(s)" if( defined($gl->{$cmd}) && $gl->{$cmd} != int(@args) ); if( my $get = $modules{$hash->{TYPE}}{SWAP_GetFn} ) { no strict "refs"; @@ -649,7 +649,7 @@ SWAP_Get($@) foreach my $cmd ( sort keys ( %{$gl} ) ) { $list .= " "; $list .= $cmd; - $list .= ":noArg" if( !$gl->{$cmd} ); + $list .= ":noArg" if( defined($gl->{$cmd}) && !$gl->{$cmd} ); } #$list .= " " . join(" ", sort keys %{$gl}); }