X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmetadata.py;h=04f8511f12aa6d08141a656b4faee717a39ef374;hb=4c7212bd04ddb65511c42aac5bae6fc3044cd846;hp=0924ded0bffb10a27bdce0d2a26a8fb059b0e050;hpb=7aa94c2c845b9b6c417293a2f3b92befbc57bdad;p=myslice.git

diff --git a/manifold/metadata.py b/manifold/metadata.py
index 0924ded0..04f8511f 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:
@@ -35,18 +32,25 @@ class MetaData:
                   'column.resource_type', 'column.value_type',
                   'column.allowed_values', 'column.platforms.platform',
                   'column.platforms.platform_url']
-        rows_result = manifold_api.Get({
+        result = manifold_api.Get({
             '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=[]
+
+        if result['code'] == 1: # warning
+            messages.warning(request, result['description'])
+        elif result['code'] == 2:
+            messages.error(request, result['description'])
+            # XXX FAIL HERE XXX
+
+        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
-        if debug:
+        if debug and rows:
             with file(offline_filename,'w') as f:
                 f.write(json.dumps(self.hash_by_object))
 
@@ -57,4 +61,8 @@ 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()
+
+    def get_field_type(self, object, field):
+        print "Temp fix for metadata::get_field_type() -> consider moving to manifold.core.metadata soon"
+        return field