X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=sensorvalues-to-json-zmq.py;h=e2ed5d69f507bf1c2d1f67f1c051441a2274ccad;hb=edb1efde632b3a2ddcfab41b75d1da61559d098c;hp=aec3fef43dc5aada69724fecaab2f5faa657fbcf;hpb=5722f9008b5b385bc7fa0cbcad5e8fcae565b78b;p=svn42.git

diff --git a/sensorvalues-to-json-zmq.py b/sensorvalues-to-json-zmq.py
index aec3fef..e2ed5d6 100755
--- a/sensorvalues-to-json-zmq.py
+++ b/sensorvalues-to-json-zmq.py
@@ -246,15 +246,26 @@ if __name__ == "__main__":
 
     try:
         with open(uwscfg.json_moveto_path,"rb") as fh:
-            sensor_store = json.loads(fh.read())
+            sensor_store_ = json.loads(fh.read())
     except Exception, e:
         logging.debug(e)
         try:
             with open(uwscfg.json_backup_path,"rb") as fh:
-                sensor_store = json.loads(fh.read())
+                sensor_store_ = json.loads(fh.read())
         except Exception, e:
             logging.debug(e)
 
+
+    for k in set(sensor_store_.keys()).difference(set(uwscfg.zmq_subscribe.split(" "))):
+      del sensor_store_[k]  # del old sensordata of sensor we do not subscribe to
+
+    for k in sensor_store_.keys():
+      try:
+	if len(sensor_store_[k][0]) > 1:
+          sensor_cols_num_[k] = len(sensor_store_[k][0]) -1
+      except:
+        pass
+
     while True:
       try:
         #Start zmq connection to publish / forward sensor data
@@ -291,7 +302,7 @@ if __name__ == "__main__":
             cleanTempLastValueOfMovementValues()
 
             backup_counter += 1
-            # save sensor_store to json for apache
+            # save sensor_store_ to json for apache
             with open(uwscfg.json_write_path,"wb") as fh:
                 fh.truncate()
                 fh.write(json.dumps(sensor_store_))