--- ECHO_content/ECHO_collection.py	2004/06/08 17:04:39	1.110
+++ ECHO_content/ECHO_collection.py	2004/06/18 13:29:18	1.121
@@ -342,7 +342,7 @@ class ECHO_copyright(Folder):
 		pt.content_type="text/html"
 		return pt()
 
-	def ECHO_copyright_config(self,title,RESPONSE):
+	def ECHO_copyright_config(self,title,RESPONSE=None):
 		"""change"""
 		self.title=title
 		self.copyrights=[]
@@ -488,7 +488,7 @@ class ECHO_resource(Folder,Persistent):
 			    return "<error>no fulltext available</error>"
 
     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(("""<a target="_blank" href="%s">%s</a>"""%(link,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(("""<a target="_blank" href="%s">%s</a>"""%(url,label),copyright[0],copyright[1],copyright[2],label))
+		        else:
+			        if hasattr(copyrightTypeObj, 'copyright.html'):
+			             ret.append(("""<a target="_blank" href="%s?partner=%s">%s\(%s\)</a>"""%(link,copyright[1],label,copyright[0]),copyright[0],copyright[1],copyright[2],label))
+			        else:
+			             ret.append((label,copyright[0],copyright[1],copyright[2],label))
 		    except:
 			    """nothing"""
 		    
@@ -1392,6 +1401,7 @@ class ECHO_collection(Folder, Persistent
         for entry in entries:
 		if entry[1].meta_type == 'ECHO_resource':
 			entry[1].ECHO_getResourceMD(template="no")
+			entry[1].generate_title()
 
 		else:
 		   self.ECHO_rerenderLinksMD(entry[1])
@@ -2137,7 +2147,12 @@ class ECHO_root(Folder,Persistent,Implic
                 if self.checkRef(ref):
                     link.setAttribute("href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref)
 
-            return dom.toxml('utf-8')
+            newxml=dom.toxml('utf-8')
+	    match=re.sub(r'<\?xml version=\"1.0\" encoding=\"utf-8\"\?>\n<txt>','',newxml)
+	    match=re.sub(r'</txt>','',match)
+	    
+	    return match
+			   
         return ""
 
     def xml2html(self,str):
@@ -2322,6 +2337,18 @@ class ECHO_root(Folder,Persistent,Implic
         """find all partners in partners"""
         par=self.ZopeFind(self.partners, obj_metatypes='ECHO_partner')
         return par
+        
+    def getPartnerFromID(self):
+        """find partner form ID return object"""
+        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):
@@ -2341,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'},
@@ -2357,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')
@@ -2371,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)