cosmetic

diff --git a/.gitignore b/.gitignore
index 0c2bdee..12688c5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ TAGS
 *~
 all-static/
 all-templates/
 *~
 all-static/
 all-templates/

+play/
+sample-*

diff --git a/manifold/js/manifold.js b/manifold/js/manifold.js
index 3589d7e..34b9fa8 100644 (file)
--- a/manifold/js/manifold.js
+++ b/manifold/js/manifold.js
@@ -2,7 +2,7 @@
 function debug_dict (msg, o) {
     var keys=[];
     for (var k in o) keys.push(k);
 function debug_dict (msg, o) {
     var keys=[];
     for (var k in o) keys.push(k);

-    console.log ("debug_dict: " + msg + " Keys : " + keys);
+    console.log ("debug_dict: " + msg + " keys= " + keys);

 }
 function debug_value (msg, value) {
     console.log ("debug_value: " + msg + " " + value);
 }
 function debug_value (msg, value) {
     console.log ("debug_value: " + msg + " " + value);

diff --git a/manifold/manifoldquery.py b/manifold/manifoldquery.py
index 9881f41..ca41887 100644 (file)
--- a/manifold/manifoldquery.py
+++ b/manifold/manifoldquery.py
@@ -25,6 +25,11 @@ class ManifoldQuery:
         self.analyzed_query=None
         self.subqueries = {}
 
         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):
         query_uuid=self.query_uuid
         a=self.action
     def to_json (self):
         query_uuid=self.query_uuid
         a=self.action


@@ -61,8 +66,7 @@ class ManifoldQuery:
                         setattr(self, arg, d[key])
                     break
 
                         setattr(self, arg, d[key])
                     break
 

-
-
+    # not used yet ..

     def analyze_subqueries(self):
         analyzed_query = ManifoldQuery()
         analyzed_query.query_uuid = self.query_uuid
     def analyze_subqueries(self):
         analyzed_query = ManifoldQuery()
         analyzed_query.query_uuid = self.query_uuid

diff --git a/unfold/templates/page-queries.js b/unfold/templates/page-queries.js
index 63a5aa9..515196b 100644 (file)
--- a/unfold/templates/page-queries.js
+++ b/unfold/templates/page-queries.js
@@ -1,8 +1,8 @@
 {% for json in queries_jsons %} manifold.insert_query({{ json|safe }});
 {% endfor %}
 $(document).ready(function () {
 {% for json in queries_jsons %} manifold.insert_query({{ json|safe }});
 {% endfor %}
 $(document).ready(function () {

-var async_queries = new Array();
-{% for d in query_uuid_domids %} async_queries.push({'query_uuid':"{{ d.query_uuid }}", 'id':{{ d.domid }}});
+var query_uuid_domids = new Array();
+{% for d in query_uuid_domids %} query_uuid_domids.push({'query_uuid':"{{ d.query_uuid }}", 'id':{{ d.domid }}});

 {% endfor %}
 {% endfor %}

-manifold_async_exec(async_queries);
+manifold.asynchroneous_exec(query_uuid_domids);

 })
 })