# HG changeset patch
# User casties
# Date 1353094330 -3600
# Node ID ee91a19633a0d250a7d8df55a13ccea688b898e9
# Parent  da7daa783df4a0e5b880379c5d217ab2d96e840d
use dri and uri for ocrsearch (should be either or).

diff -r da7daa783df4 -r ee91a19633a0 zpt/viewer/layer_image_search.zpt
--- 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>