--- documentViewer/documentViewer.py	2010/10/08 13:49:44	1.112
+++ documentViewer/documentViewer.py	2010/10/11 13:40:37	1.118
@@ -5,6 +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 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])
@@ -531,10 +543,7 @@ class documentViewer(Folder):
                 docinfo['lang']=getTextFromNode(dom.xpath("//bib/lang")[0])
             except:
                 docinfo['lang']=''
-            try:
-                docinfo['name']=getTextFromNode(dom.xpath("//%s"%bibmap['name'][0])[0])
-            except: pass
-            
+
         return docinfo
     
      
@@ -553,12 +562,10 @@ class documentViewer(Folder):
         #result= dom.xpath("//result/resultPage")
         #docinfo['numPages']=int(getTextFromNode(result[0]))
         
-        if len(name) > 0:
-            try:
-                result =dom.xpath("//name")
-                docinfo['name']=getTextFromNode(result[0])
-                logging.debug("documentViewer docinfo[name] %s"%docinfo[name])
-            except: pass  
+        #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
     
@@ -648,7 +655,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.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
@@ -682,10 +689,6 @@ class documentViewer(Folder):
             docinfo['year']=getTextFromNode(dom.xpath("//date")[0])
         except:
             pass
-        try:
-            docinfo['name']=getTextFromNode(dom.xpath("//name")[0])
-        except:
-            pass
         return docinfo
     
     def getDocinfoFromImagePath(self,path,docinfo=None,cut=0):