--- ECHO_content/ECHO_collection.py 2004/06/08 17:17:07 1.111
+++ ECHO_content/ECHO_collection.py 2004/06/15 11:58:02 1.113
@@ -503,7 +503,7 @@ class ECHO_resource(Folder,Persistent):
try:
label=getattr(self.copyrightTypes,copyright[2]).label
- ret.append(("""%s"""%(link,label),copyright[0],copyright[0],copyright[1],copyright[2]))
+ ret.append(("""%s"""%(link,copyright[1],label),copyright[0],copyright[0],copyright[1],copyright[2]))
except:
"""nothing"""
@@ -1392,6 +1392,7 @@ class ECHO_collection(Folder, Persistent
for entry in entries:
if entry[1].meta_type == 'ECHO_resource':
entry[1].ECHO_getResourceMD(template="no")
+ entry[1].generate_title()
else:
self.ECHO_rerenderLinksMD(entry[1])
@@ -2137,7 +2138,12 @@ class ECHO_root(Folder,Persistent,Implic
if self.checkRef(ref):
link.setAttribute("href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref)
- return dom.toxml('utf-8')
+ newxml=dom.toxml('utf-8')
+ match=re.sub(r'<\?xml version=\"1.0\" encoding=\"utf-8\"\?>\n','',newxml)
+ match=re.sub(r'','',match)
+
+ return match
+
return ""
def xml2html(self,str):