Added metadata in REST API

git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/trunk@2012 b32b6428-25c9-4566-ad07-03861ab6144f

apps/rest/xaal/rest/app.py

@@ -40,6 +40,7 @@ def setup_xaal():
     if not cfg:
         logger.info("No config file found, building a new one")
         cfg = tools.new_cfg(PACKAGE_NAME)
+        cfg['config']['db_server'] = ''
         cfg.write()
     dev            = Device("hmi.basic")
     dev.address    = cfg['config']['addr']
@@ -49,7 +50,10 @@ def setup_xaal():
     dev.info       = "%s@%s" % (PACKAGE_NAME,platform.node())
 
     engine.add_device(dev)
-    monitor = Monitor(dev,filter_func=monitor_filter)
+    db_server = cfg['config'].get('db_server',None)
+    if not db_server:
+        logger.info('Please set a db_server in your config file')
+    monitor = Monitor(dev,filter_func=monitor_filter,db_server=db_server)
     engine.start()        
     green_let = Greenlet(xaal_loop, engine)
     green_let.start()
@@ -92,6 +96,7 @@ def get_device(addr):
         res = {'address':dev.address,'devtype':dev.devtype}
         res.update({'attributes':dev.attributes})
         res.update({'description':dev.description})
+        res.update({'metadata':dev.db})
     else:
         res = {'error':{'code':404,'message':'Unknow device'}}
         response.status=404

apps/rest/xaal/rest/static/device.html

@@ -25,6 +25,12 @@
 <table id="attributes">
 </table>
 
+
+<h2>Metadata</h2>
+<table id="metadata">
+</table>
+
+
 <script type="text/javascript">
 function getUrlVars () {
     var vars = [], hash;
@@ -60,6 +66,10 @@ function update() {
             $("#attributes").append("<tr><td>"+id+"</td><td>"+field+"</td></tr>");
         });
         
+        $("#metadata").html("<tr><th>Name</th><th>Value</th></tr>");        
+        $.each(result["metadata"], function(id, field){          
+            $("#metadata").append("<tr><td>"+id+"</td><td>"+field+"</td></tr>");
+        });
     });
 }