Merge with upstream
authorhamidouk
Fri, 17 Feb 2012 11:59:24 +0100
changeset 575 8be7c3e9aae3
parent 574 1ed2c41e3aae (current diff)
parent 573 7525046c6e7a (diff)
child 576 5680a9a40c04
Merge with upstream
--- 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