X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmetadata.py;h=5f287ec95c5c8dee94e2a67cafb8a2e35d3a0997;hb=74b3a7675c43e2884b396cd9d5febfebc6e9ff97;hp=3475139fef1c68358a8ba18f13153b5ed54c62ca;hpb=ec4be8cfef3ed6b3dc1742a95efd014da8f01893;p=myslice.git

diff --git a/manifold/metadata.py b/manifold/metadata.py
index 3475139f..5f287ec9 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
@@ -13,7 +17,7 @@ class MetaData:
         self.hash_by_subject={}
 
     def fetch (self):
-        offline_filename="offline_metadata.json"
+        offline_filename="offline-metadata.json"
         if work_offline:
             try:
                 with file(offline_metadata) as f:
@@ -28,11 +32,17 @@ 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(fact_table='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 ] )
         # 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:
+            with file(offline_filename,'w') as f:
+                f.write(json.dumps(self.hash_by_subject))
 
     def to_json(self):
         return json.dumps(self.hash_by_subject)