# HG changeset patch # User verrierj # Date 1329475769 -3600 # Node ID 7525046c6e7ae8856ffd8c4aa63e9ef1f007e094 # Parent 10c26c22b76ae47f958e3b408f6de897eb677f93 Segment API returns 404 error instead of 500 when content is not found diff -r 10c26c22b76a -r 7525046c6e7a src/ldt/ldt/api/ldt/handlers.py --- a/src/ldt/ldt/api/ldt/handlers.py Fri Feb 17 10:32:06 2012 +0100 +++ b/src/ldt/ldt/api/ldt/handlers.py Fri Feb 17 11:49:29 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