--- cdli/zpt/viewCDLIFile.zpt	2006/08/24 09:28:29	1.6
+++ cdli/zpt/viewCDLIFile.zpt	2007/08/31 14:22:52	1.10
@@ -3,16 +3,18 @@
                                               vars python:query.split('&');
                                               allVars python:map(lambda x: x.split('='), vars);
                                               allVarsF python:filter(lambda x: not x == [''], allVars);
-                                              dictVars python:dict(allVarsF);">
+                                              dictVars python:dict(allVarsF);
+                                              p_no python:here.REQUEST.get('fileId',here.aq_parent.title.split('.')[0])">
   
         <h2>Textdisplay</h2>
       
         <p>
-            <a tal:attributes="href python:'http://cdli.ucla.edu/'+here.aq_parent.aq_parent.title.split('.')[0]" target="_blank">View database entry</a>
+          <a tal:attributes="href string:http://cdli.mpiwg-berlin.mpg.de/ID/$p_no" target="_blank">View database entry</a>
         </p>
     
         <p tal:condition="not:python:dictVars.has_key('fromBasket')">
-            <a tal:content="python:'back(%s)'%here.aq_parent.aq_parent.title" tal:attributes="href python:here.aq_parent.aq_parent.absolute_url()"/>
+             <a tal:content="python:'back(%s)'%here.aq_parent.aq_parent.title" tal:attributes="href python:here.aq_parent.aq_parent.absolute_url()"/>
+<!--            <a tal:content="string:back($p_no)" tal:attributes="href python:here.aq_parent.aq_parent.absolute_url()"/> -->
         </p>
         <tal:block condition="python:dictVars.has_key('fromBasket')">
             <tal:block define="basket python:here.getBasketFromId(dictVars['fromBasket'],context=here.cdliRoot.basketContainer)">
@@ -46,6 +48,6 @@
         <tal:block tal:condition="not:python:here.lockedBy==''">
             <b tal:attributes="href python:here.REQUEST['URL1']+'/addCDLIFileObjectForm'">Locked by: <span tal:replace="here/lockedBy"/></b>&nbsp;&nbsp;&nbsp;&nbsp;<a tal:attributes="href python:here.REQUEST['URL2']+'/unlock'">unlock</a>
         </tal:block>
-        <pre class="atf_file" tal:content="here/data"/>
+        <pre class="atf_file" tal:content="here/getFormattedData"/>
     </tal:block>
- </html>
\ No newline at end of file
+ </html>