--- ECHO_content/ECHO_collection.py	2004/06/08 15:44:18	1.109
+++ ECHO_content/ECHO_collection.py	2004/06/17 10:03:20	1.115
@@ -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=[]
@@ -503,7 +503,7 @@ class ECHO_resource(Folder,Persistent):
 		    
 		    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]))
+			    ret.append(("""<a target="_blank" href="%s?partner=%s">%s</a>"""%(link,copyright[1],label),copyright[0],copyright[0],copyright[1],copyright[2]))
 		    except:
 			    """nothing"""
 		    
@@ -1392,6 +1392,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,9 +2138,31 @@ 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):
+        """link2html fuer VLP muss hier noch raus"""
+        if str:
+
+            str=re.sub("\&","&amp;",str)
+            dom=xml.dom.minidom.parseString(str)
+            links=dom.getElementsByTagName("link")
+            
+
+            for link in links:
+                link.tagName="a"
+                ref=link.getAttribute("ref")
+                if self.checkRef(ref):
+                    link.setAttribute("href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref)
+
+            return dom.toxml('utf-8')
+        return ""
 
     def checkRef(self,ref):
         dbs={'vl_literature':'AND CD LIKE \'%lise%\'','vl_technology':'','vl_people':''}
@@ -2305,6 +2328,12 @@ 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 manage_addECHO_root(self,id,title,RESPONSE=None):