decode_id

pandora/annotation/managers.py

@@ -2,7 +2,9 @@
 # vi:si:et:sw=4:sts=4:ts=4
 from django.db.models import Q, Manager
 from ox.django.query import QuerySet
-import ox
+
+from item.utils import decode_id
+
 
 def parseCondition(condition, user):
     '''
@@ -44,7 +46,7 @@ def parseCondition(condition, user):
         else:
             return q
     if k in ('places__id', 'events__id'):
-        v = ox.from26(v)
+        v = decode_id(v)
     if isinstance(v, bool): #featured and public flag
         key = k
     elif k in ('lat', 'lng', 'area', 'south', 'west', 'north', 'east', 'matches',

pandora/clip/managers.py

@@ -4,7 +4,9 @@ from django.db.models import Q, Manager
 from django.conf import settings
 
 from ox.django.query import QuerySet
-import ox
+
+from item.utils import decode_id
+
 
 def parseCondition(condition, user):
     '''
@@ -58,7 +60,7 @@ def parseCondition(condition, user):
         else:
             return q
     if k.endswith('__id'):
-        v = ox.from26(v)
+        v = decode_id(v)
     if isinstance(v, bool): #featured and public flag
         key = k
     elif k in ('lat', 'lng', 'area', 'south', 'west', 'north', 'east', 'matches',

pandora/event/managers.py

@@ -4,6 +4,8 @@
 from django.db.models import Q, Manager
 from ox.django.query import QuerySet
 
+from item.utils import decode_id
+
 
 def parseCondition(condition, user):
     k = condition.get('key', 'name')
@@ -19,6 +21,8 @@ def parseCondition(condition, user):
         exclude = True
     else:
         exclude = False
+    if k == 'id':
+        v = decode_id(v)
 
     key = '%s%s' % (k, {
         '==': '__iexact',

pandora/item/utils.py

@@ -4,7 +4,14 @@
 from decimal import Decimal
 import re
 import unicodedata
+import ox
 
+def decode_id(id):
+    try:
+        id = ox.from26(id)
+    except:
+        id = 0
+    return id
 
 def parse_decimal(string):
     string = string.replace(':', '/')

pandora/log/managers.py

@@ -2,7 +2,9 @@
 # vi:si:et:sw=4:sts=4:ts=4
 from django.db.models import Q, Manager
 from ox.django.query import QuerySet
-import ox
+
+from item.utils import decode_id
+
 
 def parseCondition(condition, user):
     '''
@@ -40,7 +42,7 @@ def parseCondition(condition, user):
         else:
             return q
     if k == 'id':
-        v = ox.from26(v)
+        v = decode_id(v)
     if isinstance(v, bool): #featured and public flag
         key = k
     elif k in ('id', ):

pandora/news/managers.py

@@ -2,7 +2,9 @@
 # vi:si:et:sw=4:sts=4:ts=4
 from django.db.models import Q, Manager
 from ox.django.query import QuerySet
-import ox
+
+from item.utils import decode_id
+
 
 def parseCondition(condition, user):
     k = condition.get('key', 'name')
@@ -28,7 +30,7 @@ def parseCondition(condition, user):
         else:
             return q
     if k == 'id':
-        v = ox.from26(v)
+        v = decode_id(v)
     if isinstance(v, bool): #featured and public flag
         key = k
     elif k in ('id',):

pandora/person/managers.py

@@ -2,7 +2,9 @@
 # vi:si:et:sw=4:sts=4:ts=4
 from django.db.models import Q, Manager
 from ox.django.query import QuerySet
-import ox
+
+from item.utils import decode_id
+
 
 def parseCondition(condition, user):
     '''
@@ -40,7 +42,7 @@ def parseCondition(condition, user):
         else:
             return q
     if k == 'id':
-        v = ox.from26(v)
+        v = decode_id(v)
     if isinstance(v, bool): #featured and public flag
         key = k
     elif k in ('lat', 'lng', 'area', 'south', 'west', 'north', 'east', 'matches', 'id'):

pandora/place/managers.py

@@ -2,7 +2,9 @@
 # vi:si:et:sw=4:sts=4:ts=4
 from django.db.models import Q, Manager
 from ox.django.query import QuerySet
-import ox
+
+from item.utils import decode_id
+
 
 def parseCondition(condition, user):
     '''
@@ -40,7 +42,7 @@ def parseCondition(condition, user):
         else:
             return q
     if k == 'id':
-        v = ox.from26(v)
+        v = decode_id(v)
     if isinstance(v, bool): #featured and public flag
         key = k
     elif k in ('lat', 'lng', 'area', 'south', 'west', 'north', 'east', 'matches', 'id'):

pandora/title/managers.py

@@ -3,7 +3,9 @@
 import unicodedata
 from django.db.models import Q, Manager
 from ox.django.query import QuerySet
-import ox
+
+from item.utils import decode_id
+
 
 def parseCondition(condition, user):
     '''
@@ -41,7 +43,7 @@ def parseCondition(condition, user):
         else:
             return q
     if k == 'id':
-        v = ox.from26(v)
+        v = decode_id(v)
     elif isinstance(v, unicode):
         v = unicodedata.normalize('NFKD', v)
     if isinstance(v, bool): #featured and public flag