Diff for /ECHO_content/ECHO_collection.py between versions 1.180 and 1.181

version 1.180, 2004/10/19 18:44:26 version 1.181, 2004/10/19 19:20:19
Line 1156  class ECHO_resource(Folder,Persistent): Line 1156  class ECHO_resource(Folder,Persistent):
             zLOG.LOG("ECHO Fulltext",zLOG.INFO,"found %s"%texturl)              zLOG.LOG("ECHO Fulltext",zLOG.INFO,"found %s"%texturl)
                     fh.close()                      fh.close()
             zLOG.LOG("ECHO Fulltext",zLOG.INFO,"closed fh")              zLOG.LOG("ECHO Fulltext",zLOG.INFO,"closed fh")
               #keine url
             if not (texturl.split(":")[0] in ['http','ftp','file']):               if not (texturl.split(":")[0] in ['http','ftp','file']): 
                     texturl=re.sub("//","/",texturl)              if not noredirect:
                 #hack has to be corrected                  return file(texturl).read()
                 texturl="http://echo.mpiwg-berlin.mpg.de"+texturl                             else:
             #return texturl+"::"+texturl.split(":")[0]                  return texturl
   
             if not noredirect:              if not noredirect:
                             self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')                                self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')  
                     zLOG.LOG("ECHO Fulltext",zLOG.INFO,"redirect to:%s"%texturl)                      zLOG.LOG("ECHO Fulltext",zLOG.INFO,"redirect to:%s"%texturl)

Removed from v.1.180  
changed lines
  Added in v.1.181


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>