--- documentViewer/documentViewer.py	2010/10/08 13:29:00	1.110
+++ documentViewer/documentViewer.py	2010/10/11 12:45:15	1.115
@@ -404,6 +404,8 @@ class documentViewer(Folder):
         logging.debug("(getDomFromIndexMeta): URLXAXA: %s"%regpath.group(2))            
         return ("/mpiwg/online/"+regpath.group(1)+"/"+regpath.group(2))
      
+    
+    
     def getIndexMetaUrl(self,url):
         """returns utr  of index.meta document at url"""
       
@@ -543,17 +545,15 @@ class documentViewer(Folder):
                 path=getParentDir(path)
             dom = self.getDomFromIndexMeta(path)
         
-        docinfo['indexMetaPath']=self.getIndexMetaPath(path);
+        #docinfo['indexMetaPath']=self.getIndexMetaPath(path);
         
         #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("/resource/name")[0])
+        logging.debug("documentViewer docinfo[name] %s"%docinfo[name])
+           
                 #logging.debug("documentViewer (getbibinfofromindexmeta) using mapping for %s"%bibtype)
         return docinfo
     
@@ -643,7 +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)
+        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