--- documentViewer/MpdlXmlTextServer.py	2010/11/09 12:50:06	1.210
+++ documentViewer/MpdlXmlTextServer.py	2010/11/23 17:05:20	1.212
@@ -215,7 +215,7 @@ class MpdlXmlTextServer(SimpleItem):
             return originalPage
     
     
-    def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization="", highlightQuery=None, sn=None, optionToggle=None):
+    def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization="regPlusNorm", highlightQuery=None, sn=None, optionToggle=None):
         """returns single page from fulltext"""
         docpath = docinfo['textURLPath']
         path = docinfo['textURLPath']
@@ -391,7 +391,7 @@ class MpdlXmlTextServer(SimpleItem):
          logging.debug("documentViewer (pagedom) pagedom: %s"%(pagedom))
          numdivs = pagedom.xpath("//div[@class='queryResultHits']")
          tocSearch = int(getTextFromNode(numdivs[0]))  
-         tc=int((tocSearch/10)+1)  
+         tc=int((tocSearch/30)+1)  
          return tc 
 
     def getQueryResultHitsFigures(self,  docinfo=None, pageinfo=None):      
@@ -411,7 +411,7 @@ class MpdlXmlTextServer(SimpleItem):
          logging.debug("documentViewer (pagedom) pagedom: %s"%(pagedom))
          numdivs = pagedom.xpath("//div[@class='queryResultHits']")
          tocSearch = int(getTextFromNode(numdivs[0]))  
-         tc=int((tocSearch/10)+1)  
+         tc=int((tocSearch/30)+1)  
          return tc 
 
 
@@ -466,7 +466,7 @@ class MpdlXmlTextServer(SimpleItem):
         tocMode = pageinfo['tocMode']
         tocPN = pageinfo['tocPN']  
         
-        data = self.getServerData("doc-query.xql","document=%s&queryType=%s&queryResultPageSize=%s&queryResultPN=%s&characterNormalization=%s&optionToggle=%s"%(docpath,queryType, pagesize, pn,characterNormalization,optionToggle))  
+        data = self.getServerData("doc-query.xql","document=%s&queryType=%s&queryResultPageSize=%s&queryResultPN=%s&characterNormalization=regPlusNorm&optionToggle=%s"%(docpath,queryType, pagesize, pn,optionToggle))  
         page = data.replace('page-fragment.xql?document=%s'%str(path),'%s?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&optionToggle=%s'%(selfurl,url, viewMode, tocMode, tocPN,optionToggle))
         text = page.replace('mode=image','mode=texttool')
         logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization))