X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=rest%2F__init__.py;h=faef22e1795f41369f4813e3dd77f82c87cc5552;hb=3886c4b8a044e867f5dad3cadcc0f149717790c1;hp=98b9d085baa792848f6daa888877dff647203c0b;hpb=be718e3336ee7ad98e90b0b3c97b58b37a467788;p=myslice.git diff --git a/rest/__init__.py b/rest/__init__.py index 98b9d085..faef22e1 100644 --- a/rest/__init__.py +++ b/rest/__init__.py @@ -50,7 +50,7 @@ class ObjectRequest(object): self.fields = ['user_id', 'email', 'password', 'config','status']; elif table == "account": # XXX TODO: Multiple key for account = (platform_id, user_id) - self.id = None + self.id = "platform_id, user_id" self.fields = ['platform_id', 'user_id', 'auth_type', 'config']; elif table == "platform": self.id = 'platform' @@ -120,7 +120,11 @@ class ObjectRequest(object): query = Query.create(self.type) # No filters for create if self.params : - query.set(self.params) + for p in self.params : + for k,v in p.iteritems() : + print "param: %s : %s" % (k,v) + query.set({k : v}) + print "query = ",query else: raise Exception, "Params are required for create" return execute_query(self.request, query) @@ -129,18 +133,18 @@ class ObjectRequest(object): query = Query.update(self.type) query = self.applyFilters(query, True) - print "rest/__init__ self = ",self - print "rest/__init__ params = ",self.params - if self.params : + for p in self.params : + for k,v in p.iteritems() : + print "param: %s : %s" % (k,v) + query.set({k : v}) print "query = ",query - query.set(self.params) -# query.set({ 'resource' : self.params}) -# for param in self.params : - else: raise Exception, "Params are required for update" - + + if self.id is not None: + query.select(self.id) + return execute_query(self.request, query) def delete(self):