--- ECHO_content/ECHO_collection.py 2004/10/18 17:00:09 1.179 +++ ECHO_content/ECHO_collection.py 2004/10/19 18:44:26 1.180 @@ -1143,7 +1143,7 @@ class ECHO_resource(Folder,Persistent): def getFullTextXML(self,noredirect=None): """getFullTextXML; gives the FullText as an XML Document, and if somthing goes wrong.""" - zLOG.LOG("ECHO Fulltext",zLOG.INFO,"open %s"%self.metalink) + try: zLOG.LOG("ECHO Fulltext",zLOG.INFO,"open %s"%self.metalink) fh=ECHO_helpers.urlopen(self.metalink) @@ -1152,13 +1152,19 @@ class ECHO_resource(Folder,Persistent): texttools=dom.getElementsByTagName('texttool') text=texttools[0].getElementsByTagName('text') texturl=getText(text[0].childNodes) + zLOG.LOG("ECHO Fulltext",zLOG.INFO,"found %s"%texturl) fh.close() + zLOG.LOG("ECHO Fulltext",zLOG.INFO,"closed fh") + if not (texturl.split(":")[0] in ['http','ftp','file']): - texturl=re.sub("//","/",texturl) + texturl=re.sub("//","/",texturl) + #hack has to be corrected + texturl="http://echo.mpiwg-berlin.mpg.de"+texturl #return texturl+"::"+texturl.split(":")[0] if not noredirect: self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml') + zLOG.LOG("ECHO Fulltext",zLOG.INFO,"redirect to:%s"%texturl) self.REQUEST.RESPONSE.redirect(texturl) else: return texturl @@ -1184,6 +1190,8 @@ class ECHO_resource(Folder,Persistent): archivepath=getText(text[0].childNodes) archivepath=re.sub('/mpiwg/online/','',archivepath) imageurl="http://echo.mpiwg-berlin.mpg.de/zogilib?fn="+archivepath+"/"+imagetemp + fh.close() + if not noredirect: self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml') self.REQUEST.RESPONSE.redirect(imageurl)