controllers/sql

applications/service/controllers/sql.py

@@ -15,9 +15,12 @@ def index():
 
 @request.restful()
 def data():
+    if request.extension is 'html':
+        request.extension = 'json'
     response.view = 'generic.'+request.extension
     if request.env.http_origin:
         response.headers['Access-Control-Allow-Origin'] = '*'
+        
     def GET(*args, **kargs):
         if len(args) == 0: 
             redirect('index')
@@ -30,14 +33,6 @@ def data():
             db = globals()[db_name]
             table = db[table_name]
             sensors = db().select(table.ALL, orderby='id DESC', limitby=(0,1))
-
-        # kmodules = info(info.sql_db.database==db_name)\
-        #                (info.sql_module.db==info.sql_db.id).\
-        #                select(info.sql_module.ALL)
-        # all_sensors = [ info(info.sql_module.id==m.id)\
-        #                 (info.sql_module.id==info.sql_sensor.module).\
-        #                 select(info.sql_sensor.ALL) \
-        #                 for m in kmodules ]
-        return dict(sensors=sensors)
+        return dict(data=sensors)
 
     return locals()