Макроподстановки в топике MQTT для удобства связывания с OpenHAB

diff --git a/weathermon.lua b/weathermon.lua
index 5e193487d37bbdeeca22f122a8ed4f3b35a50a92..b2ca89897c47834c7bc6a93d8c71f0131f13c3ef 100755 (executable)
--- a/weathermon.lua
+++ b/weathermon.lua
@@ -71,11 +71,11 @@ function getConfig()
   end
 
   if mqtt_host and not mqtt_topic then
   end
 
   if mqtt_host and not mqtt_topic then

-    mqtt_topic = 'weathermon/'..web_devid
+    mqtt_topic = 'weathermon/{dev}/{type}/{id}/{param}'

   end
 
   if mqtt_host and not mqtt_alarm_topic then
   end
 
   if mqtt_host and not mqtt_alarm_topic then

-    mqtt_alarm_topic = 'alarm/'..web_devid
+    mqtt_alarm_topic = 'alarm/{dev}/{type}/{id}'

   end
 
 end
   end
 
 end


@@ -166,16 +166,26 @@ function processLine(str)
         end
       end
     end
         end
       end
     end

-    mqtt_param = {}

     for k,v in pairs(sensor) do
       printLog("Type = "..sensor_type..", ID = "..sensor_id..", Param = "..k..", Value = "..v)
       submitValue(sensor_type,sensor_id,k,v)
     for k,v in pairs(sensor) do
       printLog("Type = "..sensor_type..", ID = "..sensor_id..", Param = "..k..", Value = "..v)
       submitValue(sensor_type,sensor_id,k,v)

-      mqtt_param[k]=v
-    end
-    mqtt_msg = { type=sensor_type, id=sensor_id, data=mqtt_param }
-    if mqtt_client then
-      serializedString = json.encode(mqtt_msg)
-      mqtt_client:publish(mqtt_topic,serializedString)
+      if mqtt_client then
+        mqtt_path=string.gsub(mqtt_topic,"{(.-)}", 
+          function (name) 
+            if name=="dev" then
+              return web_devid
+            elseif name=="type" then
+              return sensor_type
+            elseif name=="id" then
+              return sensor_id
+            elseif name=="param" then
+              return k
+            else
+              return '{'..name..'}'
+            end      
+          end)
+        mqtt_client:publish(mqtt_path,v)
+      end  

     end
   elseif msg_type=="ALARM" then
     printLog("ALARM: "..msg_body)  
     end
   elseif msg_type=="ALARM" then
     printLog("ALARM: "..msg_body)  


@@ -194,15 +204,23 @@ function processLine(str)
           alarm_type=value
         elseif key=="ID" then
           alarm_id=value
           alarm_type=value
         elseif key=="ID" then
           alarm_id=value

-        else
-          mqtt_param[key]=value

         end
       end
     end
     if mqtt_client then
         end
       end
     end
     if mqtt_client then

-      mqtt_msg = { type = alarm_type, id = alarm_id, data = mqtt_param }
-      serializedString = json.encode(mqtt_msg)
-      mqtt_client:publish(mqtt_alarm_topic,serializedString)
+      mqtt_path=string.gsub(mqtt_alarm_topic,"{(.-)}", 
+        function (name) 
+          if name=="dev" then
+            return web_devid
+          elseif name=="type" then
+            return sensor_type
+          elseif name=="id" then
+            return sensor_id
+          else
+            return '{'..name..'}'
+          end      
+        end)
+      mqtt_client:publish(mqtt_path,msg_body)

     end
     if alarm_exec then
       command=alarm_exec..
     end
     if alarm_exec then
       command=alarm_exec..