# HG changeset patch
# User abukhman
# Date 1286546544 -7200
# Node ID fd9aa1d0941a698fde7648b6c2fea30e2703408d
# Parent  0b614f078f7b79cc5cb0645fe2c4b0ebc77f35ee
*** empty log message ***

diff -r 0b614f078f7b -r fd9aa1d0941a documentViewer.py
--- a/documentViewer.py	Fri Oct 08 15:49:44 2010 +0200
+++ b/documentViewer.py	Fri Oct 08 16:02:24 2010 +0200
@@ -531,10 +531,7 @@
                 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 @@
         #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 @@
             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):