Changeset c9f9871 for telemeta/models/query.py

Timestamp:

02/22/12 15:04:42 (15 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, diadems, generic, instru_search, lam, nlivemulti, release/1.4.4, security, social, storage, test

Children:

3c13a83

Parents:

b3287a8

git-author:

yomguy <yomguy@…> (02/22/12 15:04:42)

git-committer:

yomguy <yomguy@…> (02/22/12 15:04:42)

Message:

try instrument filter

File:

• telemeta/models/query.py (modified) (5 diffs)

telemeta/models/query.py

@@ -201 +201 @@
         return self.filter(file__contains='/')
 
+    def by_instrument(self, instrument):
+        "Find items by instrument"
+        return self.filter(instruments__in=instrument)
+
 
 class MediaItemManager(CoreManager):
@@ -244 +248 @@
         return self.get_query_set().sound(*args, **kwargs)
     sound.__doc__ = MediaItemQuerySet.sound.__doc__
+
+    def by_instrument(self, *args, **kwargs):
+        return self.get_query_set().by_instrument(*args, **kwargs)
+    by_instrument.__doc__ = MediaItemQuerySet.by_instrument.__doc__
 
 
@@ -332 +340 @@
         return self.filter(items__file__contains='/').distinct()
 
+    def by_instrument(self, instrument):
+        "Find collections by instrument"
+        return self.filter(items__instruments__in=instrument).distinct()
+
 
 class MediaCollectionManager(CoreManager):
@@ -375 +387 @@
         return self.get_query_set().sound(*args, **kwargs)
     sound.__doc__ = MediaCollectionQuerySet.sound.__doc__
+
+    def by_instrument(self, *args, **kwargs):
+        return self.get_query_set().by_instrument(*args, **kwargs)
+    by_instrument.__doc__ = MediaCollectionQuerySet.by_instrument.__doc__
 
 
@@ -478 +494 @@
         return self.get_query_set().quick_search(*args, **kwargs)
     quick_search.__doc__ = MediaFondsQuerySet.quick_search.__doc__
+
+
+class InstrumentQuerySet(CoreQuerySet):
+    "Base class for all media instrument query sets"
+
+    def quick_search(self, pattern):
+        "Perform a quick search on text and char fields"
+        from telemeta.models.instrument import Instrument
+        mod = Instrument()
+        pattern = pattern.strip()
+        q = Q(code__contains=pattern)
+        fields = mod.to_dict()
+        keys =  fields.keys()
+        for field in keys:
+            field_str = str(mod._meta.get_field(field))
+            if 'CharField' in field_str or 'TextField' in field_str:
+                q = q | word_search_q(field, pattern)
+        return self.filter(q)
+
+
+class InstrumentManager(CoreManager):
+    "Manage instrument queries"
+
+    def get_query_set(self):
+        "Return instrument query sets"
+        return InstrumentQuerySet(self.model)
+
+    def quick_search(self, *args, **kwargs):
+        return self.get_query_set().quick_search(*args, **kwargs)
+    quick_search.__doc__ = InstrumentQuerySet.quick_search.__doc__