--- ECHO_content/ECHO_helpers.py 2009/04/16 15:40:42 1.98
+++ ECHO_content/ECHO_helpers.py 2010/10/11 13:15:00 1.103
@@ -92,7 +92,7 @@ class ECHO_basis:
# Managment for the PID
def setPID(self,pid):
"""set the pid"""
- logging.debug(self.getID()+" PID set to "+pid)
+ logging.debug(self.getId()+" PID set to "+pid)
self.pid=pid
return True
@@ -143,25 +143,25 @@ class ECHO_basis:
def showRDF(self):
"""showrdf"""
self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
- ret="""\n\n\n"""
ret+=self.getRDF(urn="echo:collectionroot")+"\n"
- ret+=""""""
+ ret+=""""""
return ret
def RDF(self):
"""showrdf"""
self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
- ret="""\n\n"""
+ ret="""\n\n"""
ret+=self.getRDF(urn=self.absolute_url())+"\n"
- ret+=""""""
+ ret+=""""""
return ret
@@ -171,10 +171,10 @@ class ECHO_basis:
urn=self.absolute_url()
ret=""
- rettemp="""\n"""%urn
+ rettemp="""\n"""%urn
flag=0
- li="""\n"""
+ li="""\n"""
if not ('' in self.getFullTextXML(noredirect='Yes')):
nurn=self.absolute_url()+'/getFullTextXML'
rettemp+=li%nurn
@@ -190,7 +190,7 @@ class ECHO_basis:
rettemp+=li%nurn
flag=1
- rettemp+=""
+ rettemp+=""
if flag==1:
ret+=rettemp
@@ -799,14 +799,19 @@ def ECHO_rerenderLinksMD(self,obj=None,t
if entry[1].meta_type == 'ECHO_resource':
try:
entry[1].ECHO_getResourceMD(template="no",overwrite="yes")
+ logging.debug("ECHO_rerenderLinksMD: gotMD")
if "title" in types:
entry[1].generate_title()
+ logging.debug("ECHO_rerenderLinksMD: generatedTitle")
if "label" in types:
entry[1].generate_label()
- ret+="OK:"+entry[0]+"-- "+entry[1].getTitle().decode('utf-8')+"-- "+entry[1].getTitle().decode('utf-8')+"
"
+ logging.debug("ECHO_rerenderLinksMD: generatedLabel")
+ ret+="OK:"+entry[0]+"-- "+self.unicodify(entry[1].getTitle())+"-- "+self.unicodify(entry[1].getTitle())+"
"
except:
+
ret+="Error:"+entry[0]+"
"
-
+ logging.debug("ECHO_rerenderLinksMD: error")
+ logging.debug("%s %s"%(sys.exc_info()[0],sys.exc_info()[1]))
@@ -837,19 +842,19 @@ def getRDFDescription(self,linkURL,urn=N
"""rdf"""
ret=""
- about=""""""
- name="""%s"""
- link="""%s"""
- clickable="""%s"""
- #link=""""""
- type="""%s"""
+ about=""""""
+ name="""%s"""
+ link="""%s"""
+ clickable="""%s"""
+ #link=""""""
+ type="""%s"""
- #xlink=""""""
+ #xlink=""""""
if ap=="":
ap2=""
else:
- ap2 = """%s"""%ap
+ ap2 = """%s"""%ap
if not urn:
#urn="urn:"+re.sub('/',':',self.absolute_url())
@@ -878,8 +883,13 @@ def getRDFDescription(self,linkURL,urn=N
type2=type%typeName
- #ret=about2+"\n"+name2+"\n"+link2+"\n"+type2+"\n"+clickable2+"\n"
- ret=about2+"\n"+name2+"\n"+type2+"\n"+clickable2+"\n"+ap2+"\n"
+
+ #ret=about2+"\n"+name2+"\n"+link2+"\n"+type2+"\n"+clickable2+"\n"
+ try:
+ ret=about2+"\n"+name2+"\n"+type2+"\n"+clickable2+"\n"+ap2+"\n"
+ except:
+ ret=self.unicodify(about2)+"\n"+self.unicodify(name2)+"\n"+self.unicodify(type2)+"\n"+self.unicodify(clickable2)+"\n"+self.unicodify(ap2)+"\n"
+
return ret
def getCopyrightsFromForm(self,argv):