--- documentViewer/documentViewer.py 2010/10/08 13:09:29 1.104 +++ documentViewer/documentViewer.py 2010/10/08 13:27:52 1.108 @@ -401,7 +401,7 @@ class documentViewer(Folder): regpath = regexp.match(url) if (regpath==None): return "" - + logging.debug("(getDomFromIndexMeta): URLXAXA: %s"%regpath.group(4)) return ("/mpiwg/online/"+regpath.group(1)+"/"+regpath.group(2)) def getIndexMetaUrl(self,url): @@ -545,12 +545,14 @@ class documentViewer(Folder): docinfo['indexMetaPath']=self.getIndexMetaPath(path); - result= dom.xpath("//result/resultPage") - docinfo['numPages']=int(getTextFromNode(result[0])) + #result= dom.xpath("//result/resultPage") + #docinfo['numPages']=int(getTextFromNode(result[0])) - if len(bibmap) > 0 and len(bibmap['author'][0]) > 0: + if len(name) > 0: try: - docinfo['name']=getTextFromNode(dom.xpath("//name")) + result =dom.xpath("//name") + docinfo['name']=getTextFromNode(result[0]) + logging.debug("documentViewer docinfo[name] %s"%docinfo[name]) except: pass #logging.debug("documentViewer (getbibinfofromindexmeta) using mapping for %s"%bibtype) return docinfo @@ -641,6 +643,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) 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