0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

only return matching annotations in findClips if query contains annotation conditions

Browse source
This commit is contained in:
j 2012-01-05 18:01:56 +05:30
commit 09389f84dc
5 changed files with 52 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pandora/item/views.py
View file

@ -92,6 +92,8 @@ def parse_query(data, user):
if 'clips' in data:
query['clip_qs'] = Clip.objects.find({'query': data['clips']['query']},
user).order_by('start')
query['clip_filter'] = Clip.objects.find({'query': data['clips']['query']},
user)
query['clip_items'] = data['clips'].get('items', 5)
query['clip_keys'] = data['clips'].get('keys')
if not query['clip_keys']:
@ -231,7 +233,7 @@ Positions
i += step
else:
clips = qs
return [c.json(query['clip_keys']) for c in clips]
return [c.json(query['clip_keys'], query['clip_filter']) for c in clips]
def only_p_sums(m):
r = {}