# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1304638764 -7200
# Node ID da3d92b1f2ba2573a0d02e07d1e79bc03f04eea6
# Parent  285715b62575002e1003be2072e5351be513004e
correct project_id propagation on indexation

diff -r 285715b62575 -r da3d92b1f2ba virtualenv/res/src/ldt-0.10.tar.gz
Binary file virtualenv/res/src/ldt-0.10.tar.gz has changed
diff -r 285715b62575 -r da3d92b1f2ba virtualenv/res/src/ldt-0.9.tar.gz
Binary file virtualenv/res/src/ldt-0.9.tar.gz has changed
diff -r 285715b62575 -r da3d92b1f2ba web/blinkster/__init__.py
--- a/web/blinkster/__init__.py	Fri May 06 01:04:20 2011 +0200
+++ b/web/blinkster/__init__.py	Fri May 06 01:39:24 2011 +0200
@@ -1,3 +1,3 @@
-VERSION = (0, 25)
+VERSION = (0, 26)
 
 VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION)))
diff -r 285715b62575 -r da3d92b1f2ba web/blinkster/views.py
--- a/web/blinkster/views.py	Fri May 06 01:04:20 2011 +0200
+++ b/web/blinkster/views.py	Fri May 06 01:39:24 2011 +0200
@@ -44,7 +44,7 @@
 
     response = HttpResponse(content_type=str(content_type))
     results = []
-    for roi_dict in [roi.serialize_to_dict() for roi in Roi.objects.all()]:
+    for roi_dict in [roi.serialize_to_dict() for roi in Roi.objects.all()]: #@UndefinedVariable
         roi_dict["poi_list_url"] = unicode(settings.WEB_URL.rstrip('/') + reverse('blinkster.views.poi_list', args=[roi_dict["sid"]]) + content_type_req)
         results.append(roi_dict)
 
@@ -61,7 +61,7 @@
     response = HttpResponse(content_type=str(content_type))
     roi = get_object_or_404(Roi, sid=roi_sid)
     results = []
-    for poi_dict in [poi.serialize_to_dict() for poi in Poi.objects.filter(roi=roi)]:
+    for poi_dict in [poi.serialize_to_dict() for poi in Poi.objects.filter(roi=roi)]: #@UndefinedVariable
         poi_dict["segment_search_url"] = unicode(settings.WEB_URL.rstrip('/') + reverse('blinkster.views.segment_search_get', args=[u"tags", u"or", urllib2.quote(poi_dict["tags"].encode("utf-8"))]) + content_type_req)
         results.append(poi_dict)
     return serialize_queryset_to_json(response, results)
@@ -74,7 +74,7 @@
     tags = segment.tags
     tag_list = tags.split(",")
     segment_tags_list = ", ".join([tag.strip() for tag in tag_list])
-    content = Content.objects.get(iri_id=iri_id)
+    content = Content.objects.get(iri_id=iri_id) #@UndefinedVariable
     content_dur = content.get_duration()
     
     if segment.duration > 0:
@@ -131,7 +131,10 @@
 
     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()
+        segs_filter = 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"]) #@UndefinedVariable
+        if index_res["project_id"]:
+            segs_filter.filter(project_obj__ldt_id=index_res["project_id"])
+        segs = segs_filter.values() 
         if segs and len(segs) > 0:
             seg = segs[0]             
             res = dict(res, **seg)
@@ -151,7 +154,7 @@
     segment = get_list_or_404(Segment, project_id=project_id, iri_id=iri_id, ensemble_id=ensemble_id, cutting_id=cutting_id, element_id=element_id)[0]
     start_ts = int(math.floor(segment.start_ts / 1000.0))
     
-    content = Content.objects.get(iri_id=iri_id)
+    content = Content.objects.get(iri_id=iri_id) #@UndefinedVariable
     content_duration = content.get_duration()
     
     if segment.duration == 0: