diff -r 67f071c743f5 -r 84e31387a741 web/ldt/ldt_utils/utils.py --- a/web/ldt/ldt_utils/utils.py Thu Jun 10 04:16:26 2010 +0200 +++ b/web/ldt/ldt_utils/utils.py Thu Jun 10 11:17:09 2010 +0200 @@ -275,13 +275,13 @@ writer.startElement(u"head") - writer.simpleElement(u'meta', attributes={'name':'id', 'content':content.iri_id}) - writer.simpleElement(u'meta', attributes={'name':'title', 'content':content.title}) - writer.simpleElement(u'meta', attributes={'name':'author', 'content':username}) - writer.simpleElement(u'meta', attributes={'name':'contributor', 'content':username}) - writer.simpleElement(u'meta', attributes={'name':'date', 'content':datetime.date.utcnow().isoformat()}) - writer.simpleElement(u'meta', attributes={'name':'copyright', 'content':'IRI'}) - writer.simpleElement(u'meta', attributes={'name':'type', 'content':'video'}) + writer.simpleElement(u'meta', attributes={u'name':u'id', 'content':unicode(content.iri_id)}) + writer.simpleElement(u'meta', attributes={u'name':u'title', 'content':unicode(content.title)}) + writer.simpleElement(u'meta', attributes={u'name':u'author', 'content':unicode(username)}) + writer.simpleElement(u'meta', attributes={u'name':u'contributor', 'content':unicode(username)}) + writer.simpleElement(u'meta', attributes={u'name':u'date', 'content':unicode(datetime.date.today().isoformat())}) + writer.simpleElement(u'meta', attributes={u'name':u'copyright', 'content':u'IRI'}) + writer.simpleElement(u'meta', attributes={u'name':u'type', 'content':u'video'}) writer.endElement(u"head") @@ -291,22 +291,22 @@ ensemble_id = unicode(uuid.uuid1()) writer.startElement(u"ensemble", attributes = { - 'label':'undefined', - 'date':datetime.date.utcnow().isoformat(), - 'title':'autogenerated', - 'abstract':'auto generated', - 'id':ensemble_id, - 'author':username + u'label':u'undefined', + u'date':unicode(datetime.date.today().isoformat()), + u'title':u'autogenerated', + u'abstract':u'auto generated', + u'id':ensemble_id, + u'author':unicode(username) }) decoupage_id = unicode(uuid.uuid1()) writer.startElement(u"decoupage", attributes = { - 'height' : '10', - 'dur':content.duration, - 'type':'regular', - 'date':datetime.date.utcnow().isoformat(), - 'id':decoupage_id, - 'author':username + u'height' : u'10', + u'dur':unicode(content.duration), + u'type':u'regular', + u'date':unicode(datetime.date.today().isoformat()), + u'id':decoupage_id, + u'author':unicode(username) }) writer.startElement(u"title") @@ -320,22 +320,22 @@ writer.endElement(u"ensemble") writer.endElement(u"ensembles") - writer.simpleElement('links') + writer.simpleElement(u'links') writer.startElement(u"medias") - writer.startElement(u"media", attributes={'id':'video'}) - writer.simpleElement(u'video', attributes={'src':content.videopath,'id':uuid.uuid1(),'dur':content.duration,'begin':0}) + writer.startElement(u"media", attributes={u'id':u'video'}) + writer.simpleElement(u'video', attributes={u'src':unicode(content.src),u'id':unicode(uuid.uuid1()),u'dur':unicode(content.duration),u'begin':u'0'}) writer.endElement(u"media") - writer.startElement(u"media", attributes={'id':'tool'}) - writer.simpleElement('tool') + writer.startElement(u"media", attributes={u'id':u'tool'}) + writer.simpleElement(u'tool') writer.endElement(u"media") writer.endElement(u"medias") - writer.startElement('display') - writer.simpleElement('decoupage', attributes={'position':'1', 'id':decoupage_id, 'idensemble':ensemble_id}) - writer.endElement('display') + writer.startElement(u'display') + writer.simpleElement(u'decoupage', attributes={u'position':u'1', u'id':decoupage_id, u'idensemble':ensemble_id}) + writer.endElement(u'display') writer.endElement(u"body")