--- documentViewer/documentViewer.py 2010/10/08 13:49:44 1.112 +++ documentViewer/documentViewer.py 2010/10/08 14:02:24 1.113 @@ -531,10 +531,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 +550,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("//name")[0]) + logging.debug("documentViewer docinfo[name] %s"%docinfo[name]) + #logging.debug("documentViewer (getbibinfofromindexmeta) using mapping for %s"%bibtype) return docinfo @@ -682,10 +677,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):