--- documentViewer/documentViewer.py	2010/10/13 15:35:41	1.120
+++ documentViewer/documentViewer.py	2010/10/18 09:32:22	1.125
@@ -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)
@@ -560,17 +568,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):
@@ -747,6 +747,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
@@ -779,6 +780,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'])