--- documentViewer/documentViewer.py 2010/10/08 14:02:24 1.113 +++ documentViewer/documentViewer.py 2010/10/11 13:12:16 1.117 @@ -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) @@ -551,8 +553,8 @@ class documentViewer(Folder): #docinfo['numPages']=int(getTextFromNode(result[0])) #result =dom.xpath("//name") - docinfo['name']=getTextFromNode(dom.xpath("//name")[0]) - logging.debug("documentViewer docinfo[name] %s"%docinfo[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 @@ -643,7 +645,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