--- ECHO_content/ECHO_collection.py 2009/02/02 15:08:58 1.302
+++ ECHO_content/ECHO_collection.py 2009/04/17 13:58:40 1.305
@@ -735,8 +735,9 @@ class ECHO_collection(CatalogAware, Fold
ret+="Cannot import: %s (Already existing?)
"%name
os.close(ds)
os.remove(fn)
-
- zf.close()
+
+ zf.close()
+
if ret:
return """
%s"""%ret
if RESPONSE:
@@ -859,8 +860,11 @@ class ECHO_collection(CatalogAware, Fold
for content in contents:
+ try:
ret+=content[1].getRDF()+"\n"
-
+ except:
+ logging.error("getRDF: "+repr(content[1].getRDF()))
+ ret+=self.unicodify(content[1].getRDF())+"\n"
ret+="""\n"""%urn
for content in contents:
nurn=content[1].absolute_url()
@@ -2058,8 +2062,8 @@ class ECHO_root(Folder,Persistent,Implic
global key
global value
seq=""
- if name=="RDF:Seq":
- key=attrs.get('RDF:about')
+ if name=="rdf:Seq":
+ key=attrs.get('rdf:about')
try: # teste ob liste
x=seqs[key][0]
except:
@@ -2067,20 +2071,20 @@ class ECHO_root(Folder,Persistent,Implic
seqs[key]=[]
- elif name=="RDF:Description":
- key=attrs.get('RDF:about')
+ elif name=="rdf:Description":
+ key=attrs.get('rdf:about')
- elif name=="RDF:li":
- name=attrs.get('RDF:resource')
+ elif name=="rdf:li":
+ name=attrs.get('rdf:resource')
seqs[key].append(name)
- elif name=="ECHONAVIGATION:type":
+ elif name=="echonavigation:type":
value="type"
- elif name=="ECHONAVIGATION:name":
+ elif name=="echonavigation:name":
value="name"
- elif name=="ECHONAVIGATION:linkClickable":
+ elif name=="echonavigation:linkClickable":
value="linkClickable"
def end_element(name):
@@ -2161,17 +2165,17 @@ class ECHO_root(Folder,Persistent,Implic
ret=getRDFDescription(self,self.absolute_url(),urn=urn)
- li="""\n"""
+ li="""\n"""
for content in contents:
ret+=content[1].getRDF()+"\n"
- ret+="""\n"""%urn
+ ret+="""\n"""%urn
for content in contents:
nurn=content[1].absolute_url()
ret+=li%nurn
- return ret+""
+ return ret+""
def showContent(self,path):