--- ECHO_content/ECHO_collection.py 2004/06/17 10:05:10 1.116
+++ ECHO_content/ECHO_collection.py 2004/06/18 12:32:21 1.119
@@ -488,7 +488,7 @@ class ECHO_resource(Folder,Persistent):
return "no fulltext available"
def getCopyrightsHTML(self):
- """gib link auf copyright notiz aus"""
+ """gib (link auf copyright notiz, mediatyp, institution, copyrightType, label von copyrightType) aus"""
if hasattr(self,'copyrightModell'):
obj=self.copyrightModell
@@ -502,8 +502,17 @@ class ECHO_resource(Folder,Persistent):
link="copyrightTypes/"+copyright[2]+'/copyright.html'
try:
- label=getattr(self.copyrightTypes,copyright[2]).label
- ret.append(("""%s"""%(link,copyright[1],label),copyright[0],copyright[0],copyright[1],copyright[2]))
+ copyrightTypeObj=getattr(self.copyrightTypes,copyright[2])
+ label=copyrightTypeObj.label
+ url=copyrightTypeObj.url
+
+ if url!='':
+ ret.append(("""%s"""%(url,label),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))
+ else:
+ ret.append((label,copyright[0],copyright[1],copyright[2],label))
except:
"""nothing"""
@@ -2334,6 +2343,12 @@ class ECHO_root(Folder,Persistent,Implic
pa=self.REQUEST['partner']
par=self.ZopeFind(self.partners, obj_ids=[pa])
return par
+
+ def getPartnerFromIDParameter(self, id):
+ """ find partners from ID"""
+ par=self.ZopeFind(self.partners, obj_ids=[id])
+ return par
+
def manage_addECHO_root(self,id,title,RESPONSE=None):
@@ -2353,11 +2368,12 @@ class ECHO_copyrightType(Folder):
meta_type="ECHO_copyrightType"
- def __init__(self,id,title,label):
+ def __init__(self,id,title,label,url):
"""init"""
self.id=id
self.title=title
self.label=label
+ self.url=url
manage_options = Folder.manage_options+(
{'label':'Main Config','action':'ECHO_copyrightType_config_mainForm'},
@@ -2369,10 +2385,11 @@ class ECHO_copyrightType(Folder):
pt.content_type="text/html"
return pt()
- def ECHO_copyrightType_config_main(self,title,label,RESPONSE=None):
+ def ECHO_copyrightType_config_main(self,title,label,url,RESPONSE=None):
"""change"""
self.title=title
self.label=label
+ self.url=url
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
@@ -2383,10 +2400,10 @@ def manage_addECHO_copyrightTypeForm(sel
return pt()
-def manage_addECHO_copyrightType(self,id,title,label,RESPONSE=None):
+def manage_addECHO_copyrightType(self,id,title,label,url,RESPONSE=None):
"""addaresource"""
- newObj=ECHO_copyrightType(id,title,label)
+ newObj=ECHO_copyrightType(id,title,label,url)
self._setObject(id,newObj)