X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmanifoldquery.py;h=bbcc6b5df5f53551b4cd84378ab5a092c4283cf1;hb=74b3a7675c43e2884b396cd9d5febfebc6e9ff97;hp=feed5f5ba754c01574b53819732b92a579acddb2;hpb=258ce18e803cc727b8fe764e43399bc517d9dae1;p=myslice.git

diff --git a/manifold/manifoldquery.py b/manifold/manifoldquery.py
index feed5f5b..bbcc6b5d 100644
--- a/manifold/manifoldquery.py
+++ b/manifold/manifoldquery.py
@@ -21,7 +21,7 @@ class ManifoldQuery:
         self.filters=filters
         self.params=params
         self.fields=fields
-        # xxx this is unused for now
+        # xxx these are unused for now....
         self.sort=sort
         self.limit=limit
         self.offset=offset
@@ -31,8 +31,9 @@ class ManifoldQuery:
         self.subqueries = {}
 
     def __repr__ (self):
-        result="Q: id=%(query_uuid)s - %(action)s on %(subject)s "%self.__dict__
+        result="[[Q: id=%(query_uuid)s - %(action)s on %(subject)s "%self.__dict__
         result += " with %d filters, %d fields"%(len(self.filters),len(self.params))
+        result += "]]"
         return result
 
     def to_json (self):
@@ -41,7 +42,6 @@ class ManifoldQuery:
         s=self.subject
         t=self.timestamp
         f=json.dumps (self.filters)
-        print 'filters f=',f
         p=json.dumps (self.params)
         c=json.dumps (self.fields)
         # xxx unique can be removed, but for now we pad the js structure
@@ -160,3 +160,13 @@ class ManifoldQuery:
 
 
         self.analyzed_query = analyzed_query
+
+    def to_dict(self):
+        return {
+            'action': self.action,
+            'fact_table': self.subject,
+            'ts': self.timestamp,
+            'filters': self.filters,
+            'params': self.params,
+            'fields': self.fields
+        }