git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wip metadata
[myslice.git]
/
manifold
/
metadata.py
diff --git
a/manifold/metadata.py
b/manifold/metadata.py
index
59d600b
..
04f8511
100644
(file)
--- a/
manifold/metadata.py
+++ b/
manifold/metadata.py
@@
-32,11
+32,18
@@
class MetaData:
'column.resource_type', 'column.value_type',
'column.allowed_values', 'column.platforms.platform',
'column.platforms.platform_url']
'column.resource_type', 'column.value_type',
'column.allowed_values', 'column.platforms.platform',
'column.platforms.platform_url']
- r
ows_r
esult = manifold_api.Get({
+ result = manifold_api.Get({
'object': 'local:object', # proposed to replace metadata:table
'fields': fields
})
'object': 'local:object', # proposed to replace metadata:table
'fields': fields
})
- rows = rows_result.ok_value()
+
+ 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()
# API errors will be handled by the outer logic
# if not rows:
# print "Failed to retrieve metadata",rows_result.error()
@@
-54,4
+61,8
@@
class MetaData:
return self.hash_by_object[object]
def sorted_fields_by_object (self, object):
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