Changeset 595:ee91a19633a0 in documentViewer

Timestamp:

Nov 16, 2012, 7:32:10 PM (12 years ago)

Author:

casties

Branch:

default

Message:

use dri and uri for ocrsearch (should be either or).

File:

• zpt/viewer/layer_image_search.zpt (modified) (2 diffs)

zpt/viewer/layer_image_search.zpt

@@ -13 +13 @@
   <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';
@@ -20 +22 @@
     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>