Changeset 40:749ee5389892 in documentViewer

Timestamp:

Jun 14, 2006, 4:24:10 PM (18 years ago)

Author:

casties

Branch:

default

Message:

try to ignore superfluous /mpiwg/online in urls

File:

• documentViewer.py (modified) (3 diffs)

documentViewer.py

@@ -164 +164 @@
     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
-    
-        zLOG.LOG("documentViewer (getparamfromdigilib)", zLOG.INFO, "dirInfo from %s"%(imageUrl))
-        
-        for cnt in (1,2,3):
+        infoUrl=self.digilibBaseUrl+"/dirInfo-xml.jsp?mo=dir&fn="+path
+    
+        zLOG.LOG("documentViewer (getparamfromdigilib)", zLOG.INFO, "dirInfo from %s"%(infoUrl))
+        
+        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))
-        else:
-            raise IOError("Unable to get dir-info from %s"%(imageUrl))
+                zLOG.LOG("documentViewer (getdirinfofromdigilib)", zLOG.ERROR, "error reading %s (try %d)"%(infoUrl,cnt))
+        else:
+            raise IOError("Unable to get dir-info from %s"%(infoUrl))
         
         sizes=dom.xpath("//dir/size")
@@ -202 +205 @@
             # 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 n in range(num_retries):
+        for cnt in range(num_retries):
             try:
                 # patch dirk encoding fehler treten dann nicht mehr auf
@@ -212 +215 @@
                 txt=urllib.urlopen(metaUrl).read()
                 dom = Parse(txt)
+                break
             except:
                 zLOG.LOG("ERROR documentViewer (getIndexMata)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])