ECHO_content/ECHO_collection.py - diff

Return to ECHO_collection.py CVS log

Up to [Repository] / ECHO_content

Diff for /ECHO_content/ECHO_collection.py between versions 1.125 and 1.126

version 1.125, 2004/06/22 14:47:57	version 1.126, 2004/06/22 14:51:19
Line 505 class ECHO_resource(Folder,Persistent):	Line 505 class ECHO_resource(Folder,Persistent):

params="startpage=%s"%startpage	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()	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=self.metalink

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
Line 616 class ECHO_resource(Folder,Persistent):	Line 615 class ECHO_resource(Folder,Persistent):
def getCopyrightsHTML(self):	def getCopyrightsHTML(self):
"""gib (link auf copyright notiz, mediatyp, institution, copyrightType, label von copyrightType) aus"""	"""gib (link auf copyright notiz, mediatyp, institution, copyrightType, label von copyrightType) aus"""

if hasattr(self,'copyrightModell'):	if hasattr(self,'copyrightModel'):
obj=self.copyrightModell	obj=self.copyrightModel

else:	else:
return "ERROR"	return "ERROR"

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

Removed from v.1.125
changed lines
	Added in v.1.126