# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1300181681 -3600
# Node ID 3d18d15135f11b8ff86efc7e28a001df725e3af4
# Parent  d6639b856dc13c9b9fc9eb10c6c99feb975e9bb0
put video url in segment object

diff -r d6639b856dc1 -r 3d18d15135f1 web/blinkster/__init__.py
--- a/web/blinkster/__init__.py	Sun Mar 06 21:39:00 2011 +0100
+++ b/web/blinkster/__init__.py	Tue Mar 15 10:34:41 2011 +0100
@@ -1,3 +1,3 @@
-VERSION = (0, 18)
+VERSION = (0, 19)
 
 VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION)))
diff -r d6639b856dc1 -r 3d18d15135f1 web/blinkster/views.py
--- a/web/blinkster/views.py	Sun Mar 06 21:39:00 2011 +0100
+++ b/web/blinkster/views.py	Tue Mar 15 10:34:41 2011 +0100
@@ -131,13 +131,15 @@
 
     for index_res in index_results:
         res = dict(index_res)
-        segs = Segment.objects.filter(iri_id=index_res["iri_id"], element_id=index_res["element_id"], cutting_id=index_res["decoupage_id"], ensemble_id=index_res["ensemble_id"]).values() 
-        for seg in segs:
-            del seg["project_obj_id"]
-            del seg["content_id"]
-            del seg["id"]
+        segs = Segment.objects.filter(iri_id=index_res["iri_id"], element_id=index_res["element_id"], cutting_id=index_res["decoupage_id"], ensemble_id=index_res["ensemble_id"]).values()
+        if segs and len(segs) > 0:
+            seg = segs[0]             
             res = dict(res, **seg)
+            del res["project_obj_id"]
+            del res["content_id"]
+            del res["id"]            
         res["segment_detail_url"] = unicode(settings.WEB_URL.rstrip('/') + reverse('blinkster.views.segment_detail', args=[res["iri_id"], res["ensemble_id"], res["cutting_id"], res["element_id"]]) + content_type_req)
+        res["segment_video_url"] = unicode(settings.WEB_URL.rstrip('/') + reverse('blinkster.views.segment_ts_playlist', args=[res["iri_id"], res["ensemble_id"], res["cutting_id"], res["element_id"]]) + content_type_req)
         results.append(res)
     
     return serialize_queryset_to_json(response, results, {u"query" : query, u"field": field, u"operator":operator, u"final_query": query_str})