X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=rest%2F__init__.py;h=faef22e1795f41369f4813e3dd77f82c87cc5552;hb=ed078cce90a313ddd6e5b41ecff6c14344a99220;hp=2638b8eff8ca2bd4006a2285ce2d03eff845389a;hpb=1e37cc80687cb0969dc77f83a8d94c8980efa5ba;p=myslice.git

diff --git a/rest/__init__.py b/rest/__init__.py
index 2638b8ef..faef22e1 100644
--- a/rest/__init__.py
+++ b/rest/__init__.py
@@ -27,6 +27,7 @@ class ObjectRequest(object):
         self.type = object_type
         self.name = object_name
         self.fields = []
+        self.params = []
         self.filters = {}
         self.options = None
 
@@ -39,10 +40,24 @@ class ObjectRequest(object):
             self.filters['disabled'] = '0'
             self.filters['gateway_type'] = 'sfa'
             self.filters['platform'] = '!myslice'
+        elif(self.type.startswith('local:')):
+            # XXX TODO: find a generic Query to get the fields like 
+            # select column.name from local:object where table == local:user
+            table = self.type.split(':')
+            table = table[1]
+            if table == "user":
+                self.id = table + '_id'
+                self.fields = ['user_id', 'email', 'password', 'config','status'];
+            elif table == "account":
+                # XXX TODO: Multiple key for account = (platform_id, user_id)
+                self.id = "platform_id, user_id"
+                self.fields = ['platform_id', 'user_id', 'auth_type', 'config'];
+            elif table == "platform":
+                self.id = 'platform'
+                self.fields = ['platform', 'platform_longname', 'platform_url', 'platform_description','gateway_type'];
         else :
             self.setKey()
             self.setLocalFields()
-        
     
     def setKey(self):
         # What about key formed of multiple fields???
@@ -65,16 +80,12 @@ class ObjectRequest(object):
             raise Exception, 'Manifold db error'
     
     def setFields(self, fields):
-        selected_fields = []
-        for p in fields :
-            if p in self.fields :
-                selected_fields.append(p)
-        self.fields = selected_fields
+#         selected_fields = []
+#         for p in fields :
+#             if p in self.fields :
+#                 selected_fields.append(p)
+        self.fields = fields
         
-        # 
-        if self.id in self.fields :
-            self.fields.remove(self.id)
-            [self.id].extend(self.fields)
     
     def applyFilters(self, query, force_filters = False):
         if (force_filters and not self.filters) :
@@ -96,26 +107,53 @@ class ObjectRequest(object):
         return query
     
     def get(self):
-        query = Query.get(self.type).select(self.fields)
+        query = Query.get(self.type)
+        if (self.id is not None) and (self.id not in self.fields) :
+            query.select(self.fields + [self.id])
+        else :
+            query.select(self.fields)
+        
         query = self.applyFilters(query)
         return execute_query(self.request, query)
-    
+
+    def create(self):
+        query = Query.create(self.type)
+        # No filters for create
+        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
+        else:
+            raise Exception, "Params are required for create"
+        return execute_query(self.request, query)
+   
     def update(self):
         query = Query.update(self.type)
         query = self.applyFilters(query, True)
+
         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 update"
+
+        if self.id is not None:
+           query.select(self.id)
+       
         return execute_query(self.request, query)
     
     def delete(self):
         query = Query.delete(self.type)
         query = self.applyFilters(query, True)
-        if self.params :
-            query.set(self.params)
+        if self.filters :
+            query.set(self.filters)
         else:
-            raise Exception, "Params are required for update"
+            raise Exception, "Filters are required for update"
         return execute_query(self.request, query)
     
     def json(self):
@@ -133,7 +171,7 @@ class ObjectRequest(object):
             for p in self.fields :
                 d.append(r[p])
             response_data['data'].append(d)
-         
+        
         return HttpResponse(json.dumps(response_data, cls=DecimalEncoder, default=DateEncoder), content_type="application/json")
 
 def error(msg):