--- documentViewer/documentViewer.py	2010/10/11 13:40:37	1.118
+++ documentViewer/documentViewer.py	2010/10/18 09:54:31	1.129
@@ -5,7 +5,7 @@ from Products.PageTemplates.PageTemplate
 from AccessControl import ClassSecurityInfo
 from AccessControl import getSecurityManager
 from Globals import package_home
-from Products.zogiLib import browserCheck
+from Products.zogiLib.zogiLib import browserCheck
 
 from Ft.Xml import EMPTY_NAMESPACE, Parse
 import Ft.Xml.Domlette
@@ -185,7 +185,19 @@ class documentViewer(Folder):
     def getSearch(self, **args):
         """get search"""
         return self.template.fulltextclient.getSearch(**args)
-
+    
+    def getGisPlaces(self, **args):
+        """get gis places"""
+        return self.template.fulltextclient.getGisPlaces(**args)
+ 
+    def getAllGisPlaces(self, **args):
+        """get all gis places """
+        return self.template.fulltextclient.getAllGisPlaces(**args)
+    
+    def getOrigPages(self, **args):
+        """get original page number """
+        return self.template.fulltextclient.getOrigPages(**args)
+    
     def getNumPages(self, docinfo):
         """get numpages"""
         return self.template.fulltextclient.getNumPages(docinfo)
@@ -232,6 +244,8 @@ 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)
+        ''' ZDES '''
         pt = getattr(self.template, 'thumbs_main_rss')
         
         if viewMode=="auto": # automodus gewaehlt
@@ -276,7 +290,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))
@@ -556,17 +570,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):
@@ -656,6 +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=None, pageinfo=None)
         
         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,6 +750,7 @@ class documentViewer(Folder):
         """returns pageinfo with the given parameters"""
         pageinfo = {}
         current = getInt(current)
+        #pageinfo ['originalPage'] = originalPage
         pageinfo['current'] = current
         rows = int(rows or self.thumbrows)
         pageinfo['rows'] = rows
@@ -775,6 +783,8 @@ class documentViewer(Folder):
         toc = int (pageinfo['tocPN'])
         pageinfo['textPages'] =int (toc)
         
+        
+        
         if 'tocSize_%s'%tocMode in docinfo:
             tocSize = int(docinfo['tocSize_%s'%tocMode])
             tocPageSize = int(pageinfo['tocPageSize'])