git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
various fixes
[unfold.git]
/
manifold
/
metadata.py
diff --git
a/manifold/metadata.py
b/manifold/metadata.py
index
eb0e48a
..
1d8d5e8
100644
(file)
--- a/
manifold/metadata.py
+++ b/
manifold/metadata.py
@@
-14,7
+14,7
@@
class MetaData:
def __init__ (self, auth):
self.auth=auth
def __init__ (self, auth):
self.auth=auth
- self.hash_by_
su
bject={}
+ self.hash_by_
o
bject={}
# XXX Retrieve all metadata the first time we instanciate the class
self.fetch()
# XXX Retrieve all metadata the first time we instanciate the class
self.fetch()
@@
-24,7
+24,7
@@
class MetaData:
if work_offline:
try:
with file(offline_metadata) as f:
if work_offline:
try:
with file(offline_metadata) as f:
- self.hash_by_
su
bject=json.loads(f.read())
+ self.hash_by_
o
bject=json.loads(f.read())
return
except:
print "metadata.work_offline: failed to decode %s"%offline_filename
return
except:
print "metadata.work_offline: failed to decode %s"%offline_filename
@@
-36,7
+36,7
@@
class MetaData:
'column.allowed_values', 'column.platforms.platform',
'column.platforms.platform_url']
rows_result = manifold_api.Get({
'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:objects', # proposed to replace metadata:table
'fields': fields
})
#old# rows_result = manifold_api.Get('metadata:table', [], [], fields)
'fields': fields
})
#old# rows_result = manifold_api.Get('metadata:table', [], [], fields)
@@
-44,17
+44,17
@@
class MetaData:
if not rows:
print "Failed to retrieve metadata",rows_result.error()
rows=[]
if not rows:
print "Failed to retrieve metadata",rows_result.error()
rows=[]
- self.hash_by_
su
bject = dict ( [ (row['table'], row) for row in rows ] )
+ self.hash_by_
o
bject = dict ( [ (row['table'], row) for row in rows ] )
# save for next time we use offline mode
if debug:
with file(offline_filename,'w') as f:
# save for next time we use offline mode
if debug:
with file(offline_filename,'w') as f:
- f.write(json.dumps(self.hash_by_
su
bject))
+ f.write(json.dumps(self.hash_by_
o
bject))
def to_json(self):
def to_json(self):
- return json.dumps(self.hash_by_
su
bject)
+ return json.dumps(self.hash_by_
o
bject)
- def details_by_
subject (self, su
bject):
- return self.hash_by_
subject[su
bject]
+ def details_by_
object (self, o
bject):
+ return self.hash_by_
object[o
bject]
- def sorted_fields_by_
subject (self, su
bject):
- return self.hash_by_
subject[su
bject]['columns'].sort()
+ def sorted_fields_by_
object (self, o
bject):
+ return self.hash_by_
object[o
bject]['columns'].sort()