Обработка "полупустых" записей только с типом и ID датчика - актуально для сенсоров...

[weathermon.git] / weathermon.lua

diff --git a/weathermon.lua b/weathermon.lua
index af387297ccd5274478816d74928dd5baf4ae199b..b43b72ca358912c38b6a913cd285d477bff78708 100755 (executable)
--- a/weathermon.lua
+++ b/weathermon.lua
@@ -186,7 +186,7 @@ function processJson(str)
 
   for key,value in pairs(msg) do
     if value then
 
   for key,value in pairs(msg) do
     if value then

-      if key=="model" then
+      if key=="model" or key=="device" then

         sensor_type=value
       elseif key=="id" then
         sensor_id=value
         sensor_type=value
       elseif key=="id" then
         sensor_id=value


@@ -199,6 +199,9 @@ function processJson(str)
   end
 
   if not (sensor_type==nil or sensor_id==nil or sensor_type=='' or sensor_id=='') then
   end
 
   if not (sensor_type==nil or sensor_id==nil or sensor_type=='' or sensor_id=='') then

+    if next(sensor)==nil then
+      sensor["command"]="alarm"
+    end

     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)