--- documentViewer/documentViewer.py	2010/09/01 13:25:38	1.99
+++ documentViewer/documentViewer.py	2010/10/11 13:12:16	1.117
@@ -5,6 +5,7 @@ from Products.PageTemplates.PageTemplate
 from AccessControl import ClassSecurityInfo
 from AccessControl import getSecurityManager
 from Globals import package_home
+from Products.zogiLib import browserCheck
 
 from Ft.Xml import EMPTY_NAMESPACE, Parse
 import Ft.Xml.Domlette
@@ -18,6 +19,7 @@ import urlparse
 import cStringIO
 import re
 
+
 def logger(txt,method,txt2):
     """logging"""
     logging.info(txt+ txt2)
@@ -177,7 +179,11 @@ class documentViewer(Folder):
     def getNumPages(self, docinfo):
         """get numpages"""
         return self.template.fulltextclient.getNumPages(docinfo)
-
+   
+    def getNumTextPages(self, docinfo):
+        """get numpages text"""
+        return self.template.fulltextclient.getNumTextPages(docinfo)
+   
     def getTranslate(self, **args):
         """get translate"""
         return self.template.fulltextclient.getTranslate(**args)
@@ -397,9 +403,11 @@ class documentViewer(Folder):
         regpath = regexp.match(url)
         if (regpath==None):
             return ""
-                     
+        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"""
       
@@ -528,6 +536,28 @@ class documentViewer(Folder):
 
         return docinfo
     
+     
+    def getNameFromIndexMeta(self,path,docinfo=None,dom=None,cut=0):
+        """gets name info from the index.meta file at path or given by dom"""
+        if docinfo is None:
+            docinfo = {}
+        
+        if dom is None:
+            for x in range(cut):
+                path=getParentDir(path)
+            dom = self.getDomFromIndexMeta(path)
+        
+        #docinfo['indexMetaPath']=self.getIndexMetaPath(path);
+        
+        #result= dom.xpath("//result/resultPage")
+        #docinfo['numPages']=int(getTextFromNode(result[0]))
+        
+        #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
     
     def getDocinfoFromTextTool(self, url, dom=None, docinfo=None):
         """parse texttool tag in index meta"""
@@ -611,10 +641,11 @@ class documentViewer(Folder):
             docinfo['textURLPath'] = textUrl
             if not docinfo['imagePath']:
                 # text-only, no page images
-                docinfo = self.getNumPages(docinfo)
+                docinfo = self.getNumTextPages(docinfo)
          
         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