--- documentViewer/documentViewer.py 2007/01/24 16:12:25 1.22 +++ documentViewer/documentViewer.py 2007/05/03 17:28:23 1.24 @@ -399,7 +399,6 @@ class documentViewer(Folder): textUrl=os.path.join(archivePath,textUrl) docinfo['textURL'] = textUrl - presentationUrls=dom.xpath("//texttool/presentation") docinfo = self.getBibinfoFromIndexMeta(url,docinfo=docinfo,dom=dom) # get info von bib tag @@ -408,11 +407,9 @@ class documentViewer(Folder): # presentation url ergiebt sich ersetzen von index.meta in der url der fŸr die Metadaten # durch den relativen Pfad auf die presentation infos presentationUrl=url.replace('index.meta',getTextFromNode(presentationUrls[0])) - docinfo = self.getBibinfoFromTextToolPresentation(presentationUrl,docinfo=docinfo,dom=dom) - - + docinfo = self.getAuthinfoFromIndexMeta(path,docinfo=docinfo) return docinfo @@ -610,7 +607,9 @@ def manage_addDocumentViewerTemplate(sel self._setObject(id, DocumentViewerTemplate(id)) ob = getattr(self, id) - ob.pt_edit(open(os.path.join(package_home(globals()),'zpt/viewer_main.zpt')).read(),None) + txt=file(os.path.join(package_home(globals()),'zpt/viewer_main.zpt'),'r').read() + logging.info("txt %s:"%txt) + ob.pt_edit(txt,"text/html") if title: ob.pt_setTitle(title) try: