--- zogiLib/zpt/head_js.zpt	2010/04/09 18:32:31	1.4
+++ zogiLib/zpt/head_js.zpt	2010/10/15 13:01:21	1.7
@@ -1,5 +1,5 @@
-<script type="text/javascript" tal:attributes="src python:here.zogilibPath()+'jslib_js'"></script>
-<script type="text/javascript" tal:attributes="src python:here.zogilibPath()+'dllib_js'"></script>
+<script type="text/javascript" tal:attributes="src python:here.zogilibPath()+'template/jslib_js'"></script>
+<script type="text/javascript" tal:attributes="src python:here.zogilibPath()+'template/dllib_js'"></script>
 <script type="text/javascript" tal:content="structure python:'''\n
   base_init();\n
   var baseUrl = '%s';\n
@@ -7,11 +7,9 @@
   var dlTarget = '%s';\n
   window.name = dlTarget;\n
   document.id = dlTarget;\n'''%(here.zogilibPath(), here.getToolbarPageURL(), here.getDLTarget())"/>
-<script type="text/javascript" tal:content="python:'''\n
-  newParameter('fn', '%s', 1);\n
-  newParameter('pn', '%s', 1);\n
-'''%(here.getDLParam('fn', ''),here.getDLParam('pn', 1))"/>
 <script type="text/javascript">
+  newParameter('fn', '', 1);
+  newParameter('pn', 1, 2);
   newParameter('ws', '1.0', 2);
   newParameter('mo', '', 2);
   newParameter('wx', '0.0', 4);
@@ -26,8 +24,9 @@
   newParameter('ddpi', '', 8);
   newParameter('ddpix', '', 8);
   newParameter('ddpiy', '', 8);
-  newParameter('mk', '', 16);
-  newParameter('pt', '0', 32);
+  // non-digilib parameters have detail level 32
+  newParameter('mk', '', 64);
+  newParameter('pt', '0', 128);
 </script>
 <script type="text/javascript" tal:condition="exists:options/newparams" tal:repeat="p options/newparams" tal:content="python:'''\n
   newParameter('%s', '%s', %s);\n'''%(p[0],p[1],p[2])"/>
@@ -36,3 +35,10 @@
 </script>
 <script type="text/javascript" tal:condition="python:here.getDLParam('pt', None) is not None" 
   tal:content="structure python:'''setParameter('pt', %d);'''%here.getPT()"></script>
+<script type="text/javascript" tal:condition="exists:options/fn" tal:content="python:'''\n
+  // fn and pn defined outside -- mask in URL\n
+  setParameter('fn', '%s');\n
+  setParameter('pn', '%s');\n
+  dlUrlParamMask = 254;
+'''%(options.get('fn'),options.get('pn', 1))"/>
+  
\ No newline at end of file