--- ECHO_content/ECHO_collection.py 2004/10/19 18:44:26 1.180 +++ ECHO_content/ECHO_collection.py 2004/10/19 19:20:19 1.181 @@ -1156,12 +1156,13 @@ class ECHO_resource(Folder,Persistent): zLOG.LOG("ECHO Fulltext",zLOG.INFO,"found %s"%texturl) fh.close() zLOG.LOG("ECHO Fulltext",zLOG.INFO,"closed fh") - + #keine url if not (texturl.split(":")[0] in ['http','ftp','file']): - 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: + return file(texturl).read() + else: + return texturl + if not noredirect: self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml') zLOG.LOG("ECHO Fulltext",zLOG.INFO,"redirect to:%s"%texturl)