--- ECHO_content/ECHO_collection.py 2004/06/23 13:00:58 1.127
+++ ECHO_content/ECHO_collection.py 2004/06/24 12:23:05 1.129
@@ -510,6 +510,9 @@ class ECHO_resource(Folder,Persistent):
path=self.metalink
+ path=re.sub(self.REQUEST['SERVER_URL'],'',path)
+ path=re.sub('http://'+self.REQUEST['HTTP_HOST'],'',path)
+
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
@@ -619,7 +622,7 @@ class ECHO_resource(Folder,Persistent):
return "no fulltext available"
def getCopyrightsHTML(self):
- """gib (link auf copyright notiz, mediatyp, institution, copyrightType, label von copyrightType) aus"""
+ """gib (link auf copyright link, mediatyp, institution, copyrightType, label von copyrightType) aus"""
if hasattr(self,'copyrightModel'):
obj=self.copyrightModel
@@ -638,12 +641,12 @@ class ECHO_resource(Folder,Persistent):
url=copyrightTypeObj.url
if url!='':
- ret.append(("""%s"""%(url,label),copyright[0],copyright[1],copyright[2],label))
+ ret.append((url,copyright[0],copyright[1],copyright[2],label))
else:
if hasattr(copyrightTypeObj, 'copyright.html'):
- ret.append(("""%s"""%(link,copyright[1],label),copyright[0],copyright[1],copyright[2],label))
+ ret.append(("""%s?partner=%s"""%(link,copyright[1]),copyright[0],copyright[1],copyright[2],label))
else:
- ret.append((label,copyright[0],copyright[1],copyright[2],label))
+ ret.append(('empty',copyright[0],copyright[1],copyright[2],label))
except:
"""nothing"""