--- documentViewer/documentViewer.py	2010/10/13 15:35:41	1.120
+++ documentViewer/documentViewer.py	2010/10/20 16:22:26	1.144
@@ -187,9 +187,17 @@ class documentViewer(Folder):
         return self.template.fulltextclient.getSearch(**args)
     
     def getGisPlaces(self, **args):
-        """get search"""
+        """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)
@@ -235,7 +243,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
@@ -280,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))
@@ -560,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):
@@ -660,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=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
@@ -740,6 +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
                
@@ -747,6 +751,7 @@ class documentViewer(Folder):
         """returns pageinfo with the given parameters"""
         pageinfo = {}
         current = getInt(current)
+    
         pageinfo['current'] = current
         rows = int(rows or self.thumbrows)
         pageinfo['rows'] = rows
@@ -766,7 +771,7 @@ class documentViewer(Folder):
                 pageinfo['numgroups'] += 1        
         pageinfo['viewMode'] = viewMode
         pageinfo['tocMode'] = tocMode
-        #pageinfo['characterNormalization'] =characterNormalization
+        #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',' ')
@@ -779,6 +784,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'])