X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=unfold%2Fpage.py;h=b49dce123ec817a2832f2362205f72ade8acb1ca;hb=401546ae932e7f2d120ec210c13e2db1ce754cc7;hp=fe9412a7d4b69871fb80b6f14b4e139dac642dac;hpb=dd7612b7deb9dcccbe26064610999445df19d6ae;p=myslice.git

diff --git a/unfold/page.py b/unfold/page.py
index fe9412a7..b49dce12 100644
--- a/unfold/page.py
+++ b/unfold/page.py
@@ -49,13 +49,21 @@ class Page:
 
     # this method adds a query to the page
     # the query will be exposed to js when calling expose_queries
-    # additionally if exec is set to True, this query will be asynchroneously triggered on page load
+    # additionally if run_it is set to True, this query will be asynchroneously triggered on page load
     # in this case (exec=True) the js async callback (see manifold.asynchroneous_success)
     # offers the option to deliver the result to a specific DOM elt (in this case, set domid)
     # otherwise (i.e. if domid not provided), it goes through the pubsub system (so all plugins can receive it)
-    def enqueue_query (self, query, run_it=True, domid=None):
+    # 
+    # NOTE:
+    # analyzed_query is required because it contains query_uuid that the
+    # plugins initialized in the python part will listen to. When a result is
+    # received in javascript, subresults should be publish to the appropriate
+    # query_uuid.
+    # 
+    def enqueue_query (self, query, run_it=True, domid=None, analyzed_query=None):
         # _queries is the set of all known queries
-        self._queries = self._queries.union(set( [ query, ] ))
+        # XXX complex XXX self._queries = self._queries.union(set( [ query, ] ))
+        self._queries.add((query, analyzed_query))
         # _queue is the list of queries that need to be triggered, with an optional domid
         # we only do this if run_it is set
         if run_it: self._queue.append ( (query.query_uuid,domid) )
@@ -67,15 +75,17 @@ class Page:
         # compute variables to expose to the template
         env = {}
         # expose the json definition of all queries
-        env['queries_json'] = [ query.to_json() for query in self._queries ]
+        env['queries_json'] = [ query.to_json(analyzed_query=aq) for (query, aq) in self._queries ]
         def query_publish_dom_tuple (a,b):
             result={'query_uuid':a}
             if b: result['domid']=b
             return result
         env['query_publish_dom_tuples'] = [ query_publish_dom_tuple (a,b) for (a,b) in self._queue ]
         javascript = render_to_string ("page-queries.js",env)
-#        self.reset_queue()
         self.add_js_chunks (javascript)
+#        self.reset_queue()
+        # unconditionnally expose MANIFOLD_URL, this is small and manifold.js uses that for various messages
+        self.expose_js_manifold_config()
 
 
     # needs to be called explicitly and only when metadata is actually required