--- documentViewer/documentViewer.py	2010/10/15 14:26:20	1.124
+++ 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
@@ -243,7 +244,9 @@ class documentViewer(Folder):
             self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary"
             
         docinfo = self.getDocinfo(mode=mode,url=url)
-        pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo)
+        #pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo)
+        pageinfo = self.getPageinfo(start=start,current=pn, docinfo=docinfo)
+        ''' ZDES '''
         pt = getattr(self.template, 'thumbs_main_rss')
         
         if viewMode=="auto": # automodus gewaehlt
@@ -288,7 +291,7 @@ class documentViewer(Folder):
             else:
                 viewMode="images"
                 
-        pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo,viewMode=viewMode,tocMode=tocMode)
+        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))
@@ -568,17 +571,9 @@ class documentViewer(Folder):
             for x in range(cut):
                 path=getParentDir(path)
             dom = self.getDomFromIndexMeta(path)
-        
-        #docinfo['indexMetaPath']=self.getIndexMetaPath(path);
-        
-        #result= dom.xpath("//result/resultPage")
-        #docinfo['numPages']=int(getTextFromNode(result[0]))
-        
-        #result =dom.xpath("//name")
+
         docinfo['name']=getTextFromNode(dom.xpath("/resource/name")[0])
         logging.debug("documentViewer docinfo[name] %s"%docinfo['name'])
-           
-                #logging.debug("documentViewer (getbibinfofromindexmeta) using mapping for %s"%bibtype)
         return docinfo
     
     def getDocinfoFromTextTool(self, url, dom=None, docinfo=None):
@@ -668,6 +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)
         
         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
@@ -748,6 +744,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)
+       
         self.REQUEST.SESSION['docinfo'] = docinfo
         return docinfo
                
@@ -755,7 +752,8 @@ class documentViewer(Folder):
         """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
@@ -788,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])