From b9609113d8ae09bfab3dafbdc503edbe51797181 Mon Sep 17 00:00:00 2001
From: eisler <eisler@users.noreply.github.com>
Date: Sat, 17 Jun 2017 14:46:58 +0000
Subject: [PATCH] bugfix: 10_MQTT_DEVICE.pm: publishSet patch from hexenmeister
 (Forum #msg648963)

git-svn-id: https://svn.fhem.de/fhem/trunk@14529 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED                |  1 +
 fhem/FHEM/10_MQTT_DEVICE.pm | 39 ++++++++++++++++++++++++++-----------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index dd71a2b8a..5adde9cd9 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,5 +1,6 @@
 # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
 # Do not insert empty lines here, update check depends on it.
+  - bugfix: 10_MQTT_DEVICE.pm: publishSet patch (Forum #msg648963)
   - feature: 10_MQTT_DEVICE.pm: publishSet patch (Forum #msg648596)
   - feature: 01_FHEMWEB.pm: selectnumbers widget modifier (Forum #73188)
   - feature: 98_structure.pm: add evaluateSetResult attribute (Forum #73113)
diff --git a/fhem/FHEM/10_MQTT_DEVICE.pm b/fhem/FHEM/10_MQTT_DEVICE.pm
index 4e2a542a3..8f3aaf329 100644
--- a/fhem/FHEM/10_MQTT_DEVICE.pm
+++ b/fhem/FHEM/10_MQTT_DEVICE.pm
@@ -82,16 +82,22 @@ sub Define() {
 sub Set($$$@) {
   my ($hash,$name,$command,@values) = @_;
   return "Need at least one parameters" unless defined $command;
-  return "Unknown argument $command, choose one of " . join(" ", map {$hash->{sets}->{$_} eq "" ? $_ : "$_:".$hash->{sets}->{$_}} sort keys %{$hash->{sets}})
-    if(!defined($hash->{sets}->{$command}) && @values);
   my $msgid;
-  if (@values) {
-    my $value = join " ",@values;
-    $msgid = send_publish($hash->{IODev}, topic => $hash->{publishSets}->{$command}->{topic}, message => $value, qos => $hash->{qos}, retain => $hash->{retain});
-    readingsSingleUpdate($hash,$command,$value,1);
-  } else {
-    $msgid = send_publish($hash->{IODev}, topic => $hash->{publishSets}->{""}->{topic}, message => $command, qos => $hash->{qos}, retain => $hash->{retain});
-    readingsSingleUpdate($hash,"state",$command,1);
+  my $mark=0;
+  if($command ne '?') {
+    if(defined($hash->{publishSets}->{$command})) {
+      my $value = join " ",@values;
+      $msgid = send_publish($hash->{IODev}, topic => $hash->{publishSets}->{$command}->{topic}, message => $value, qos => $hash->{qos}, retain => $hash->{retain});
+      readingsSingleUpdate($hash,$command,$value,1);
+      $mark=1;
+    } elsif(defined($hash->{publishSets}->{""})) {
+      $msgid = send_publish($hash->{IODev}, topic => $hash->{publishSets}->{""}->{topic}, message => $command, qos => $hash->{qos}, retain => $hash->{retain});
+      readingsSingleUpdate($hash,"state",$command,1);
+      $mark=1;
+    }
+  }
+  if(!$mark) {
+    return "Unknown argument $command, choose one of " . join(" ", map {$hash->{sets}->{$_} eq "" ? $_ : "$_:".$hash->{sets}->{$_}} sort keys %{$hash->{sets}})
   }
   $hash->{message_ids}->{$msgid}++ if defined $msgid;
   readingsSingleUpdate($hash,"transmission-state","outgoing publish sent",1);
@@ -151,8 +157,19 @@ sub Attr($$$$) {
           topic    => $topic,
         };
         if ($2 eq "") {
-          foreach my $set (@values) {
-            $hash->{sets}->{$set}="";
+          if(@values) {
+            foreach my $set (@values) {
+              $hash->{sets}->{$set}="";
+              my($setname,@restvalues) = split(":",$set);
+              if(@restvalues) {
+                $hash->{publishSets}->{$setname} = {
+                  'values' => \@restvalues,
+                  topic    => $topic,
+                };
+              }
+            }
+          } else {
+            $hash->{sets}->{""}="";
           }
         } else {
           $hash->{sets}->{$2}=join(",",@values);