--- ECHO_content/ECHO_collection.py 2004/07/17 10:19:06 1.141
+++ ECHO_content/ECHO_collection.py 2004/07/18 14:14:42 1.142
@@ -46,7 +46,33 @@ 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=""""""
+ name="""%s"""
+ #link="""%s"""
+ link=""""""
+ type="""%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)
+ 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"
+ return ret
+
+def getCopyrightsFromForm(self,argv):
medias={}
partners={}
copyrights={}
@@ -477,6 +503,8 @@ def manage_addECHO_layoutTemplate(self,
REQUEST.RESPONSE.redirect(u+'/manage_main')
return ''
+
+
class ECHO_resource(Folder,Persistent):
"""ECHO Ressource"""
security=ClassSecurityInfo()
@@ -489,18 +517,7 @@ class ECHO_resource(Folder,Persistent):
security.declareProtected('View','index_html')
def getRDF(self):
"""rdf"""
- ret=""
- about=""""""
- name="""%s"""
- link="""%s"""
- 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"+""
- return ret
+ return getRDFDescription(self,self.link)
def getAccessRightSelectorHTML(self,outlook="select"):
@@ -1492,28 +1509,22 @@ class ECHO_collection(Folder, Persistent
def showRDF(self):
"""showrdf"""
self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
- ret="""\n"""
- ret+=self.getRDF()+"\n"
+ ret="""\n\n"""
+ ret+=self.getRDF(urn="echo:collectionroot")+"\n"
ret+=""""""
- 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=""""""
- name="""%s"""
- link="""%s"""
- 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"+""
-
-
+ ret=getRDFDescription(self,self.absolute_url(),urn)
+ if not urn:
+ urn="urn:"+re.sub('/',':',self.absolute_url())
+ else:
+ urn="urn:"+urn
+
li="""\n"""
@@ -2233,20 +2244,8 @@ class ECHO_group(ECHO_collection):
def getRDF(self):
"""rdf of the collection"""
contents=self.ZopeFind(self,obj_metatypes=['ECHO_group','ECHO_resource','ECHO_collection'])
- about=""""""
- name="""%s"""
-
-
-
- link="""%s"""
- 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"+""
+ ret=getRDFDescription(self,self.absolute_url())