From a5158f155568bd06d79fbecf6e453619d6e39831 Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Mon, 30 May 2011 00:07:30 +0200
Subject: [PATCH] conditions

---
 pandora/item/managers.py  | 67 ++++++++++++++++++---------------------
 pandora/place/managers.py | 10 ++++--
 2 files changed, 37 insertions(+), 40 deletions(-)

diff --git a/pandora/item/managers.py b/pandora/item/managers.py
index 267d702..14e0b1a 100644
--- a/pandora/item/managers.py
+++ b/pandora/item/managers.py
@@ -35,6 +35,14 @@ def parseCondition(condition):
     else:
         exclude = False
 
+    if op == '-':
+        q = parseCondition({'key': k, 'value': v[0], 'operator': '>='}) \
+            & parseCondition({'key': k, 'value': v[1], 'operator': '<'})
+        if exclude:
+            return ~q
+        else:
+            return q
+
     key_type = models.site_config()['keys'].get(k, {'type':'string'}).get('type')
     if isinstance(key_type, list):
         key_type = key_type[0]
@@ -53,7 +61,7 @@ def parseCondition(condition):
         value_key = 'find__value'
         if k in models.Item.facet_keys:
             in_find = False
-            if op == '=':
+            if op == '=' or op == '^$':
                 v = models.Item.objects.filter(facets__key=k, facets__value=v)
             elif op == '^':
                 v = models.Item.objects.filter(facets__key=k, facets__value__istartswith=v)
@@ -62,7 +70,7 @@ def parseCondition(condition):
             else:
                 v = models.Item.objects.filter(facets__key=k, facets__value__icontains=v)
             k = 'id__in'
-        elif op == '=':
+        elif op == '=' or op == '^$':
             value_key = 'find__value__iexact'
         elif op == '^':
             v = v[1:]
@@ -108,44 +116,29 @@ def parseCondition(condition):
             while len(d) < 3:
                 d.append(1)
             return datetime(*[int(i) for i in d])
-        if op == '-':
-            v1 = v[1]
-            v2 = v[2]
-            if key_type == "date":
-                v1 = parseDate(v1.split('.'))
-                v2 = parseDate(v2.split('.'))
 
-            if exclude: #!1960-1970
-                k1 = 'value__lt'
-                k2 = 'value__gte'
-                return Q(**{'find__key': k, k1: v1})|Q(**{'find__key': k, k2: v2})
-            else: #1960-1970
-                k1 = 'value__gte'
-                k2 = 'value__lt'
-                return Q(**{'find__key': k, k1: v1})&Q(**{'find__key': k, k2: v2})
-        else:
-            if key_type == "date":
-                v = parseDate(v.split('.'))
-            if op == '=':
-                vk = 'value__exact'
-            elif op == '>':
-                vk = 'value__gt'
-            elif op == '>=':
-                vk = 'value__gte'
-            elif op == '<':
-                vk = 'value__lt'
-            elif op == '<=':
-                vk = 'value__lte'
-            elif op == '':
-                vk = 'value__exact'
+        if key_type == "date":
+            v = parseDate(v.split('.'))
+        if op == '=' or op == '^$':
+            vk = 'value__exact'
+        elif op == '>':
+            vk = 'value__gt'
+        elif op == '>=':
+            vk = 'value__gte'
+        elif op == '<':
+            vk = 'value__lt'
+        elif op == '<=':
+            vk = 'value__lte'
+        elif op == '':
+            vk = 'value__exact'
 
-            vk = 'find__%s' % vk
-            vk = str(vk)
+        vk = 'find__%s' % vk
+        vk = str(vk)
 
-            if exclude: #!1960
-                return ~Q(**{'find__key': k, vk: v})
-            else: #1960
-                return Q(**{'find__key': k, vk: v})
+        if exclude: #!1960
+            return ~Q(**{'find__key': k, vk: v})
+        else: #1960
+            return Q(**{'find__key': k, vk: v})
 
 
 def parseConditions(conditions, operator):
diff --git a/pandora/place/managers.py b/pandora/place/managers.py
index 12bde75..bab9add 100644
--- a/pandora/place/managers.py
+++ b/pandora/place/managers.py
@@ -32,8 +32,12 @@ def parseCondition(condition, user):
     else:
         exclude = False
     if op == '-':
-        return parseCondition({'key': k, 'value': v[0], 'operator': '>='}, user) \
-                & parseCondition({'key': k, 'value': v[1], 'operator': '<'}, user)
+        q = parseCondition({'key': k, 'value': v[0], 'operator': '>='}) \
+            & parseCondition({'key': k, 'value': v[1], 'operator': '<'})
+        if exclude:
+            return ~q
+        else:
+            return q
     if k == 'id':
         v = v.split('/')
         if len(v) == 2:
@@ -55,7 +59,7 @@ def parseCondition(condition, user):
         else: #default is exact match
             key = k
     else:
-        if op == '=':
+        if op == '=' or op == '^$':
             key = '%s__iexact'%k
         elif op == '^':
             v = v[1:]