X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmanifoldquery.py;h=ffd7c1f1cbaf6cb9512f53745a3ad9be6be428dd;hb=1b09c4b310511def27e0cdfded6cbc545b10e055;hp=4ee9c01e3712ef23caad8e65668fb68ec648acb0;hpb=b709866ba93d98c32127ff4deae5b783e271e5b3;p=unfold.git

diff --git a/manifold/manifoldquery.py b/manifold/manifoldquery.py
index 4ee9c01e..ffd7c1f1 100644
--- a/manifold/manifoldquery.py
+++ b/manifold/manifoldquery.py
@@ -10,7 +10,7 @@ class ManifoldQuery:
                   filters=[], params=[], fields=[],
                   sort=None, limit=None, offset=None,
                   ):
-        self.uuid=uniqid()
+        self.query_uuid=uniqid()
         # settable
         self.action=action
         self.method=method
@@ -18,15 +18,22 @@ class ManifoldQuery:
         self.filters=filters
         self.params=params
         self.fields=fields
+        # xxx this is unused for now
         self.sort=sort
         self.limit=limit
         self.offset=offset
-        # internal data
+        # internal data - likewise, this is unused as of yet, although we have
+        # (untested) code below in analyze_subqueries to compute these..
         self.analyzed_query=None
         self.subqueries = {}
 
+    def __repr__ (self):
+        result="Q: id=%(query_uuid)s - %(action)s on %(method)s "%self.__dict__
+        result += " with %d filters, %d fields"%(len(self.filters),len(self.params))
+        return result
+
     def to_json (self):
-        uuid=self.uuid
+        query_uuid=self.query_uuid
         a=self.action
         m=self.method
         t=self.timestamp
@@ -45,7 +52,7 @@ class ManifoldQuery:
                       for (method, subquery) in self.subqueries.iteritems()])
             sq="{%s}"%sq
         
-        return """ new ManifoldQuery('%(a)s', '%(m)s', '%(t)s', %(f)s, %(p)s, %(c)s, %(unique)s, '%(uuid)s', %(aq)s, %(sq)s)"""%locals()
+        return """ new ManifoldQuery('%(a)s', '%(m)s', '%(t)s', %(f)s, %(p)s, %(c)s, %(unique)s, '%(query_uuid)s', %(aq)s, %(sq)s)"""%locals()
     
     # 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
@@ -61,11 +68,10 @@ class ManifoldQuery:
                         setattr(self, arg, d[key])
                     break
 
-
-
+    # not used yet ..
     def analyze_subqueries(self):
         analyzed_query = ManifoldQuery()
-        analyzed_query.uuid = self.uuid
+        analyzed_query.query_uuid = self.query_uuid
         analyzed_query.action = self.action
         analyzed_query.method = self.method
         analyzed_query.timestamp = self.timestamp