--- a/src/ldt/ldt/ldt_utils/utils.py Fri Jan 28 21:33:43 2011 +0100
+++ b/src/ldt/ldt/ldt_utils/utils.py Sat Jan 29 06:46:14 2011 +0100
@@ -18,7 +18,7 @@
}
def reduce_text_node(element_node, xpath_str):
- return reduce(lambda t, s: t+s, element_node.xpath(xpath_str, smart_strings=False), "")
+ return reduce(lambda t, s: t + s, element_node.xpath(xpath_str, smart_strings=False), "")
def boolean_convert(bool):
if bool is None:
@@ -43,7 +43,7 @@
res = []
for hit in hits.scoreDocs:
doc = indexSearcher.doc(hit.doc)
- res.append({"iri_id":doc.get("iri_id"),"ensemble_id":doc.get("ensemble_id"),"decoupage_id":doc.get("decoupage_id"), "element_id":doc.get("element_id")})
+ res.append({"iri_id":doc.get("iri_id"), "ensemble_id":doc.get("ensemble_id"), "decoupage_id":doc.get("decoupage_id"), "element_id":doc.get("element_id")})
indexSearcher.close()
return res
@@ -52,16 +52,16 @@
class LdtUtils(object):
- def generateLdt(self, contentList, file, title = u"", author=u"IRI Web", web_url=u"", media_url="", startSegment = None, contributions=None):
+ def generateLdt(self, contentList, file, title=u"", author=u"IRI Web", web_url=u"", media_url="", startSegment=None, contributions=None):
iri = lxml.etree.Element(u'iri')
doc = lxml.etree.ElementTree(iri)
project = lxml.etree.SubElement(iri, u'project')
- project.set(u"id",unicode(str(uuid.uuid1())))
- project.set(u"title",unicode(title))
- project.set(u"user",author)
- project.set(u"abstract",u"")
+ project.set(u"id", unicode(str(uuid.uuid1())))
+ project.set(u"title", unicode(title))
+ project.set(u"user", author)
+ project.set(u"abstract", u"")
medias = lxml.etree.SubElement(iri, u"medias")
for content in contentList:
@@ -69,11 +69,11 @@
if content.videopath :
videopath = unicode(content.videopath)
media = lxml.etree.SubElement(medias, "media")
- media.set(u"id",content.iri_id)
- media.set(u"src",content.iri_url(web_url))
- media.set(u"video",videopath)
- media.set(u"pict",u"")
- media.set(u"extra",u"")
+ media.set(u"id", content.iri_id)
+ media.set(u"src", content.iri_url(web_url))
+ media.set(u"video", videopath)
+ media.set(u"pict", u"")
+ media.set(u"extra", u"")
if contributions is None:
contributions = []
@@ -88,7 +88,7 @@
contentnode = annotations_nodes[contentid]
else:
contentnode = {"id":contentid, "ensembles":[]}
- annotations_nodes[contentid]=contentnode
+ annotations_nodes[contentid] = contentnode
for ens in content.childNodes:
if ens.tag.endswith("ensemble"):
contentnode["ensembles"].append(ens.tag)
@@ -100,13 +100,13 @@
if content.content_base.iri_id in annotations_nodes:
contentnode = annotations_nodes[content.content_base.iri_id]
if contentnode is not None:
- if len(contentnode["ensembles"])>0:
+ if len(contentnode["ensembles"]) > 0:
content = lxml.etree.SubElement(annotation, "content")
- content.set("id",contentnode["id"])
+ content.set("id", contentnode["id"])
content.text = u""
else:
content = lxml.etree.SubElement(annotation, "content")
- content.set("id",contentnode["id"])
+ content.set("id", contentnode["id"])
else:
annotations = lxml.etree.SubElement(iri, "annotations")
@@ -115,13 +115,13 @@
displays = lxml.etree.SubElement(iri, "displays")
if len(contentList) > 0:
display = lxml.etree.SubElement(displays, "display")
- display.set(u"id",u"0")
- display.set(u"title",u"generated")
- display.set(u"idsel",contentList[0].iri_id)
- display.set(u"tc",u"0")
+ display.set(u"id", u"0")
+ display.set(u"title", u"generated")
+ display.set(u"idsel", contentList[0].iri_id)
+ display.set(u"tc", u"0")
for content in contentList:
- contentd = lxml.etree.SubElement(display,"content")
- contentd.set(u"id",content.iri_id)
+ contentd = lxml.etree.SubElement(display, "content")
+ contentd.set(u"id", content.iri_id)
filepath = urllib.urlopen(content.iri_url())
udoc = lxml.etree.parse(filepath)
@@ -131,16 +131,16 @@
ensemble_id = decoupagenode.getparent().get(u"id")
decoupage_id = decoupagenode.get(u"id")
ensemble_id = decoupagenode.getparent().get(u"id")
- decoupage = lxml.etree.SubElement(contentd,"decoupage")
- decoupage.set(u"id",decoupage_id)
- decoupage.set(u"idens",ensemble_id)
+ decoupage = lxml.etree.SubElement(contentd, "decoupage")
+ decoupage.set(u"id", decoupage_id)
+ decoupage.set(u"idens", ensemble_id)
if startSegment is not None:
- activeSegment = lxml.etree.SubElement(display,"activeSegment")
- idas = lxml.etree.SubElement(activeSegment,"id")
- idas.set(u"idctt",startSegment["idcontent"])
- idas.set(u"idens" ,startSegment["idgroup"])
- idas.set(u"idcut",startSegment["idcutting"])
- idas.set(u"idseg",startSegment["idsegment"])
+ activeSegment = lxml.etree.SubElement(display, "activeSegment")
+ idas = lxml.etree.SubElement(activeSegment, "id")
+ idas.set(u"idctt", startSegment["idcontent"])
+ idas.set(u"idens" , startSegment["idgroup"])
+ idas.set(u"idcut", startSegment["idcutting"])
+ idas.set(u"idseg", startSegment["idsegment"])
edits = lxml.etree.SubElement(iri, "edits")
@@ -152,14 +152,14 @@
iri = lxml.etree.Element('iri')
impl = lxml.etree.ElementTree(iri)
- elementFiles = lxml.etree.SubElement(iri,'files')
+ elementFiles = lxml.etree.SubElement(iri, 'files')
elementInit = lxml.etree.SubElement(elementFiles, 'init')
elementfile = lxml.etree.SubElement(elementInit, 'file')
- elementfile.set('src',settings.WEB_URL + django.core.urlresolvers.reverse(method, args=url))
+ elementfile.set('src', settings.WEB_URL + django.core.urlresolvers.reverse(method, args=url))
elementfile.set('display', '1')
if(search):
- elementfile.set("segsel",settings.WEB_URL + django.core.urlresolvers.reverse(search, args=url))
+ elementfile.set("segsel", settings.WEB_URL + django.core.urlresolvers.reverse(search, args=url))
# /*chemin video : tant que le serveur de media n'est pas up, */
@@ -210,7 +210,7 @@
elementMedia.set('id', content.iri_id)
elementMedia.set('src', content.iri_url())
- if content.videopath and content.videopath !="":
+ if content.videopath and content.videopath != "":
elementMedia.set('video', content.videopath)
else:
elementMedia.set('video', settings.STREAM_URL)
@@ -244,7 +244,7 @@
#eg: "iiiielizabethrosse/ENMI08-III_elizabethrosse.iri"
url = content.iri_url()
else:
- url =content.iriurl
+ url = content.iriurl
file = urllib.urlopen(url)
doc = lxml.etree.parse(file)
res = doc.xpath("/iri/body/ensembles/ensemble/decoupage")
@@ -252,7 +252,7 @@
#node decoupage
for decoupagenode in res:
decoupage_id = decoupagenode.get(u"id")
- parent= decoupagenode.getparent()
+ parent = decoupagenode.getparent()
ensemble_id = parent.get(u"id")
elementDecoupage = lxml.etree.SubElement(elementContent, 'decoupage')
elementDecoupage.set('idens', ensemble_id)
@@ -271,11 +271,11 @@
def copy_ldt(project, new_project, user):
new_project.ldt_id = str(uuid.uuid1())
- new_project.created_by=user.username
- new_project.changed_by=user.username
+ new_project.created_by = user.username
+ new_project.changed_by = user.username
new_project.state = 1
- contentList=project.contents.all()
+ contentList = project.contents.all()
"""create xml"""
@@ -303,22 +303,22 @@
meta_id.set(u'name', u'id')
meta_id.set(u'content', unicode(content.iri_id))
meta_title = lxml.etree.SubElement(head, 'meta')
- meta_title.set(u'name',u'title')
+ meta_title.set(u'name', u'title')
meta_title.set(u'content', unicode(content.title))
meta_abstract = lxml.etree.SubElement(head, 'meta')
- meta_abstract.set(u'name',u'abstract')
+ meta_abstract.set(u'name', u'abstract')
meta_abstract.set(u'content', unicode(content.description))
meta_author = lxml.etree.SubElement(head, 'meta')
- meta_author.set(u'name',u'author')
+ meta_author.set(u'name', u'author')
meta_author.set(u'content', unicode(username))
meta_contributor = lxml.etree.SubElement(head, 'meta')
- meta_contributor.set(u'name',u'contributor')
+ meta_contributor.set(u'name', u'contributor')
meta_contributor.set(u'content', unicode(username))
meta_date = lxml.etree.SubElement(head, 'meta')
- meta_date.set(u'name',u'date')
+ meta_date.set(u'name', u'date')
meta_date.set(u'content', unicode(datetime.date.today().isoformat()))
meta_copyright = lxml.etree.SubElement(head, 'meta')
- meta_copyright.set(u'name',u'copyright')
+ meta_copyright.set(u'name', u'copyright')
meta_copyright.set(u'content', u'IRI')
meta_type = lxml.etree.SubElement(head, 'meta')
meta_type.set(u'name', u'type')
@@ -331,15 +331,15 @@
medias = lxml.etree.SubElement(body, 'medias')
media_video = lxml.etree.SubElement(medias, 'media')
- media_video.set(u'id',u'video')
+ media_video.set(u'id', u'video')
video = lxml.etree.SubElement(media_video, 'video')
- video.set(u'src',unicode(content.stream_src))
- video.set(u'id',unicode(content.iri_id))
- video.set(u'dur',unicode(content.duration))
- video.set(u'begin',u'0')
+ video.set(u'src', unicode(content.stream_src))
+ video.set(u'id', unicode(content.iri_id))
+ video.set(u'dur', unicode(content.duration))
+ video.set(u'begin', u'0')
media_tool = lxml.etree.SubElement(medias, 'media')
- media_tool.set(u'id',u'tool')
+ media_tool.set(u'id', u'tool')
tool = lxml.etree.SubElement(media_tool, 'tool')
display = lxml.etree.SubElement(body, 'display')