Procházet zdrojové kódy

fix bug: construct table/field

Chuan Miao před 9 roky
rodič
revize
06f387af4d

+ 2 - 0
applications/service/controllers/sql.py

@@ -9,6 +9,8 @@ def index():
         info.sql_module.truncate()
         info.sql_sensor.truncate()
 
+    data = heads(heads.Data_011_EBM1_DAR.id>0).select(heads.Data_011_EBM1_DAR.ALL, orderby='id DESC', limitby=(0,1))
+
     return locals()
 
 @request.restful()

+ 3 - 2
applications/service/modules/kitcube.py

@@ -43,7 +43,7 @@ class DBConnector(object):
         if modules is None or sensors is None:
             modules, sensors = extract()
         for mod in modules:
-            s = search_objects(sensors, module_mark=mod['mark'])
+            s = search_objects(sensors, module_name=mod['name'])
             f = [ Field(k['name'], type=k['type'], length=k['length'], rname=k['rname']) for k in s ]
             self.connector.define_table(mod['name'], *f)
     def reconnect(self):
@@ -127,7 +127,8 @@ class KITCube(DBConnector):
                 except:
                     unit = None
 
-                sensors.append(dict(module_mark=mod['mark'], 
+                sensors.append(dict(module_mark=mod['mark'],
+                                    module_name=mod['name'],
                                     name=fld_name, type=fld_type, 
                                     length=fld_length, rname=rname, 
                                     unit=unit))

+ 2 - 1
applications/service/modules/sql_models.py

@@ -23,6 +23,7 @@ info.define_table('sql_sensor',
                     Field('unit', 'string'),
                     Field('length', 'integer'),
                     Field('rname', 'string'),
+                    Field('module_name', 'string'),
                     Field('module_mark', 'integer'),
                     Field('module', 'reference sql_module'))
   
@@ -44,7 +45,7 @@ for database in sql_databases:
           modules, sensors = connector.extract()
           module_marks = [ m['mark'] for m in modules]
           module_ids = {}
-          
+
           db_id = info.sql_db.insert(key=db_key, host=db_host, 
                                    db=db, modules=module_marks)
           for m in modules: