X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmetadata.py;h=1b0e270852496f1e0a190f8927aa2119c2975910;hb=28994fa4ca7312850f9899adc67e71660a4a753d;hp=e8578c4389b7d1c1448e766d58d98f7d3e975f17;hpb=1568d2704bdabd0d35f8a8ba0a6eef5b2ebb047a;p=myslice.git

diff --git a/manifold/metadata.py b/manifold/metadata.py
index e8578c43..1b0e2708 100644
--- a/manifold/metadata.py
+++ b/manifold/metadata.py
@@ -1,7 +1,11 @@
 import json 
 
+from manifold.manifoldresult import ManifoldResult
 from manifold.manifoldapi import ManifoldAPI
 
+debug=False
+debug=True
+
 # turn this on if you want to work offline
 work_offline=False
 #work_offline=True
@@ -10,14 +14,14 @@ class MetaData:
 
     def __init__ (self, auth):
         self.auth=auth
-        self.hash_by_subject={}
+        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
@@ -28,18 +32,33 @@ class MetaData:
                   'column.resource_type', 'column.value_type',
                   'column.allowed_values', 'column.platforms.platform',
                   'column.platforms.platform_url']
-        results = manifold_api.Get('metadata:table', [], [], fields)
-        self.hash_by_subject = dict ( [ (result['table'], result) for result in results ] )
+        rows_result = manifold_api.Get({
+            'object': 'local:object', # proposed to replace metadata:table
+            'fields':     fields 
+        })
+
+        if row_results['code'] == 1: # warning
+            messages.warning(request, result['description'])
+        elif row_results['code'] == 2:
+            messages.error(request, result['description'])
+            # XXX FAIL HERE XXX
+
+        rows = rows_result.ok_value()
+# 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
-        with file(offline_filename,'w') as f:
-            f.write(json.dumps(self.hash_by_subject))
+        if debug and rows:
+            with file(offline_filename,'w') as f:
+                f.write(json.dumps(self.hash_by_object))
 
     def to_json(self):
-        return json.dumps(self.hash_by_subject)
-
-    def details_by_subject (self, subject):
-        return self.hash_by_subject[subject]
+        return json.dumps(self.hash_by_object)
 
-    def sorted_fields_by_subject (self, subject):
-        return self.hash_by_subject[subject]['columns'].sort()
+    def details_by_object (self, object):
+        return self.hash_by_object[object]
 
+    def sorted_fields_by_object (self, object):
+        return self.hash_by_object[object]['column'].sort()