git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Local updates for dev.myslice.info to work with api v2
[myslice.git]
/
manifold
/
manifoldquery.py
diff --git
a/manifold/manifoldquery.py
b/manifold/manifoldquery.py
index
da3bbc5
..
bbcc6b5
100644
(file)
--- a/
manifold/manifoldquery.py
+++ b/
manifold/manifoldquery.py
@@
-31,8
+31,9
@@
class ManifoldQuery:
self.subqueries = {}
def __repr__ (self):
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 += " with %d filters, %d fields"%(len(self.filters),len(self.params))
+ result += "]]"
return result
def to_json (self):
return result
def to_json (self):
@@
-159,3
+160,13
@@
class ManifoldQuery:
self.analyzed_query = analyzed_query
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
+ }