From 3c1772b1ce9aa73a9308ab6420a6f6f48645552b Mon Sep 17 00:00:00 2001
From: Roman Bazalevsky <rvb@rvb.name>
Date: Thu, 15 Sep 2016 23:51:29 +0300
Subject: [PATCH] =?utf8?q?=D0=9C=D0=B0=D0=BA=D1=80=D0=BE=D0=BF=D0=BE=D0=B4?=
 =?utf8?q?=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BA=D0=B8=20=D0=B2=20?=
 =?utf8?q?=D1=82=D0=BE=D0=BF=D0=B8=D0=BA=D0=B5=20MQTT=20=D0=B4=D0=BB=D1=8F?=
 =?utf8?q?=20=D1=83=D0=B4=D0=BE=D0=B1=D1=81=D1=82=D0=B2=D0=B0=20=D1=81?=
 =?utf8?q?=D0=B2=D1=8F=D0=B7=D1=8B=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=81?=
 =?utf8?q?=20OpenHAB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 weathermon.lua | 46 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/weathermon.lua b/weathermon.lua
index 5e19348..b2ca898 100755
--- a/weathermon.lua
+++ b/weathermon.lua
@@ -71,11 +71,11 @@ function getConfig()
   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
-    mqtt_alarm_topic = 'alarm/'..web_devid
+    mqtt_alarm_topic = 'alarm/{dev}/{type}/{id}'
   end
 
 end
@@ -166,16 +166,26 @@ function processLine(str)
         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)
-      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)  
@@ -194,15 +204,23 @@ function processLine(str)
           alarm_type=value
         elseif key=="ID" then
           alarm_id=value
-        else
-          mqtt_param[key]=value
         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..
-- 
2.34.1