# queue of queries with maybe a domid, see enqueue_query
self._queue=[]
# global prelude object
- self.prelude=Prelude(css_files='css/plugin.css')
+ self.prelude=Prelude(css_files=[
+ 'css/plugin.css','css/onelab_marko.css',])
# record known plugins hashed on their domid
def record_plugin (self, plugin):
# 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) )
# 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()
+
+
+# DEPRECATED # # needs to be called explicitly and only when metadata is actually required
+# DEPRECATED # # in particular user needs to be logged
+# DEPRECATED # def get_metadata (self):
+# DEPRECATED # # look in session's cache - we don't want to retrieve this for every request
+# DEPRECATED # session=self.request.session
+# DEPRECATED # if 'manifold' not in session:
+# DEPRECATED # print "Page.expose_js_metadata: no 'manifold' in session... - cannot retrieve metadata - skipping"
+# DEPRECATED # return
+# DEPRECATED # manifold=session['manifold']
+# DEPRECATED # # if cached, use it
+# DEPRECATED # if 'metadata' in manifold and isinstance(manifold['metadata'],MetaData):
+# DEPRECATED # if debug: print "Page.get_metadata: return cached value"
+# DEPRECATED # return manifold['metadata']
+# DEPRECATED # # otherwise retrieve it
+# DEPRECATED # manifold_api_session_auth = session['manifold']['auth']
+# DEPRECATED # print "get_metadata(), manifold_api_session_auth =", session['manifold']['auth']
+# DEPRECATED # metadata=MetaData (manifold_api_session_auth)
+# DEPRECATED # metadata.fetch()
+# DEPRECATED # # store it for next time
+# DEPRECATED # manifold['metadata']=metadata
+# DEPRECATED # if debug: print "Page.get_metadata: return new value"
+# DEPRECATED # return metadata
# needs to be called explicitly and only when metadata is actually required
# in particular user needs to be logged
def get_metadata (self):
# look in session's cache - we don't want to retrieve this for every request
session=self.request.session
+
if 'manifold' not in session:
- print "Page.expose_js_metadata: no 'manifold' in session... - cannot retrieve metadata - skipping"
- return
- manifold=session['manifold']
+ session['manifold'] = {}
+ manifold = session['manifold']
+
# if cached, use it
if 'metadata' in manifold and isinstance(manifold['metadata'],MetaData):
if debug: print "Page.get_metadata: return cached value"
return manifold['metadata']
- # otherwise retrieve it
- manifold_api_session_auth = session['manifold']['auth']
- metadata=MetaData (manifold_api_session_auth)
+
+ metadata_auth = {'AuthMethod':'anonymous'}
+
+ metadata=MetaData (metadata_auth)
metadata.fetch()
- # store it for next time
+ # store it for next time
manifold['metadata']=metadata
if debug: print "Page.get_metadata: return new value"
return metadata
self.add_js_chunks("var MANIFOLD_METADATA =" + self.get_metadata().to_json() + ";")
def expose_js_manifold_config (self):
- self.add_js_chunks(Config.manifold_js_export())
+ config=Config()
+ self.add_js_chunks(config.manifold_js_export())
#################### requirements/prelude management
# just forward to self.prelude - see decorator above
git://git.onelab.eu / myslice.git / blobdiff