--- documentViewer/zpt/page_main_text.zpt	2010/10/26 14:40:04	1.14
+++ documentViewer/zpt/page_main_text.zpt	2011/07/29 10:32:26	1.18
@@ -1,4 +1,10 @@
-
-<tal:block tal:define="pageinfo python:options.get('pageinfo',None); docinfo python:options.get('docinfo',None) ;highlightQuery python:pageinfo.get('highlightQuery','');sn python:pageinfo.get('sn','');characterNormalization python:pageinfo.get('characterNormalization','');">
-  <div tal:content="structure python:here.getTextPage(mode='text',pn=pageinfo['current'],docinfo=docinfo,  pageinfo=pageinfo, highlightQuery=highlightQuery,sn=sn, characterNormalization=characterNormalization)"></div>
+<tal:block tal:define="pageinfo python:options.get('pageinfo',None); 
+                       docinfo python:options.get('docinfo',None);
+                       highlightQuery python:pageinfo.get('highlightQuery','');
+                       s python:pageinfo.get('s','');
+                       pn python:pageinfo.get('pn',1);
+                       characterNormalization python:pageinfo.get('characterNormalization','');
+                       optionToggle python:pageinfo.get('optionToggle','');">
+  <div tal:content="structure python:pageinfo['textPage']"></div>
+  
 </tal:block>
\ No newline at end of file