--- documentViewer/documentViewer.py	2010/10/18 11:59:33	1.141
+++ documentViewer/documentViewer.py	2010/10/26 14:44:55	1.146
@@ -12,7 +12,6 @@ import Ft.Xml.Domlette
 import os.path
 import sys
 import urllib
-
 import urllib2
 import logging
 import math
@@ -663,7 +662,7 @@ class documentViewer(Folder):
         presentationUrls = dom.xpath("//texttool/presentation")
         docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom)   # get info von bib tag
         docinfo = self.getNameFromIndexMeta(url, docinfo=docinfo, dom=dom)
-        docinfo =self.getOrigPages(docinfo=docinfo)
+        #docinfo =self.getOrigPages(docinfo=docinfo)
         
         if presentationUrls and (len(presentationUrls) > 0): # ueberschreibe diese durch presentation informationen 
              # presentation url ergiebt sich ersetzen von index.meta in der url der fuer die Metadaten
@@ -744,7 +743,7 @@ class documentViewer(Folder):
             raise ValueError("Unknown mode %s! Has to be one of 'texttool','imagepath','filepath'."%(mode))
                         
         logging.debug("documentViewer (getdocinfo) docinfo: %s"%docinfo)
-       
+        #logging.debug("documentViewer (getdocinfo) docinfo: %s"%)
         self.REQUEST.SESSION['docinfo'] = docinfo
         return docinfo
                
@@ -753,7 +752,6 @@ class documentViewer(Folder):
         pageinfo = {}
         current = getInt(current)
     
-        #pageinfo ['originalPage'] = self.getOrigPages(docinfo=docinfo,pageinfo=pageinfo)
         pageinfo['current'] = current
         rows = int(rows or self.thumbrows)
         pageinfo['rows'] = rows
@@ -773,10 +771,10 @@ class documentViewer(Folder):
                 pageinfo['numgroups'] += 1        
         pageinfo['viewMode'] = viewMode
         pageinfo['tocMode'] = tocMode
-        #pageinfo['characterNormalization'] =characterNormalization
-        pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization',' ')
-        pageinfo['query'] = self.REQUEST.get('query',' ')
-        pageinfo['queryType'] = self.REQUEST.get('queryType',' ')
+        #pageinfo ['originalPage'] = self.getOrigPages(docinfo=None, pageinfo=None)
+        pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','')
+        pageinfo['query'] = self.REQUEST.get('query','')
+        pageinfo['queryType'] = self.REQUEST.get('queryType','')
         pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext')
         pageinfo['textPN'] = self.REQUEST.get('textPN','1')
         pageinfo['highlightQuery'] = self.REQUEST.get('highlightQuery','')
@@ -786,7 +784,7 @@ class documentViewer(Folder):
         toc = int (pageinfo['tocPN'])
         pageinfo['textPages'] =int (toc)
         
-        #logging.debug("originalPage: %s"%originalPage)
+        
         
         if 'tocSize_%s'%tocMode in docinfo:
             tocSize = int(docinfo['tocSize_%s'%tocMode])