bug1: views on server; bug2: sql/api

.gitignore

@@ -3,6 +3,7 @@ sessions/
 errors/
 cache/
 cron/
+private/
 
 progress.log
 ABOUT

LICENSE

@@ -1,4 +0,0 @@
-The web2py welcome app is licensed under public domain 
-(except for the css and js files that it includes, which have their own third party licenses).
-
-You can modify this license when you add your own code.

controllers/sql.py

@@ -1,4 +1,5 @@
 def index():
+    response.generic_patterns = ['*.html']
     db = meta_dbs()
     return locals()
 
@@ -35,7 +36,9 @@ def api():
         request.extension = 'xml'
     if request.env.http_origin:
         response.headers['Access-Control-Allow-Origin'] = '*'
-        
+    response.generic_patterns = ['*.html', '*.xml', '*.json']
+
+
     def GET(*args, **kargs):        
         try:
             db_key = args[0]
@@ -51,7 +54,9 @@ def api():
             request.extension = 'html'
             redirect('error')
         else:
-            modules = meta_modules(db_key)
+            modules = [ m.name for m in meta_modules(db_key) ] 
+
+        logger.info(locals().get('modules'))
 
         try:
             module = args[1]
@@ -61,7 +66,7 @@ def api():
             # for m in modules:
             #     s = meta_sensors(db_key, m.name)
             #     mods[m.name] = [ _s.name for _s in s ]
-            mods = { m.name: [ s.name for s in meta_sensors(db_key, m.name) ] for m in modules }
+            mods = { m: [ s.name for s in meta_sensors(db_key, m) ] for m in modules }
             # mods = { m.name : meta_sensors(db_key, m.name) for m in modules } 
             return dict(error=error, modules=mods)
 
@@ -81,7 +86,7 @@ def api():
         db_connector = kitcube[db_key]
         views = db_connector.views
 
-        if module in modules.values():
+        if module in modules:
             res = db_connector.query(module, len=len)
         elif module in views.keys():
             v = views[module]
@@ -94,7 +99,7 @@ def api():
 
         unit = {}
         if kargs.get('unit', None):
-            if module in modules.values():
+            if module in modules:
                 unit[module] = info(info.sql_sensor.module_name==module).select(info.sql_sensor.name, info.sql_sensor.unit)
             else:
                 for mod, s in views[module]: