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

diff --git a/manifold/metadata.py b/manifold/metadata.py
index c092dfdc..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
@@ -14,40 +15,57 @@ 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"
+        offline_filename="%s/../offline-metadata.json"%os.path.dirname(__file__)
         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
         manifold_api = ManifoldAPI(self.auth)
-        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']
-        rows_result = manifold_api.Get('metadata:table', [], [], fields)
-        rows = rows_result.ok_value()
-        if not rows:
-            print "Failed to retrieve metadata",rows_result.error()
-        self.hash_by_subject = dict ( [ (row['table'], row) for row in rows ] )
+        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.forward({
+            'action': 'get',
+            'object': 'local:object', # proposed to replace metadata:table
+            'fields':     fields 
+        })
+
+        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_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()
 
+    def get_field_type(self, object, field):
+        print "Temp fix for metadata::get_field_type() -> consider moving to manifold.core.metadata soon"
+        return field