Mercurial > hg > documentViewer

changeset 595:ee91a19633a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use dri and uri for ocrsearch (should be either or).
author casties
date Fri, 16 Nov 2012 20:32:10 +0100
parents da7daa783df4
children cd477b587ff4
files zpt/viewer/layer_image_search.zpt
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/zpt/viewer/layer_image_search.zpt	Fri Nov 16 17:16:50 2012 +0100
+++ b/zpt/viewer/layer_image_search.zpt	Fri Nov 16 20:32:10 2012 +0100
@@ -12,14 +12,16 @@
 
   <script type="text/javascript" 
     tal:define="global annServerUrl string:http://md.mpiwg-berlin.mpg.de/searchLines;
-    annUri docinfo/documentPath;
-    annPf pageinfo/pf | nothing;"
+    dri docinfo/DRI | nothing;
+    uri dri | docinfo/documentPath;
+    uriParam python:test(dri, 'dri', 'uri');
+    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':{'uri':'$annUri','pf':'$annPf','query':'$query'}}};
+    dlOpts.annotatorPluginSettings={'Store':{'loadFromSearch':{'$uriParam':'$uri','pf':'$pf','query':'$query'}}};
     "></script>
 </metal:block>