changeset 547:7c6fdc31bd35

use normalized uri (e.g. http://echo.mpiwg-berlin.mpg.de/documents/permanent/library/163127KK?pn=9)
author casties
date Wed, 29 Aug 2012 17:52:37 +0200
parents 2928037f9a75
children 7acc919f52ff
files zpt/layer_text_annotator.zpt
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/zpt/layer_text_annotator.zpt	Tue Aug 28 20:24:01 2012 +0200
+++ b/zpt/layer_text_annotator.zpt	Wed Aug 29 17:52:37 2012 +0200
@@ -23,17 +23,15 @@
     tal:attributes="src string:$rootUrl/template/annotator_files/lib/plugin/store.js"></script>
   <script
     tal:attributes="src string:$rootUrl/template/annotator_files/lib/plugin/permissions.js"></script>
-  <!-- <script
-    tal:attributes="src string:$rootUrl/template/annotator_files/lib/plugin/annotateitpermissions.js"></script> -->
+  <!-- <script tal:attributes="src string:$rootUrl/template/annotator_files/lib/plugin/annotateitpermissions.js"></script> -->
   <script tal:attributes="src string:$rootUrl/template/annotator_files/lib/plugin/auth.js"></script>
   <!-- <script tal:attributes="src string:$rootUrl/template/annotator_files/lib/plugin/tags.js"></script> -->
   <script
     tal:attributes="src string:$rootUrl/template/annotator_files/lib/plugin/unsupported.js"></script>
-  <!-- <script
-    tal:attributes="src string:$rootUrl/template/annotator_files/lib/plugin/filter.js"></script> -->
+  <!-- <script tal:attributes="src string:$rootUrl/template/annotator_files/lib/plugin/filter.js"></script> -->
 
   <script type="text/javascript" 
-    tal:define="annUrl python:'%s?url=%s&pn=%s'%(rootUrl,docinfo['url'],pageinfo['pn']); 
+    tal:define="annUrl python:'http://echo.mpiwg-berlin.mpg.de/documents%s?pn=%s'%(docinfo['documentPath'],pageinfo['pn']); 
       global annUser python:here.getAuthenticatedUser(anon='anonymous');
       global annGroup python:request.get('annotator_group', None);
       permUser python:test(annGroup, 'group:%s'%annGroup, annUser);"