Mercurial Mercurial > dring93 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
correct empty content correction
authorymh <ymh.work@gmail.com>
Wed, 27 Oct 2010 20:03:36 +0200
changeset 13 6ba27763b399
parent 12 d3b6f589704d
child 14 92e9ec3663e0
correct empty content correction
web/ldt/ldt_utils/models.py file | annotate | diff | comparison | revisions
web/ldt/ldt_utils/utils.py file | annotate | diff | comparison | revisions 
--- a/web/ldt/ldt_utils/models.py	Wed Oct 27 20:02:55 2010 +0200
+++ b/web/ldt/ldt_utils/models.py	Wed Oct 27 20:03:36 2010 +0200
@@ -166,7 +166,11 @@
             if self.media_obj is not None:
                 return self.media_obj.stream_src
             else:
-                return None
+                empty_media = self.__get_empty_media()
+                if empty_media:
+                    return empty_media.stream_src
+                else:
+                    return ""
         
         return locals()
     
--- a/web/ldt/ldt_utils/utils.py	Wed Oct 27 20:02:55 2010 +0200
+++ b/web/ldt/ldt_utils/utils.py	Wed Oct 27 20:03:36 2010 +0200
@@ -296,30 +296,30 @@
     doc = lxml.etree.ElementTree(iri)
 
     head = lxml.etree.SubElement(iri, 'head')
-    meta1 = lxml.etree.SubElement(head, 'meta')
-    meta1.set(u'name', u'id')
-    meta1.set(u'content', unicode(content.iri_id))
-    meta2 = lxml.etree.SubElement(head, 'meta')
-    meta2.set(u'name',u'title')
-    meta2.set(u'content', unicode(content.title))
-    meta3 = lxml.etree.SubElement(head, 'meta')
-    meta3.set(u'name',u'abstract')
-    meta3.set(u'content', unicode(content.description))
-    meta4 = lxml.etree.SubElement(head, 'meta')
-    meta4.set(u'name',u'author')
-    meta4.set(u'content', unicode(username))
-    meta5 = lxml.etree.SubElement(head, 'meta')
-    meta5.set(u'name',u'contributor')
-    meta5.set(u'content', unicode(username))
-    meta6 = lxml.etree.SubElement(head, 'meta')
-    meta6.set(u'name',u'date')
-    meta6.set(u'content', unicode(datetime.date.today().isoformat()))
-    meta7 = lxml.etree.SubElement(head, 'meta')
-    meta7.set(u'name',u'copyright')
-    meta7.set(u'content', u'IRI')
-    meta8 = lxml.etree.SubElement(head, 'meta')
-    meta8.set(u'name', u'type')
-    meta8.set(u'content', u'video')
+    meta_id = lxml.etree.SubElement(head, 'meta')
+    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'content', unicode(content.title))
+    meta_abstract = lxml.etree.SubElement(head, 'meta')
+    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'content', unicode(username))
+    meta_contributor = lxml.etree.SubElement(head, 'meta')
+    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'content', unicode(datetime.date.today().isoformat()))
+    meta_copyright = lxml.etree.SubElement(head, 'meta')
+    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')
+    meta_type.set(u'content', u'video')
 
     body = lxml.etree.SubElement(iri, 'body')
     ensembles = lxml.etree.SubElement(body, 'ensembles')
@@ -327,17 +327,17 @@
 
     medias = lxml.etree.SubElement(body, 'medias')
 
-    media1 = lxml.etree.SubElement(medias, 'media')
-    media1.set(u'id',u'video')
-    video = lxml.etree.SubElement(media1, 'video')
+    media_video = lxml.etree.SubElement(medias, 'media')
+    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')
 
-    media2 = lxml.etree.SubElement(medias, 'media')
-    media2.set(u'id',u'tool')
-    tool = lxml.etree.SubElement(media2, 'tool')
+    media_tool = lxml.etree.SubElement(medias, 'media')
+    media_tool.set(u'id',u'tool')
+    tool = lxml.etree.SubElement(media_tool, 'tool')
 
     display = lxml.etree.SubElement(body, 'display')
dring93