--- ECHO_content/ECHO_helpers.py 2008/12/17 12:05:00 1.96 +++ ECHO_content/ECHO_helpers.py 2009/04/14 16:31:27 1.97 @@ -142,7 +142,8 @@ class ECHO_basis: def showRDF(self): """showrdf""" self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml') - ret="""\n\n""" + ret="""\n\n""" ret+=self.getRDF(urn="echo:collectionroot")+"\n" @@ -205,8 +206,8 @@ class ECHO_basis: nurn=self.absolute_url()+'/showMetaDataXML' ret+=getRDFDescription(self,self.absolute_url()+'/showMetaDataXML',urn=nurn,nameDef="Metadata",typeName="ECHO_metaData") + return ret - def content_html_XMLRpc(self): """xml_rpc_version""" return encodeRPC(self.content_html()) @@ -821,7 +822,7 @@ def reloadMetaDataFromStorage(self,RESPO return ret -def getRDFDescription(self,linkURL,urn=None,nameDef=None,typeName=None): +def getRDFDescription(self,linkURL,urn=None,nameDef=None,typeName=None,ap=""): """rdf""" ret="" @@ -831,7 +832,14 @@ def getRDFDescription(self,linkURL,urn=N clickable="""%s""" #link="""""" type="""%s""" - #xlink="""""" + + #xlink="""""" + + if ap=="": + ap2="" + else: + ap2 = """%s"""%ap + if not urn: #urn="urn:"+re.sub('/',':',self.absolute_url()) urn=self.absolute_url() @@ -858,8 +866,9 @@ def getRDFDescription(self,linkURL,urn=N else: type2=type%typeName + #ret=about2+"\n"+name2+"\n"+link2+"\n"+type2+"\n"+clickable2+"\n" - ret=about2+"\n"+name2+"\n"+type2+"\n"+clickable2+"\n" + ret=about2+"\n"+name2+"\n"+type2+"\n"+clickable2+"\n"+ap2+"\n" return ret def getCopyrightsFromForm(self,argv):