# HG changeset patch
# User hamidouk
# Date 1329476364 -3600
# Node ID 8be7c3e9aae3a6e0e74502f3fa2e81c7bab529ed
# Parent  1ed2c41e3aaead421e264dad09b4cc359771d336# Parent  7525046c6e7ae8856ffd8c4aa63e9ef1f007e094
Merge with upstream

diff -r 1ed2c41e3aae -r 8be7c3e9aae3 src/ldt/ldt/api/ldt/handlers.py
--- a/src/ldt/ldt/api/ldt/handlers.py	Fri Feb 17 11:59:02 2012 +0100
+++ b/src/ldt/ldt/api/ldt/handlers.py	Fri Feb 17 11:59:24 2012 +0100
@@ -246,7 +246,11 @@
         begin = int(begin)
         end = int(end)
         
-        content = Content.objects.get(iri_id=iri_id)
+        content = Content.objects.filter(iri_id=iri_id)
+        if not content:
+            return rc.NOT_FOUND
+        content = content[0]
+        
         segments = Segment.objects.filter(content=content).filter(
                     Q(start_ts__gt=begin, start_ts__lt=end) |                            # segment starts between begin and end
                     Q(start_ts__gt=begin-F('duration'), start_ts__lt=end-F('duration')) |# segment ends between begin and end