ECHO_content/ECHO_collection.py - diff

Return to ECHO_collection.py CVS log

Up to [Repository] / ECHO_content

Diff for /ECHO_content/ECHO_collection.py between versions 1.304 and 1.306

version 1.304, 2009/04/14 16:31:27	version 1.306, 2009/04/21 08:12:58
Line 856 class ECHO_collection(CatalogAware, Fold	Line 856 class ECHO_collection(CatalogAware, Fold
if not urn:	if not urn:
urn=self.absolute_url()	urn=self.absolute_url()

li="""<RDF:li RDF:resource="%s" />\n"""	li="""<rdf:li rdf:resource="%s" />\n"""


for content in contents:	for content in contents:
try:	try:
ret+=content[1].getRDF()+"\n"	ret+=content[1].getRDF()+"\n"
except:	except:
logging.error("getRDF: "+repr(content[1].getRDF()))	logging.error("getrdf: "+repr(content[1].getRDF()))
	try:
ret+=self.unicodify(content[1].getRDF())+"\n"	ret+=self.unicodify(content[1].getRDF())+"\n"
ret+="""<RDF:Seq RDF:about="%s">\n"""%urn	except:
	logging.error("--still cannot do it")
	ret+=repr(content[1].getRDF())+"\n"
	ret+="""<rdf:Seq rdf:about="%s">\n"""%urn
for content in contents:	for content in contents:
nurn=content[1].absolute_url()	nurn=content[1].absolute_url()
ret+=li%nurn	ret+=li%nurn
return ret+"</RDF:Seq>"	return ret+"</rdf:Seq>"



Line 1617 class ECHO_group(ECHO_collection):	Line 1621 class ECHO_group(ECHO_collection):

if not urn:	if not urn:
urn=self.absolute_url()	urn=self.absolute_url()
li="""<RDF:li RDF:resource="%s" />\n"""	li="""<rdf:li rdf:resource="%s" />\n"""


for content in contents:	for content in contents:
ret+=content[1].getRDF()+"\n"	ret+=self.unicodify(content[1].getRDF())+"\n"

ret+="""<RDF:Seq RDF:about="%s">\n"""%urn	ret+="""<rdf:Seq rdf:about="%s">\n"""%urn
for content in contents:	for content in contents:
nurn=content[1].absolute_url()	nurn=content[1].absolute_url()
ret+=li%nurn	ret+=li%nurn
return ret+"</RDF:Seq>"	return ret+"</rdf:Seq>"

def index_html(self):	def index_html(self):
"""standard page"""	"""standard page"""
Line 2062 class ECHO_root(Folder,Persistent,Implic	Line 2066 class ECHO_root(Folder,Persistent,Implic
global key	global key
global value	global value
seq=""	seq=""
if name=="RDF:Seq":	if name=="rdf:Seq":
key=attrs.get('RDF:about')	key=attrs.get('rdf:about')
try: # teste ob liste	try: # teste ob liste
x=seqs[key][0]	x=seqs[key][0]
except:	except:
Line 2071 class ECHO_root(Folder,Persistent,Implic	Line 2075 class ECHO_root(Folder,Persistent,Implic
seqs[key]=[]	seqs[key]=[]


elif name=="RDF:Description":	elif name=="rdf:Description":
key=attrs.get('RDF:about')	key=attrs.get('rdf:about')


elif name=="RDF:li":	elif name=="rdf:li":
name=attrs.get('RDF:resource')	name=attrs.get('rdf:resource')
seqs[key].append(name)	seqs[key].append(name)

elif name=="ECHONAVIGATION:type":	elif name=="echonavigation:type":
value="type"	value="type"

elif name=="ECHONAVIGATION:name":	elif name=="echonavigation:name":
value="name"	value="name"
elif name=="ECHONAVIGATION:linkClickable":	elif name=="echonavigation:linkClickable":
value="linkClickable"	value="linkClickable"

def end_element(name):	def end_element(name):
Line 2165 class ECHO_root(Folder,Persistent,Implic	Line 2169 class ECHO_root(Folder,Persistent,Implic

ret=getRDFDescription(self,self.absolute_url(),urn=urn)	ret=getRDFDescription(self,self.absolute_url(),urn=urn)

li="""<RDF:li RDF:resource="%s" />\n"""	li="""<rdf:li rdf:resource="%s" />\n"""


for content in contents:	for content in contents:
ret+=content[1].getRDF()+"\n"	ret+=content[1].getRDF()+"\n"

ret+="""<RDF:Seq RDF:about="%s">\n"""%urn	ret+="""<rdf:Seq rdf:about="%s">\n"""%urn
for content in contents:	for content in contents:
nurn=content[1].absolute_url()	nurn=content[1].absolute_url()
ret+=li%nurn	ret+=li%nurn
return ret+"</RDF:Seq>"	return ret+"</rdf:Seq>"


def showContent(self,path):	def showContent(self,path):

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.304
changed lines
	Added in v.1.306