--- documentViewer/documentViewer.py	2010/10/05 12:25:32	1.101
+++ documentViewer/documentViewer.py	2010/10/15 14:26:20	1.124
@@ -5,6 +5,7 @@ from Products.PageTemplates.PageTemplate
 from AccessControl import ClassSecurityInfo
 from AccessControl import getSecurityManager
 from Globals import package_home
+from Products.zogiLib.zogiLib import browserCheck
 
 from Ft.Xml import EMPTY_NAMESPACE, Parse
 import Ft.Xml.Domlette
@@ -18,6 +19,7 @@ import urlparse
 import cStringIO
 import re
 
+
 def logger(txt,method,txt2):
     """logging"""
     logging.info(txt+ txt2)
@@ -49,7 +51,17 @@ def serializeNode(node, encoding='utf-8'
     buf.close()
     return s
 
-        
+def getBrowserType(self):
+        """get browser type object"""
+        if self.REQUEST.SESSION.has_key('browserType'):
+            return self.REQUEST.SESSION['browserType']
+        else:
+            bt = browserCheck(self)
+            self.REQUEST.SESSION.set('browserType', bt)    
+            logging.debug("documentViewer (BROWSER TYPE) bt %s"%bt)                    
+            return bt
+
+       
 def getParentDir(path):
     """returns pathname shortened by one"""
     return '/'.join(path.split('/')[0:-1])
@@ -173,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)
@@ -401,9 +425,11 @@ class documentViewer(Folder):
         regpath = regexp.match(url)
         if (regpath==None):
             return ""
-                     
+        logging.debug("(getDomFromIndexMeta): URLXAXA: %s"%regpath.group(2))            
         return ("/mpiwg/online/"+regpath.group(1)+"/"+regpath.group(2))
      
+    
+    
     def getIndexMetaUrl(self,url):
         """returns utr  of index.meta document at url"""
       
@@ -532,6 +558,28 @@ class documentViewer(Folder):
 
         return docinfo
     
+     
+    def getNameFromIndexMeta(self,path,docinfo=None,dom=None,cut=0):
+        """gets name info from the index.meta file at path or given by dom"""
+        if docinfo is None:
+            docinfo = {}
+        
+        if dom is None:
+            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):
         """parse texttool tag in index meta"""
@@ -615,10 +663,11 @@ class documentViewer(Folder):
             docinfo['textURLPath'] = textUrl
             if not docinfo['imagePath']:
                 # text-only, no page images
-                docinfo = self.getTextPages(docinfo)
+                docinfo = self.getNumTextPages(docinfo)
          
         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)
         
         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
@@ -706,6 +755,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
@@ -738,6 +788,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'])