X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmetadata.py;h=4fbbc0668ef1fb63e43690f71494394e85383bd4;hb=5f03119b3bc1f16e68dd805c4b5773ba1ee7148e;hp=f250228be5c92f0e9c228bc4fc6aa4c0c9bb087d;hpb=f32b4c0960cdeba72c6023b54464d1e70e0534fb;p=myslice.git

diff --git a/manifold/metadata.py b/manifold/metadata.py
index f250228b..4fbbc066 100644
--- a/manifold/metadata.py
+++ b/manifold/metadata.py
@@ -1,4 +1,5 @@
 import json 
+import os.path
 
 from manifold.manifoldresult import ManifoldResult
 from manifold.manifoldapi import ManifoldAPI
@@ -17,7 +18,7 @@ class MetaData:
         self.hash_by_object={}
 
     def fetch (self):
-        offline_filename="offline-metadata.json"
+        offline_filename="%s/../offline-metadata.json"%os.path.dirname(__file__)
         if work_offline:
             try:
                 with file(offline_metadata) as f:
@@ -26,14 +27,15 @@ class MetaData:
             except:
                 print "metadata.work_offline: failed to decode %s"%offline_filename
         manifold_api = ManifoldAPI(self.auth)
-        fields = ['table', 'column.name', 'column.qualifier', 'column.type', 'column.is_array', 'column.description']
+        fields = ['table', 'column.name', 'column.qualifier', 'column.type', 'column.is_array', 'column.description', 'column.default', 'key', 'capability']
         #fields = ['table', 'column.column',
         #          'column.description','column.header', 'column.title',
         #          'column.unit', 'column.info_type',
         #          'column.resource_type', 'column.value_type',
         #          'column.allowed_values', 'column.platforms.platform',
         #          'column.platforms.platform_url']
-        result = manifold_api.Get({
+        result = manifold_api.forward({
+            'action': 'get',
             'object': 'local:object', # proposed to replace metadata:table
             'fields':     fields 
         })