--- ECHO_content/ECHO_collection.py	2004/07/16 17:55:43	1.140
+++ ECHO_content/ECHO_collection.py	2004/07/18 16:13:57	1.145
@@ -29,7 +29,7 @@ from Products.PageTemplates.ZopePageTemp
 from Globals import Persistent, package_home
 from Acquisition import Implicit
 from ECHO_helpers import displayTypes
-
+import urllib
 
 try:
 	from psycopg import libpq
@@ -46,7 +46,39 @@ 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 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%self.label
+	    elif not self.title=="":
+		    name2=name%self.title
+	    else:
+		    name2=name%self.getId()
+	    
+	    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"+"\n</RDF:Description>"
+	    return ret
+    
+def getCopyrightsFromForm(self,argv): 
 	medias={}
 	partners={}
 	copyrights={}
@@ -477,6 +509,8 @@ def manage_addECHO_layoutTemplate(self,
     REQUEST.RESPONSE.redirect(u+'/manage_main')
     return ''
 
+
+
 class ECHO_resource(Folder,Persistent):
     """ECHO Ressource"""
     security=ClassSecurityInfo()
@@ -487,20 +521,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%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"):
@@ -1490,36 +1513,34 @@ class ECHO_collection(Folder, Persistent
     path="/mpiwg/online/permanent/shipbuilding"
 
     def showRDF(self):
-	    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"
+	    """showrdf"""
+            self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
+	    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>"""
-    
-    def getRDF(self):
+    	    return ret 
+
+    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>"
-	    urn="urn:"+re.sub('/',':',self.absolute_url())
+	    if not urn:
+		    urn="urn:"+re.sub('/',':',self.absolute_url())
+	   
 	    li="""<RDF:li resource="%s" />\n"""
 
 	    
 	    for content in contents:
 		    ret+=content[1].getRDF()+"\n"
 		    
-	    ret+="""<RDF:Seq about="%s"/>\n"""%urn
+	    ret+="""<RDF:Seq about="%s">\n"""%urn
 	    for content in contents:
 		    nurn="urn:"+re.sub('/',':',content[1].absolute_url())
 		    ret+=li%nurn
-	    return ret+"</rdf:Seq>"
+	    return ret+"</RDF:Seq>"
 	    
 	    
     def changeLabels(self):
@@ -2225,22 +2246,26 @@ 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'])
+
+	    ret=getRDFDescription(self,self.absolute_url(),urn)
+
 	    
+
 	    urn="urn:"+re.sub('/',':',self.absolute_url())
 	    li="""<RDF:li resource="%s" />\n"""
-	    ret=""
+	    
 	    
 	    for content in contents:
 		    ret+=content[1].getRDF()+"\n"
 		    
-	    ret+="""<RDF:Seq about="%s"/>\n"""%urn
+	    ret+="""<RDF:Seq about="%s">\n"""%urn
 	    for content in contents:
 		    nurn="urn:"+re.sub('/',':',content[1].absolute_url())
 		    ret+=li%nurn
-	    return ret+"</rdf:Seq>"
+	    return ret+"</RDF:Seq>"
 	    
 	def index_html(self):
 		"""standard page"""
@@ -2457,6 +2482,35 @@ class ECHO_root(Folder,Persistent,Implic
     security=ClassSecurityInfo()
     
     meta_type="ECHO_root"
+    
+    def showRDF(self):
+	    """showrdf"""
+            self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
+	    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
+
+    def getRDF(self,urn=None):
+	    """rdf of the collection"""
+
+	    contents=self.ZopeFind(self,obj_metatypes=['ECHO_group','ECHO_resource','ECHO_collection'])
+
+	    ret=getRDFDescription(self,self.absolute_url(),urn=urn)
+	    
+	    li="""<RDF:li resource="%s" />\n"""
+
+	    
+	    for content in contents:
+		    ret+=content[1].getRDF()+"\n"
+		    
+	    ret+="""<RDF:Seq about="%s">\n"""%urn
+	    for content in contents:
+		    nurn="urn:"+re.sub('/',':',content[1].absolute_url())
+		    ret+=li%nurn
+	    return ret+"</RDF:Seq>"
+	    
 
     def showContent(self,path):
 	    """return content/html"""