--- ECHO_content/ECHO_movie.py 2005/10/28 17:49:45 1.9 +++ ECHO_content/ECHO_movie.py 2009/04/21 08:12:58 1.14 @@ -32,7 +32,7 @@ from Ft.Xml import EMPTY_NAMESPACE import Ft.Xml.XPath import cStringIO -import zLOG +import logging try: from psycopg import libpq @@ -48,7 +48,7 @@ import urllib import xml.dom.minidom import ECHO_helpers from ECHO_helpers import * -from ECHO_language import * + class ECHO_movie(Folder,Persistent,ECHO_basis): """ECHO Ressource""" security=ClassSecurityInfo() @@ -131,15 +131,15 @@ class ECHO_movie(Folder,Persistent,ECHO_ urn=self.absolute_url() ret="" - rettemp="""\n"""%urn + rettemp="""\n"""%urn - li="""\n""" + li="""\n""" rettemp+=li%self.thumbUrl rettemp+=li%self.metalink rettemp+=li%self.rawFile rettemp+=li%getattr(self,'lowresFile','') rettemp+=li%self.link - rettemp+="" + rettemp+="" rettemp+=getRDFDescription(self,self.thumbUrl,nameDef="thumb",typeName="thumb",urn=self.thumbUrl) rettemp+=getRDFDescription(self,self.metalink,nameDef="metadata",typeName="ECHO_metaData",urn=self.metalink) @@ -287,7 +287,7 @@ class ECHO_movie(Folder,Persistent,ECHO_ def copyTitleToInfoXML(self,RESPONSE=None): """copy title from the resource""" presentationXML=readFieldFromXML(self.metalink,'texttool','presentation') - resourcepath=readFieldFromXML(self.metalink,'resource','archive-path') + resourcepath=readFieldFromXML_xpath(self.metalink,'//resource/archive-path') if (not presentationXML) or (not resourcepath): if RESPONSE: RESPONSE.write("Error: %s\n"%self.getId())