X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=engine%2Fmanifoldquery.py;h=dfa8b9b3c994638956aac10ad886e20f1719b23f;hb=0f1e6ec6c7cbf1dd2987c633560ab1102a0d3a41;hp=47b261f4434205a203af756a59dab31ad0aa2183;hpb=129d3dac66455410b60162594d8b3387ff4e0203;p=unfold.git

diff --git a/engine/manifoldquery.py b/engine/manifoldquery.py
index 47b261f4..dfa8b9b3 100644
--- a/engine/manifoldquery.py
+++ b/engine/manifoldquery.py
@@ -47,16 +47,99 @@ class ManifoldQuery:
         
         return """ new Query('%(a)s', '%(m)s', '%(t)s', %(f)s, %(p)s, %(c)s, %(unique)s, '%(uuid)s', %(aq)s, %(sq)s)"""%locals()
     
-    # 4amine
-    # xxx
-    # this should build an object from a dict as received from javascript
-    # to see an example just look at the server's output
-    # incoming POST <QueryDict: {u'query[method]': [u'slice'], u'query[fields][]': [u'slice_hrn'], u'query[ts]': [u'latest'], u'query[action]': [u'get']}>
+    # this builds a ManifoldQuery object from a dict as received from javascript through its ajax request 
+    # e.g. here's what I captured from the server's output
+    # incoming POST <QueryDict: {u'query[method]': [u'slice'], u'query[fields][]': [u'slice_hrn'], u'query[timestamp]': [u'latest'], u'query[action]': [u'get']}>
     def fill_from_dict (self, d):
-        # mandatory...
-        self.action=d['query[action]']
-        self.method=d['query[method]']
-        self.fields=[d['query[fields][]']]
-        self.timestamp=d['query[ts]'] 
-        #self.filters=d['filters']
-        #self.params=d['params']
+        for key in d.keys():
+            for arg in ['action', 'method', 'filters', 'fields', 'timestamp', 'params']:
+                if arg in key:
+                    # dirty hack around fields; fields must be a list
+                    if arg == 'fields': 
+                        setattr(self, arg, [d[key]])
+                    else: 
+                        setattr(self, arg, d[key])
+                    break
+
+
+
+    def analyze_subqueries(self):
+        analyzed_query = ManifoldQuery()
+        analyzed_query.uuid = self.uuid
+        analyzed_query.action = self.action
+        analyzed_query.method = self.method
+        analyzed_query.timestamp = self.timestamp
+
+        # analyse query filters
+        # filter syntax : ['key', 'oparation', 'value']
+        for filter in self.filters:
+            key = filter[0]
+            operation = filter[1]
+            value = filter[2]
+            if '.' in key:
+                method = key.split('.')[0]
+                field = key.split('.')[1]
+                if not analyzed_query.subqueries[method]:
+                    subquery = ManifoldQuery()
+                    subquery.action = self.action
+                    subquery.method = method
+                    subquery.timestamp = self.timestamp
+                    analyzed_query.subqueries[method] = subquery
+
+                analyzed_query.subqueries[method].filters.append([field, operation, value])
+            else:
+                analyzed_query.filters.append(filter)
+
+        # analyse query params
+        # params syntax : params = {'param1': value1, 'param2': value2, ...}
+        for param in self.params.keys():
+            if '.' in param:
+                method = param.split('.')[0]
+                field = param.split('.')[1]
+                if not analyzed_query.subqueries[method]:
+                    subquery = ManifoldQuery()
+                    subquery.action = self.action
+                    subquery.method = method
+                    subquery.timestamp = self.timestamp
+                    analyzed_query.subqueries[method] = subquery
+
+                analyzed_query.subqueries[method].params[field] = self.params[param]
+            else:
+                analyzed_query.params[param] = self.params[param]
+
+        # analyse query fields
+        # fields syntax: fields = [element1, element2, ....]
+        for element in self.fields:
+            if '.' in element:
+                method = element.split('.')[0]
+                field = element.split('.')[1]
+                if not analyzed_query.subqueries[method]:
+                    subquery = ManifoldQuery()
+                    subquery.action = self.action
+                    subquery.method = method
+                    subquery.timestamp = self.timestamp
+                    analyzed_query.subqueries[method] = subquery
+
+                analyzed_query.subqueries[method].fields.append(field)
+            else:
+                analyzed_query.fields.append(element)        
+
+
+        # default subqueries 
+        if analyzed_query.method == 'slice':
+            if not analyzed_query.subqueries['resource']:
+                subquery = ManifoldQuery()
+                subquery.action = self.action
+                subquery.method = method
+                subquery.timestamp = self.timestamp
+                analyzed_query.subqueries['resource'] = subquery
+
+            if not analyzed_query.subqueries['lease']:
+                subquery = ManifoldQuery()
+                subquery.action = self.action
+                subquery.method = method
+                subquery.timestamp = self.timestamp
+                analyzed_query.subqueries['lease'] = subquery
+
+
+        self.analyzed_query = analyzed_query