Changeset 11

Timestamp:

2010-07-07 09:13:56 (15 years ago)

Author:

javier_guerra

Message:

put lua code in a <![CDATA[ .... ]]>
start to get rid of curlqueue

File:

• energy profiling/I_EnergyProfiler1.xml (modified) (11 diffs)

energy profiling/I_EnergyProfiler1.xml ¶

@@ -2 +2 @@
 <implementation>
     <functions>
+    <![CDATA[
 ---[[
         local socket = require "socket"
@@ -78 +79 @@
                 table.insert (o, string.format('%s=%s',url.escape(k),url.escape(v)))
             end
-            return table.concat (o, '&amp;')
+            return table.concat (o, '&')
         end
         
@@ -119 +120 @@
             local taskhandle = -1
             function taskandlog (msg, ...)
-                if select ('#', ...) &gt; 0 then
+                if select ('#', ...) > 0 then
                     msg = msg:format (...)
                 end
@@ -263 +264 @@
             local days_checked,
                 times_of_day,
-                params_to_check = configstring:match ('([^&amp;]*)&amp;([^&amp;]*)&amp;(.*)$')
+                params_to_check = configstring:match ('([^&]*)&([^&amp;]*)&(.*)$')
             if not days_checked then return end
             luup.log (('days_checked="%s"'):format (days_checked))
@@ -284 +285 @@
                 users_checked,
                 provider,
-                energy_scene = params_to_check:match ('([^&amp;]*)&amp;([^&amp;]*)&amp;([^&amp;]*)&amp;([^&amp;]*)&amp;([^&amp;]*)&amp;([^&amp;]*)&amp;([^&amp;]*)&amp;([^&amp;]*)')
+                energy_scene = params_to_check:match ('([^&]*)&([^&]*)&([^&]*)&([^&]*)&amp;([^&]*)&([^&]*)&amp;(*)&amp;([^&amp;]*)')
             if not lights_on then return end
             luup.log (('lights_on="%s"'):format (lights_on))
@@ -298 +299 @@
                 local on_lights = count_on_lights()
                 luup.log (string.format ("currently %s lights on", on_lights))
-                if on_lights &gt;= tonumber (lights_on_count) then
+                if on_lights > tonumber (lights_on_count) then
                     send_alert (users_checked, string.format ("You've left %d lights on", on_lights))
                     run_scene (energy_scene)
@@ -316 +317 @@
                 local current_watts = measure_watts()
                 luup.log (string.format ("you're using %s watts", current_watts))
-                if current_watts &gt;= tonumber (watts_count) then
+                if current_watts >= tonumber (watts_count) then
                     send_alert (users_checked, string.format ("You're using %s watts", current_watts))
                     run_scene (energy_scene)
@@ -455 +456 @@
             if not profile_config or type(profile_config) ~= "string" then error ("no config") end
             
-            local meter_id, secs, email = profile_config:match("^([%d]*)&amp;([%d]*)&amp;(.*)$")
+            local meter_id, secs, email = profile_config:match("^([%d]*)&([%d]*)&(.*)$")
             if not meter_id then error ("can't parse config") end
             
@@ -568 +569 @@
                 luup.call_timer ('p_saveELog', 1, '30m', '','')
                 return 0
+            end
+            
+            function report_Energy ()
+                local query = {
+                    PK_AccessPoint=luup.pk_accesspoint,
+                    HW_Key=luup.hw_key,
+                    DateTime=os.date('%Y-%m-%d %H:%M:%S'),
+                }
+                local now = os.time()
+                for k,v in pairs (digestedWattage) do
+                    -- dummy change
+                    w_watts (k, em_serv, "Watts", tostring(v.curWatt), tostring(v.curWatt))
+                    local tspan = os.difftime (now, v.startRep)
+                    if tspan > 0 then
+                        local avg = v.total / tspan
+                        query[("PK_Device_%d"):format(k)] = ('%s:%s'):format (tostring(avg), tostring(v.peak))
+                    end
+                    v.total = 0
+                    v.startRep = now
+                    v.peak = 0
+                end
+                local url = socket.url.build {
+                    host = luup.luup.event_server,
+                    path = 'report_energy_log_1.php',
+                    query = params(query)
+                }
+                luup.log ('url: '..url)
             end
 
@@ -623 +651 @@
         --          p_saveRooms (watchedDevices)
                 luup.call_timer ('p_saveELog', 1, '3s', '','')
+                luup.call_timer ('report_Energy', 1, '5s', '','')
                 luup.log ('EnergyMonitor initialized')
             end
@@ -636 +665 @@
             try_profiling (lul_device)
         end
+    ]]>
     </functions>
     <startup>te_startup</startup>