--- ECHO_content/ECHO_collection.py	2004/07/18 14:58:32	1.144
+++ ECHO_content/ECHO_collection.py	2004/07/18 16:13:57	1.145
@@ -51,26 +51,31 @@ def getRDFDescription(self,linkURL,urn=N
 	    ret=""
 	    about="""<RDF:Description about="%s">"""
 	    name="""<ECHONAVIGATION:name>%s</ECHONAVIGATION:name>"""
-	    link="""<ECHONAVIGATION:link>%s</ECHONAVIGATION:link>"""
+	    link="""<ECHONAVIGATION:link xlink:href="%s">%s</ECHONAVIGATION:link>"""
 	    #link="""<ECHONAVIGATION:link RDF:about="%s"/>"""
 	    type="""<ECHONAVIGATION:type>%s</ECHONAVIGATION:type>"""
-
+            #xlink="""<ECHONAVIGATION:xlink xlink:href="%s"/>"""	
 	    if not urn:
 		    urn="urn:"+re.sub('/',':',self.absolute_url())
 
 	    about2=about%urn
 	    
 	    if hasattr(self,'label') and not (self.label==""):
-		    name2=name%urllib.quote(self.label)
+		    name2=name%self.label
 	    elif not self.title=="":
-		    name2=name%urllib.quote(self.title)
+		    name2=name%self.title
 	    else:
 		    name2=name%self.getId()
-		    
-	    link2=link%urllib.quote(linkURL)
+	    
+	    name2=re.sub('&','&amp;',name2)
+
+	    linkURL=re.sub('http:','',linkURL)
+	    linkURL2=re.sub('&','&amp;',linkURL)
+	    link2=link%(("http:"+linkURL2),("http:"+urllib.quote(linkURL)))
+
 	    type2=type%self.meta_type
 	    
-	    ret=about2+"\n"+name2+"\n"+link2+"\n"+type2+"\n</RDF:Description>"
+	    ret=about2+"\n"+name2+"\n"+link2+"\n"+type2+"\n"+"\n</RDF:Description>"
 	    return ret
     
 def getCopyrightsFromForm(self,argv): 
@@ -1510,8 +1515,8 @@ class ECHO_collection(Folder, Persistent
     def showRDF(self):
 	    """showrdf"""
             self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
-	    ret="""<?xml encoding="utf-8"?>\n<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"  xmlns:ECHONAVIGATION="http://www.echo.eu/rdf#">\n"""
-	    ret+=self.getRDF(urn="urn:echo:collectionroot")+"\n"
+	    ret="""<?xml version="1.0" encoding="utf-8"?>\n<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"  xmlns:ECHONAVIGATION="http://www.echo.eu/rdf#">\n"""
+	    ret+=self.getRDF(urn="echo:collectionroot")+"\n"
 	    ret+="""</RDF:RDF>"""
     	    return ret 
 
@@ -2481,7 +2486,7 @@ class ECHO_root(Folder,Persistent,Implic
     def showRDF(self):
 	    """showrdf"""
             self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
-	    ret="""<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"  xmlns:ECHONAVIGATION="http://www.echo.eu/rdf#">\n"""
+	    ret="""<?xml version="1.0" encoding="utf-8"?>\n<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"  xmlns:ECHONAVIGATION="http://www.echo.eu/rdf#">\n"""
 	    ret+=self.getRDF(urn="echo:collectionroot")+"\n"
 
 	    ret+="""</RDF:RDF>"""