--- ECHO_content/ECHO_collection.py	2004/07/17 10:19:06	1.141
+++ ECHO_content/ECHO_collection.py	2004/07/18 14:38:11	1.143
@@ -46,7 +46,34 @@ import xml.dom.minidom
 from ECHO_graphicalOverview import javaHandler,javaScriptMain
 import ECHO_helpers
 
-def getCopyrightsFromForm(self,argv):
+def getRDFDescription(self,linkURL,urn=None):
+	    """rdf"""
+	    ret=""
+	    about="""<RDF:Description about="%s">"""
+	    name="""<ECHONAVIGATION:name>%s</ECHONAVIGATION:name>"""
+	    #link="""<ECHONAVIGATION:link>%s</ECHONAVIGATION:link>"""
+	    link="""<ECHONAVIGATION:link RDF:about="%s"/>"""
+	    type="""<ECHONAVIGATION:type>%s</ECHONAVIGATION:type>"""
+
+	    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)
+	    elif not self.title=="":
+		    name2=name%urllib.quote(self.title)
+	    else:
+		    name2=name%self.getId()
+		    
+	    link2=link%urllib.quote(linkURL)
+	    type2=type%self.meta_type
+	    
+	    ret=about2+"\n"+name2+"\n"+link2+"\n"+type2+"\n</RDF:Description>"
+	    return ret
+    
+def getCopyrightsFromForm(self,argv): 
 	medias={}
 	partners={}
 	copyrights={}
@@ -477,6 +504,8 @@ def manage_addECHO_layoutTemplate(self,
     REQUEST.RESPONSE.redirect(u+'/manage_main')
     return ''
 
+
+
 class ECHO_resource(Folder,Persistent):
     """ECHO Ressource"""
     security=ClassSecurityInfo()
@@ -487,20 +516,9 @@ class ECHO_resource(Folder,Persistent):
     getSubCols = ECHO_helpers.getSubCols
 
     security.declareProtected('View','index_html')
-    def getRDF(self):
+    def getRDF(self,urn=None):
 	    """rdf"""
-	    ret=""
-	    about="""<RDF:Description about="%s">"""
-	    name="""<ECHONAVIGATION:name>%s</ECHONAVIGATION:name>"""
-	    link="""<ECHONAVIGATION:link>%s</ECHONAVIGATION:link>"""
-	    urn="urn:"+re.sub('/',':',self.absolute_url())
-
-	    about2=about%urn
-	    name2=name%self.getId()
-	    link2=link%urllib.quote(self.link)
-
-	    ret=about2+"\n"+name2+"\n"+link2+"\n"+"</RDF:Description>"
-	    return ret
+	    return getRDFDescription(self,self.link,urn=urn)
 	    
 	    
     def getAccessRightSelectorHTML(self,outlook="select"):
@@ -1492,28 +1510,21 @@ class ECHO_collection(Folder, Persistent
     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+=self.getRDF()+"\n"
+	    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+="""</RDF:RDF>"""
-    	    return ret
+    	    return ret 
 
-    def getRDF(self):
+    def getRDF(self,urn=None):
 	    """rdf of the collection"""
-	    contents=self.ZopeFind(self,obj_metatypes=['ECHO_group','ECHO_resource','ECHO_collection'])
-
-	    about="""<RDF:Description about="%s">"""
-	    name="""<ECHONAVIGATION:name>%s</ECHONAVIGATION:name>"""
-	    link="""<ECHONAVIGATION:link>%s</ECHONAVIGATION:link>"""
-	    urn="urn:"+re.sub('/',':',self.absolute_url())
-
-	    about2=about%urn
-	    name2=name%self.getId()
-	    link2=link%urllib.quote(self.absolute_url())
-
-	    ret=about2+"\n"+name2+"\n"+link2+"\n"+"</RDF:Description>"
 
+	    contents=self.ZopeFind(self,obj_metatypes=['ECHO_group','ECHO_resource','ECHO_collection'])
 
+	    ret=getRDFDescription(self,self.absolute_url(),urn=urn)
 
+	    if not urn:
+		    urn="urn:"+re.sub('/',':',self.absolute_url())
+	   
 	    li="""<RDF:li resource="%s" />\n"""
 
 	    
@@ -2230,23 +2241,11 @@ class ECHO_group(ECHO_collection):
 	
 	security.declareProtected('View','index_html')
 
-	def getRDF(self):
+	def getRDF(self,urn=None):
 	    """rdf of the collection"""
 	    contents=self.ZopeFind(self,obj_metatypes=['ECHO_group','ECHO_resource','ECHO_collection'])
-	    about="""<RDF:Description about="%s">"""
-	    name="""<ECHONAVIGATION:name>%s</ECHONAVIGATION:name>"""
-	    
-	    
-	    
-	    link="""<ECHONAVIGATION:link>%s</ECHONAVIGATION:link>"""
-	    urn="urn:"+re.sub('/',':',self.absolute_url())
-
-	    about2=about%urn
-	    name2=name%self.getId()
-	    link2=link%urllib.quote(self.absolute_url())
-
-	    ret=about2+"\n"+name2+"\n"+link2+"\n"+"</RDF:Description>"
 
+	    ret=getRDFDescription(self,self.absolute_url(),urn)
 
 	    
 
@@ -2483,25 +2482,18 @@ class ECHO_root(Folder,Persistent,Implic
 	    """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+=self.getRDF()+"\n"
+	    ret+=self.getRDF(urn="echo:collectionroot")+"\n"
+
 	    ret+="""</RDF:RDF>"""
     	    return ret
 
-    def getRDF(self):
+    def getRDF(self,urn=None):
 	    """rdf of the collection"""
-	    contents=self.ZopeFind(self,obj_metatypes=['ECHO_group','ECHO_resource','ECHO_collection'])
 
-	    about="""<RDF:Description about="%s">"""
-	    name="""<ECHONAVIGATION:name>%s</ECHONAVIGATION:name>"""
-	    
-	    urn="urn:"+re.sub('/',':',self.absolute_url())
+	    contents=self.ZopeFind(self,obj_metatypes=['ECHO_group','ECHO_resource','ECHO_collection'])
 
-	    about2=about%urn
-	    name2=name%self.getId()
+	    ret=getRDFDescription(self,self.absolute_url(),urn=urn)
 	    
-
-	    ret=about2+"\n"+name2+"\n"+"</RDF:Description>"
-
 	    li="""<RDF:li resource="%s" />\n"""