--- documentViewer/documentViewer.py	2006/04/12 17:47:53	1.9
+++ documentViewer/documentViewer.py	2006/07/06 16:01:42	1.14
@@ -7,7 +7,7 @@ from Globals import package_home
 
 from Ft.Xml.Domlette import NonvalidatingReader
 from Ft.Xml.Domlette import PrettyPrint, Print
-from Ft.Xml import EMPTY_NAMESPACE
+from Ft.Xml import EMPTY_NAMESPACE, Parse
 
 import Ft.Xml.XPath
 
@@ -142,11 +142,13 @@ class documentViewer(Folder):
     def isAccessible(self, docinfo):
         """returns if access to the resource is granted"""
         access = docinfo.get('accessType', None)
+        zLOG.LOG("documentViewer (accessOK)", zLOG.INFO, "access type %s"%access)
         if access is None:
             # no information - no access 
             #TODO: check
             return True
         elif access == 'free':
+	    zLOG.LOG("documentViewer (accessOK)", zLOG.INFO, "access is free")
             return True
         elif access in self.authgroups:
             # only local access -- only logged in users
@@ -163,27 +165,30 @@ class documentViewer(Folder):
                 
     def getDirinfoFromDigilib(self,path,docinfo=None):
         """gibt param von dlInfo aus"""
+        num_retries = 3
         if docinfo is None:
             docinfo = {}
             
-        imageUrl=self.digilibBaseUrl+"/dirInfo-xml.jsp?mo=dir&fn="+path
+        infoUrl=self.digilibBaseUrl+"/dirInfo-xml.jsp?mo=dir&fn="+path
     
-        zLOG.LOG("documentViewer (getparamfromdigilib)", zLOG.INFO, "dirInfo from %s"%(imageUrl))
+        zLOG.LOG("documentViewer (getparamfromdigilib)", zLOG.INFO, "dirInfo from %s"%(infoUrl))
         
-        for cnt in (1,2,3):
+        for cnt in range(num_retries):
             try:
-                dom = NonvalidatingReader.parseUri(imageUrl)
+                # dom = NonvalidatingReader.parseUri(imageUrl)
+                txt=urllib.urlopen(infoUrl).read()
+                dom = Parse(txt)
                 break
             except:
-                zLOG.LOG("documentViewer (getdirinfofromdigilib)", zLOG.ERROR, "error reading %s (try %d)"%(imageUrl,cnt))
+                zLOG.LOG("documentViewer (getdirinfofromdigilib)", zLOG.ERROR, "error reading %s (try %d)"%(infoUrl,cnt))
         else:
-            raise IOError("Unable to get dirinfo from %s"%(imageUrl))
+            raise IOError("Unable to get dir-info from %s"%(infoUrl))
         
-        params=dom.xpath("//dir/size")
-        zLOG.LOG("documentViewer (getparamfromdigilib)", zLOG.INFO, "dirInfo:size"%params)
+        sizes=dom.xpath("//dir/size")
+        zLOG.LOG("documentViewer (getparamfromdigilib)", zLOG.INFO, "dirInfo:size"%sizes)
         
-        if params:
-            docinfo['numPages'] = int(getTextFromNode(params[0]))
+        if sizes:
+            docinfo['numPages'] = int(getTextFromNode(sizes[0]))
         else:
             docinfo['numPages'] = 0
                         
@@ -192,32 +197,38 @@ class documentViewer(Folder):
             
     def getIndexMeta(self, url):
         """returns dom of index.meta document at url"""
+        num_retries = 3
         dom = None
+        metaUrl = None
         if url.startswith("http://"):
             # real URL
-            try:
-                dom = NonvalidatingReader.parseUri(url)
-            except:
-                zLOG.LOG("documentViewer (getIndexMata)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])
-                raise IOError("Unable to get info from %s"%(url))
+            metaUrl = url
         else:
             # online path
             server=self.digilibBaseUrl+"/servlet/Texter?fn="
-            metaUrl=server+url
+            metaUrl=server+url.replace("/mpiwg/online","")
             if not metaUrl.endswith("index.meta"):
                 metaUrl += "/index.meta"
+        
+        for cnt in range(num_retries):
             try:
-                dom = NonvalidatingReader.parseUri(metaUrl)
+                # patch dirk encoding fehler treten dann nicht mehr auf
+                # dom = NonvalidatingReader.parseUri(metaUrl)
+                txt=urllib.urlopen(metaUrl).read()
+                dom = Parse(txt)
+                break
             except:
-                zLOG.LOG("documentViewer (getIndexMata)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])
-                raise IOError("Unable to get info from %s"%(url))
+                zLOG.LOG("ERROR documentViewer (getIndexMata)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])
+                
+        if dom is None:
+            raise IOError("Unable to read index meta from %s"%(url))
                  
         return dom
                         
         
     def getAuthinfoFromIndexMeta(self,path,docinfo=None,dom=None):
         """gets authorization info from the index.meta file at path or given by dom"""
-        zLOG.LOG("documentViewer (getbibinfofromindexmeta)", zLOG.INFO,"path: %s"%(path))
+        zLOG.LOG("documentViewer (getauthinfofromindexmeta)", zLOG.INFO,"path: %s"%(path))
         
         access = None
         
@@ -293,7 +304,8 @@ class documentViewer(Folder):
        if imageDirs and (len(imageDirs)>0):
            imageDir=getTextFromNode(imageDirs[0])
        else:
-           imageDir=None
+           # we balk with no image tag
+           raise IOError("No text-tool info in %s"%(url))
            
        if imageDir and archivePath:
            #print "image: ", imageDir, " archivepath: ", archivePath
@@ -352,6 +364,8 @@ class documentViewer(Folder):
             docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo)
         else:
             zLOG.LOG("documentViewer (getdocinfo)", zLOG.ERROR,"unknown mode!")
+            raise ValueError("Unknown mode %s"%(mode))
+                        
         zLOG.LOG("documentViewer (getdocinfo)", zLOG.INFO,"docinfo: %s"%docinfo)
         self.REQUEST.SESSION['docinfo'] = docinfo
         return docinfo
@@ -505,4 +519,4 @@ def manage_addDocumentViewerTemplate(sel
     return ''
 
 
-    
\ No newline at end of file
+