### attempt to cope with old APIs and new APIs
if isinstance (result, dict) and 'code' in result:
# this sounds like a result from a new API, leave it untouched
- pass
+ # XXX jordan : we need to wrap it into a ResultValue structure
+ # XXX this is not good until we merge both repos
+ if result['code'] != 2:
+ return ManifoldResult(code=result['code'], value=result['value'])
+ else:
+ return ManifoldResult(code=result['code'], output=result['description'])
else:
if debug:
- print '===> backend call',methodName, self.auth, self.url,'->',
+ print '<=== backend call', methodName, args, kwds
+ print '.... ctd', 'Authmethod=',self.auth['AuthMethod'], self.url,'->',
if not result: print "[no/empty result]"
elif isinstance (result,str): print "result is '%s'"%result
elif isinstance (result,list): print "result is a %d-elts list"%len(result)
return func
def send_manifold_query (self, query):
- (action,subject)= (query.action,query.subject)
- # use e.g. self.Get rather than self.server.Get so we use the __getattr__ code
- if action=='get':
-# this makes the backend to squeak and one can't login anymore...
-# return self.Get(subject, query.filters, query.timestamp, query.fields)
- return self.Get(subject, query.filters, {}, query.fields)
- elif action=='update':
- answer=self.Update(subject, query.filters, query.params, query.fields)
- if not isinstance (answer, ManifoldResult): print "UNEXECPECTED answer", answer
- return answer
- else:
- warning="WARNING: ManifoldAPI.send_manifold_query: %s not implemented for now"%action
- print warning
- print 3
- return ManifoldResult(code=ManifoldCode.NOT_IMPLEMENTED, output=warning)
+ # We use a dictionary representation of the query for forwarding it to the API
+ ret = self.forward(query.to_dict())
+ if debug:
+ print "="*80
+ print "Result:"
+ print ret
+ print "="*80
+ return ret