Mercurial > hg > documentViewer

changeset 596:cd477b587ff4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
now image search layer uses either dri or uri.
author casties
date Mon, 19 Nov 2012 12:30:36 +0100
parents ee91a19633a0
children fabd394302f1
files zpt/viewer/layer_image_search.zpt
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/zpt/viewer/layer_image_search.zpt	Fri Nov 16 20:32:10 2012 +0100
+++ b/zpt/viewer/layer_image_search.zpt	Mon Nov 19 12:30:36 2012 +0100
@@ -15,13 +15,14 @@
     dri docinfo/DRI | nothing;
     uri dri | docinfo/documentPath;
     uriParam python:test(dri, 'dri', 'uri');
+    otherParam python:test(dri, 'uri', 'dri');
     pf pageinfo/pf | nothing;"
     tal:content="structure string:
     dlOpts.digilibFrontendPath='/jquery/digilib-ann.html';
     dlOpts.annotationServerUrl='$annServerUrl/annotator';
     dlOpts.annotationsReadOnly=true;
     dlOpts.annotatorPlugins=['Store','Markdown','DigilibIntegrator'];
-    dlOpts.annotatorPluginSettings={'Store':{'loadFromSearch':{'$uriParam':'$uri','pf':'$pf','query':'$query'}}};
+    dlOpts.annotatorPluginSettings={'Store':{'loadFromSearch':{'$uriParam':'$uri','$otherParam':null,'pf':'$pf','query':'$query'}}};
     "></script>
 </metal:block>