# HG changeset patch
# User casties
# Date 1353324636 -3600
# Node ID cd477b587ff4ced87b4436cd761a83427e0ae20d
# Parent  ee91a19633a0d250a7d8df55a13ccea688b898e9
now image search layer uses either dri or uri.

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