--- 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=""""""
name="""%s"""
- link="""%s"""
+ link="""%s"""
#link=""""""
type="""%s"""
-
+ #xlink=""""""
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('&','&',name2)
+
+ linkURL=re.sub('http:','',linkURL)
+ linkURL2=re.sub('&','&',linkURL)
+ link2=link%(("http:"+linkURL2),("http:"+urllib.quote(linkURL)))
+
type2=type%self.meta_type
- ret=about2+"\n"+name2+"\n"+link2+"\n"+type2+"\n"
+ ret=about2+"\n"+name2+"\n"+link2+"\n"+type2+"\n"+"\n"
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="""\n\n"""
- ret+=self.getRDF(urn="urn:echo:collectionroot")+"\n"
+ ret="""\n\n"""
+ ret+=self.getRDF(urn="echo:collectionroot")+"\n"
ret+=""""""
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="""\n"""
+ ret="""\n\n"""
ret+=self.getRDF(urn="echo:collectionroot")+"\n"
ret+=""""""