--- ECHO_content/ECHO_collection.py 2004/05/10 13:23:59 1.74 +++ ECHO_content/ECHO_collection.py 2004/05/10 13:51:03 1.75 @@ -105,17 +105,22 @@ def sendFile(self, filename, type): object = self # look for an object called filename for path in paths: + print "fragment: '"+path+"'" if hasattr(object, path): + print " exists" object = getattr(object, path) else: + print " doesn't exist" object = None break if object: # if the object exists then send it + print "send zope object"+object() object() else: # send a local file with the given content-type fn = os.path.join(package_home(globals()), filename) + print "send fs file: "+fn self.REQUEST.RESPONSE.setHeader("Content-Type", type) self.REQUEST.RESPONSE.write(file(fn).read()) return @@ -539,7 +544,7 @@ class ECHO_resource(Folder): def changeECHO_resource_metadata(self,RESPONSE=None): """change metadata""" tags=self.findTagsFromMapping(self.contentType) - OSAS_meta={} + self.OSAS_meta={} for field in tags[1]: try: self.metaDataHash[self.getFieldTag(tags,field)]=self.REQUEST.form[self.getFieldTag(tags,field)] @@ -547,13 +552,14 @@ class ECHO_resource(Folder): except: """nothing""" - return urllib.urlopen('http://localhost:8080/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.absolute_url()+'/newMetaXML',self.metalink)).read() + return urllib.urlopen('http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML')).read() if RESPONSE is not None: RESPONSE.redirect('manage_main') def newMetaXML(self): + """new index.meta""" self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml') return writeMetadata(self.metalink,self.OSAS_meta)