--- ECHO_content/ECHO_collection.py	2004/07/18 16:13:57	1.145
+++ ECHO_content/ECHO_collection.py	2004/07/18 17:11:32	1.146
@@ -46,7 +46,7 @@ import xml.dom.minidom
 from ECHO_graphicalOverview import javaHandler,javaScriptMain
 import ECHO_helpers
 
-def getRDFDescription(self,linkURL,urn=None):
+def getRDFDescription(self,linkURL,urn=None,nameDef=None):
 	    """rdf"""
 	    ret=""
 	    about="""<RDF:Description about="%s">"""
@@ -59,15 +59,17 @@ def getRDFDescription(self,linkURL,urn=N
 		    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
+	    if not nameDef:
+		    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)
 	    else:
-		    name2=name%self.getId()
-	    
-	    name2=re.sub('&','&amp;',name2)
+		    name2=name%nameDef
 
 	    linkURL=re.sub('http:','',linkURL)
 	    linkURL2=re.sub('&','&amp;',linkURL)
@@ -521,10 +523,44 @@ class ECHO_resource(Folder,Persistent):
     getSubCols = ECHO_helpers.getSubCols
 
     security.declareProtected('View','index_html')
+
+    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"""
-	    return getRDFDescription(self,self.link,urn=urn)
+	    ret=getRDFDescription(self,self.link,urn=urn)
+	    return ret+self.createSubElementRDF() 
+
+
+    def createSubElementRDF(self):
+	    """rdf list"""
+	    urn="urn:"+re.sub('/',':',self.absolute_url()) 
+	    ret=""
+
+	    rettemp="""<RDF:Seq about="%s">\n"""%urn
+	    flag=0
 	    
+	    li="""<RDF:li resource="%s" />\n"""
+	    if not ('<error>' in self.getFullTextXML(noredirect='Yes')):
+		    nurn="urn:"+re.sub('/',':',self.absolute_url()+'/getFullTextXML')
+		    rettemp+=li%nurn
+		    flag=1
+	    rettemp+="</RDF:Seq>"
+
+	    if flag==1:
+		    ret+=rettemp
+		    
+	    if not ('<error>' in self.getFullTextXML(noredirect='Yes')):
+		    ret+=getRDFDescription(self,self.absolute_url()+'/getFullTextXML',urn=self.absolute_url()+'/getFullTextXML',nameDef="Fulltext")
+
+	    return ret
 	    
     def getAccessRightSelectorHTML(self,outlook="select"):
 	    """htmlselector"""
@@ -1517,6 +1553,7 @@ class ECHO_collection(Folder, Persistent
             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