--- documentViewer/documentViewer.py	2010/10/18 10:14:08	1.134
+++ documentViewer/documentViewer.py	2010/10/18 11:59:33	1.141
@@ -12,6 +12,7 @@ import Ft.Xml.Domlette
 import os.path
 import sys
 import urllib
+
 import urllib2
 import logging
 import math
@@ -244,7 +245,7 @@ class documentViewer(Folder):
             
         docinfo = self.getDocinfo(mode=mode,url=url)
         #pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo)
-        pageinfo = self.getPageinfo(start=start,current=pn, originalPage=originalPage, docinfo=docinfo)
+        pageinfo = self.getPageinfo(start=start,current=pn, docinfo=docinfo)
         ''' ZDES '''
         pt = getattr(self.template, 'thumbs_main_rss')
         
@@ -257,7 +258,7 @@ class documentViewer(Folder):
         return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode)
   
     security.declareProtected('View','index_html')
-    def index_html(self,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None, query=None, querySearch=None, characterNormalization="",originalPage=None):
+    def index_html(self,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None, query=None, querySearch=None, characterNormalization=""):
         '''
         view it
         @param mode: defines how to access the document behind url 
@@ -290,7 +291,7 @@ class documentViewer(Folder):
             else:
                 viewMode="images"
                 
-        pageinfo = self.getPageinfo(start=start,current=pn, docinfo=docinfo,viewMode=viewMode,tocMode=tocMode, originalPage=originalPage)
+        pageinfo = self.getPageinfo(start=start,current=pn, docinfo=docinfo,viewMode=viewMode,tocMode=tocMode)
         
         pt = getattr(self.template, 'viewer_main')               
         return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,mk=self.generateMarks(mk))
@@ -662,7 +663,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
@@ -743,16 +744,16 @@ 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("originalPage: %s"%originalPage)
+       
         self.REQUEST.SESSION['docinfo'] = docinfo
         return docinfo
                
-    def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None,characterNormalization="", originalPage=None):
+    def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None,characterNormalization=""):
         """returns pageinfo with the given parameters"""
         pageinfo = {}
         current = getInt(current)
     
-        pageinfo ['originalPage'] = originalPage
+        #pageinfo ['originalPage'] = self.getOrigPages(docinfo=docinfo,pageinfo=pageinfo)
         pageinfo['current'] = current
         rows = int(rows or self.thumbrows)
         pageinfo['rows'] = rows
@@ -785,7 +786,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])