--- ECHO_content/ECHO_collection.py 2004/06/22 14:47:57 1.125 +++ ECHO_content/ECHO_collection.py 2004/06/22 14:51:19 1.126 @@ -505,10 +505,9 @@ class ECHO_resource(Folder,Persistent): params="startpage=%s"%startpage - 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'+urllib.quote('?'+params))).read() - - #print "http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s"%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params)) + + path=self.metalink path=re.sub('http://foxridge.mpiwg-berlin.mpg.de:8080','',path) # falls foxridge als server @@ -616,8 +615,8 @@ class ECHO_resource(Folder,Persistent): def getCopyrightsHTML(self): """gib (link auf copyright notiz, mediatyp, institution, copyrightType, label von copyrightType) aus""" - if hasattr(self,'copyrightModell'): - obj=self.copyrightModell + if hasattr(self,'copyrightModel'): + obj=self.copyrightModel else: return "ERROR"