Транзакционная работа с БД для избежания блокировок.

[weathermon.git] / bin / weather-lcd

diff --git a/bin/weather-lcd b/bin/weather-lcd
index 779bc496cb3e64f37d77849d07cea77b062932b2..9abd84fac3d9cad802fe0c0e454ba0d62ff55723 100755 (executable)
--- a/bin/weather-lcd
+++ b/bin/weather-lcd
@@ -155,14 +155,13 @@ function setup_pages(conn)
         write_command(conn,"screen_add "..pageid)
         write_command(conn,"screen_set "..pageid.." -cursor off -name "..pagetitle.." -duration "..graph_duration)
         write_command(conn,"widget_add "..pageid.." "..pageid..".title title")
         write_command(conn,"screen_add "..pageid)
         write_command(conn,"screen_set "..pageid.." -cursor off -name "..pagetitle.." -duration "..graph_duration)
         write_command(conn,"widget_add "..pageid.." "..pageid..".title title")

-        write_command(conn,"widget_add "..pageid.." "..pageid..".max string")
-        write_command(conn,"widget_add "..pageid.." "..pageid..".min string")
-        for k = 3,height-1 do
-          write_command(conn,"widget_add "..pageid.." "..pageid..".place"..trim(tostring(k)).." string")
-        end
-        for k=1,width do
-          write_command(conn,"widget_add "..pageid.." "..pageid..".bar"..trim(tostring(k)).." vbar")
-        end
+        if height>2 then
+          write_command(conn,"widget_add "..pageid.." "..pageid..".max string")
+          write_command(conn,"widget_add "..pageid.." "..pageid..".min string")
+          for k = 3,height-1 do
+            write_command(conn,"widget_add "..pageid.." "..pageid..".place"..trim(tostring(k)).." string")
+          end
+        end  

         write_command(conn,"widget_set "..pageid.." "..pageid..".title \"".. pagetitle.."\"")
       end
     end
         write_command(conn,"widget_set "..pageid.." "..pageid..".title \"".. pagetitle.."\"")
       end
     end


@@ -199,9 +198,10 @@ function process_graphs()
       local vals = {}
       local maxval = -99999999
       local minval =  99999999
       local vals = {}
       local maxval = -99999999
       local minval =  99999999

+      local len

       for k=width,1,-1 do
         if row then
       for k=width,1,-1 do
         if row then

-          val = row["val"]
+          val = row["val"] * def["scale"]

           row = cur:fetch ({}, "a")
         else
           val = nil  
           row = cur:fetch ({}, "a")
         else
           val = nil  


@@ -211,16 +211,23 @@ function process_graphs()
         if val and (val < minval) then minval = val; end
       end          
       minval = math.floor(minval)
         if val and (val < minval) then minval = val; end
       end          
       minval = math.floor(minval)

-      local minvalstr = trim(tostring(minval))

       maxval = math.ceil(maxval)
       maxval = math.ceil(maxval)

-      local maxvalstr = trim(tostring(maxval))
-      local len = math.max(string.len(minvalstr),string.len(maxvalstr))
-      write_command(conn,"widget_set "..pageid.." "..pageid..".max "..trim(tostring(width-string.len(maxvalstr)+1)).." 2 "..maxvalstr)
-      for k = 3,height-1 do
-        write_command(conn,"widget_set "..pageid.." "..pageid..".place"..trim(tostring(k)).." "..trim(tostring(width-len+1)).." "..k.." \""..string.rep("-",len).."\"")
-      end
-      write_command(conn,"widget_set "..pageid.." "..pageid..".min "..trim(tostring(width-string.len(minvalstr)+1)).." "..height.." "..minvalstr)
+      if height>2 then
+        local minvalstr = trim(tostring(minval))
+        local maxvalstr = trim(tostring(maxval))
+        len = math.max(string.len(minvalstr),string.len(maxvalstr))
+        write_command(conn,"widget_set "..pageid.." "..pageid..".max "..trim(tostring(width-string.len(maxvalstr)+1)).." 2 "..maxvalstr)
+        write_command(conn,"widget_set "..pageid.." "..pageid..".min "..trim(tostring(width-string.len(minvalstr)+1)).." "..height.." "..minvalstr)
+        for k = 3,height-1 do
+          write_command(conn,"widget_set "..pageid.." "..pageid..".place"..trim(tostring(k)).." "..trim(tostring(width-len+1)).." "..k.." \" "..string.rep("-",len-1).."\"")
+        end
+      else
+        len = 0
+      end    

       local m = width
       local m = width

+      for k=1,width do
+        write_command(conn,"widget_del "..pageid.." "..pageid..".bar"..trim(tostring(k)))
+      end

       for k = width-len,1,-1 do
         val = vals[m]
         if val then
       for k = width-len,1,-1 do
         val = vals[m]
         if val then


@@ -228,12 +235,10 @@ function process_graphs()
         else
           h = 0
         end  
         else
           h = 0
         end  

+        write_command(conn,"widget_add "..pageid.." "..pageid..".bar"..trim(tostring(k)).." vbar")

         write_command(conn,"widget_set "..pageid.." "..pageid..".bar"..trim(tostring(k)).." "..k.." "..height.." "..h)
         m = m - 1
       end
         write_command(conn,"widget_set "..pageid.." "..pageid..".bar"..trim(tostring(k)).." "..k.." "..height.." "..h)
         m = m - 1
       end

-      for k= m,1,-1 do
-        write_command(conn,"widget_set "..pageid.." "..pageid..".bar"..trim(tostring(k)).." 0 0 0")
-      end

     end
   end
 end
     end
   end
 end


@@ -246,14 +251,19 @@ setup_pages(conn)
 
 while true do
 
 
 while true do
 

-  vals = process_file()
-  process_vals(vals)
+  pcall( function ()

 
 

-  if log_con then
-    process_graphs()
-  end  
+      vals = process_file()
+      process_vals(vals)
+
+      if log_con then
+        process_graphs()
+      end  

       
       

-  os.execute("inotifywait -e MODIFY \""..weather_file.."\"")
-  socket.sleep(3)
+      os.execute("inotifywait -e MODIFY \""..weather_file.."\"")
+  
+    end)
+
+    socket.sleep(3)

   
 end
   
 end