--- documentViewer/zpt/page_main_text.zpt	2010/04/09 18:33:53	1.3
+++ documentViewer/zpt/page_main_text.zpt	2010/06/17 17:35:24	1.5.2.1
@@ -8,9 +8,9 @@
   </metal:block>
 </head>
 <body>
-<!-- block used for main content area -->
-  <metal:block metal:define-macro="main">
-    <div tal:content="structure python:here.getTextPage(mode='text',pn=pageinfo['current'],docinfo=docinfo)"></div>
+  <!-- block used for main content area -->
+  <metal:block metal:define-macro="main" tal:define="pageinfo python:options.get('pageinfo',None); docinfo python:options.get('docinfo',None) ;highlightQuery python:pageinfo.get('highlightQuery','');sn python:pageinfo.get('sn','')">
+    <div tal:content="structure python:here.getTextPage(mode='text',pn=pageinfo['current'],docinfo=docinfo, highlightQuery=highlightQuery, sn=sn, pageinfo=pageinfo)"></div>
   </metal:block>
 </body>
-</html>
\ No newline at end of file
+</html>
