--- ECHO_content/ECHO_collection.py 2004/05/10 13:23:59 1.74 +++ ECHO_content/ECHO_collection.py 2004/05/10 14:18:33 1.76 @@ -112,7 +112,7 @@ def sendFile(self, filename, type): break if object: # if the object exists then send it - object() + return object.index_html(self.REQUEST.REQUEST, self.REQUEST.RESPONSE) else: # send a local file with the given content-type fn = os.path.join(package_home(globals()), filename) @@ -539,7 +539,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 +547,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) @@ -1249,8 +1250,7 @@ class ECHO_collection(Folder, Persistent def area_img(self): """area image""" - sendFile(self, 'images/red.gif', 'image/gif') - return + return sendFile(self, 'images/red.gif', 'image/gif') def hl_lib_js(self): """javascript"""