From 6c2358ed09cbea1a77f645e9a4a7d7967d6907c9 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Sat, 3 Jul 2010 13:17:19 +0200 Subject: [PATCH] default operators, type fix --- pandora/backend/managers.py | 4 +++- pandora/backend/views.py | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pandora/backend/managers.py b/pandora/backend/managers.py index 11446911..737e3d43 100644 --- a/pandora/backend/managers.py +++ b/pandora/backend/managers.py @@ -13,7 +13,7 @@ import models def keyType(key): - if key in ('released'): + if key in ('released', ): return "date" if key in ('year', 'cast.length'): return "int" @@ -66,8 +66,10 @@ class MovieManager(Manager): conditions = [] for condition in data['query']['conditions']: k = condition.get('key', 'all') + if not k: k = 'all' v = condition['value'] op = condition.get('operator', None) + if not op: op = '~' if op.startswith('!'): op = op[1:] exclude = True diff --git a/pandora/backend/views.py b/pandora/backend/views.py index 9f62a0d1..30163d23 100644 --- a/pandora/backend/views.py +++ b/pandora/backend/views.py @@ -95,7 +95,6 @@ def _parse_query(data, user): for key in ('sort', 'keys', 'group', 'list', 'range', 'ids'): if key in data: query[key] = data[key] - print query query['qs'] = models.Movie.objects.find(data, user) #group by only allows sorting by name or number of itmes return query