X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmetadata.py;h=4bb32845a9528e0ca4ea0e28d7d46623152f594e;hb=e256853ef256809864927b91deb42e713baea769;hp=1d8d5e8f66011af97426219f523b1fd428007d1a;hpb=9e6b289bad3042093d0414ed90a336aaa5bfa09a;p=unfold.git

diff --git a/manifold/metadata.py b/manifold/metadata.py
index 1d8d5e8f..4bb32845 100644
--- a/manifold/metadata.py
+++ b/manifold/metadata.py
@@ -16,9 +16,6 @@ class MetaData:
         self.auth=auth
         self.hash_by_object={}
 
-        # XXX Retrieve all metadata the first time we instanciate the class
-        self.fetch()
-
     def fetch (self):
         offline_filename="offline-metadata.json"
         if work_offline:
@@ -36,17 +33,17 @@ class MetaData:
                   'column.allowed_values', 'column.platforms.platform',
                   'column.platforms.platform_url']
         rows_result = manifold_api.Get({
-            'object': 'local:objects', # proposed to replace metadata:table
+            'object': 'local:object', # proposed to replace metadata:table
             'fields':     fields 
         })
-#old#        rows_result = manifold_api.Get('metadata:table', [], [], fields)
         rows = rows_result.ok_value()
-        if not rows:
-            print "Failed to retrieve metadata",rows_result.error()
-            rows=[]
+# API errors will be handled by the outer logic
+#        if not rows:
+#            print "Failed to retrieve metadata",rows_result.error()
+#            rows=[]
         self.hash_by_object = dict ( [ (row['table'], row) for row in rows ] )
         # save for next time we use offline mode
-        if debug:
+        if debug and rows:
             with file(offline_filename,'w') as f:
                 f.write(json.dumps(self.hash_by_object))
 
@@ -57,4 +54,4 @@ class MetaData:
         return self.hash_by_object[object]
 
     def sorted_fields_by_object (self, object):
-        return self.hash_by_object[object]['columns'].sort()
+        return self.hash_by_object[object]['column'].sort()