Diff for /ECHO_content/ECHO_collection.py between versions 1.262 and 1.263

version 1.262, 2006/02/14 17:28:52 version 1.263, 2006/02/14 19:29:45
Line 865  class ECHO_resource(CatalogAware,Folder, Line 865  class ECHO_resource(CatalogAware,Folder,
   
             path=re.sub('/index.meta','',path)               path=re.sub('/index.meta','',path) 
   
             path=re.sub(self.REQUEST['SERVER_URL'],'',path)          #TODO: direct access to the file system necessary, fix that also xmlrpc to the server where the index file is stored is possible    
             path=re.sub('http://'+self.REQUEST['HTTP_HOST'],'',path)          parsedUrl=urlparse.urlparse(path)
           path=parsedUrl[2]
             path=re.sub('http://foxridge.mpiwg-berlin.mpg.de:8080','',path) # falls foxridge als server  
             path=re.sub('http://foxridge.mpiwg-berlin.mpg.de:8080','',path) # falls foxridge als server  
             path=re.sub('http://foxridge.mpiwg-berlin.mpg.de','',path) # falls foxridge als server  
   
             path=re.sub('http://foxridge.rz-berlin.mpg.de:8080','',path) # falls foxridge als server  
             path=re.sub('http://foxridge.rz-berlin.mpg.de','',path) # falls foxridge als server  
             path=re.sub('http://content.mpiwg-berlin.mpg.de','',path) # falls content als server  
             path=re.sub('http://echo.mpiwg-berlin.mpg.de','',path) # falls echo  
   
             path=re.sub('http://vision.rz-berlin.mpg.de','',path) # falls vision als server  
   
           try:    
             return ECHO_helpers.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()              return ECHO_helpers.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()
           except:
                   zLOG.LOG("ECHO_Resource (changeViewerTemplateSet)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])
                   zLOG.LOG("ECHO_Resource (changeViewerTemplateSet)", zLOG.INFO,"http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path)
   
             if RESPONSE is not None:              if RESPONSE is not None:
                         RESPONSE.redirect('manage_main')                          RESPONSE.redirect('manage_main')

Removed from v.1.262  
changed lines
  Added in v.1.263


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