X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmetadata.py;h=4bb32845a9528e0ca4ea0e28d7d46623152f594e;hb=af7c18aea18be19b7227b25a019af4d257cee7dd;hp=eb0e48a4c80dcd800c3e653623eb74a762e4b0c1;hpb=f14a5114d0cf6673c172bdb89669fa80efcd3f2b;p=myslice.git

diff --git a/manifold/metadata.py b/manifold/metadata.py
index eb0e48a4..4bb32845 100644
--- a/manifold/metadata.py
+++ b/manifold/metadata.py
@@ -14,17 +14,14 @@ class MetaData:
 
     def __init__ (self, auth):
         self.auth=auth
-        self.hash_by_subject={}
-
-        # XXX Retrieve all metadata the first time we instanciate the class
-        self.fetch()
+        self.hash_by_object={}
 
     def fetch (self):
         offline_filename="offline-metadata.json"
         if work_offline:
             try:
                 with file(offline_metadata) as f:
-                    self.hash_by_subject=json.loads(f.read())
+                    self.hash_by_object=json.loads(f.read())
                 return
             except:
                 print "metadata.work_offline: failed to decode %s"%offline_filename
@@ -36,25 +33,25 @@ class MetaData:
                   'column.allowed_values', 'column.platforms.platform',
                   'column.platforms.platform_url']
         rows_result = manifold_api.Get({
-            'fact_table': '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=[]
-        self.hash_by_subject = dict ( [ (row['table'], row) for row in 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_subject))
+                f.write(json.dumps(self.hash_by_object))
 
     def to_json(self):
-        return json.dumps(self.hash_by_subject)
+        return json.dumps(self.hash_by_object)
 
-    def details_by_subject (self, subject):
-        return self.hash_by_subject[subject]
+    def details_by_object (self, object):
+        return self.hash_by_object[object]
 
-    def sorted_fields_by_subject (self, subject):
-        return self.hash_by_subject[subject]['columns'].sort()
+    def sorted_fields_by_object (self, object):
+        return self.hash_by_object[object]['column'].sort()