various import fix

diff --git a/telemeta/models/query.py b/telemeta/models/query.py
index f44c1b12da4e97ecb31fdc16397a79cd32d6ca6b..d91a21ca5522aabfff26a55ca47280832acca299 100644 (file)
--- a/telemeta/models/query.py
+++ b/telemeta/models/query.py
@@ -201,13 +201,13 @@ class MediaItemQuerySet(CoreQuerySet):
         return self.filter(Q(file__contains='/') | Q(url__contains='/'))
 
     def sound_public(self):
-        return self.filter(Q(file__contains='/') | Q(url__contains='/'), 
+        return self.filter(Q(file__contains='/') | Q(url__contains='/'),
                 public_access='full', collection__public_access='full')
 
     def by_instrument(self, name):
         "Find items by instrument"
         from telemeta.models.instrument import Instrument, InstrumentAlias
-        from telemeta.models.media import MediaItemPerformance
+        from telemeta.models.item import MediaItemPerformance
         instruments = Instrument.objects.filter(name__icontains=name)
         aliases = InstrumentAlias.objects.filter(name__icontains=name)
         perf = []
@@ -272,7 +272,7 @@ class MediaCollectionQuerySet(CoreQuerySet):
 
     def quick_search(self, pattern):
         "Perform a quick search on code, title and collector name"
-        from telemeta.models.media import MediaCollection
+        from telemeta.models.collection import MediaCollection
         pattern = pattern.strip()
         mod = MediaCollection()
         fields = mod.to_dict()
@@ -356,7 +356,7 @@ class MediaCollectionQuerySet(CoreQuerySet):
 
     def by_instrument(self, name):
         "Find collections by instrument"
-        from telemeta.models.media import MediaItemPerformance
+        from telemeta.models.item import MediaItemPerformance
         from telemeta.models.instrument import Instrument, InstrumentAlias
         instruments = Instrument.objects.filter(name__icontains=name)
         aliases = InstrumentAlias.objects.filter(name__icontains=name)
@@ -460,7 +460,7 @@ class MediaCorpusQuerySet(CoreQuerySet):
 
     def quick_search(self, pattern):
         "Perform a quick search on text and char fields"
-        from telemeta.models.media import MediaCorpus
+        from telemeta.models.corpus import MediaCorpus
         mod = MediaCorpus()
         pattern = pattern.strip()
         q = Q(code__contains=pattern)
@@ -492,7 +492,7 @@ class MediaFondsQuerySet(CoreQuerySet):
 
     def quick_search(self, pattern):
         "Perform a quick search on text and char fields"
-        from telemeta.models.media import MediaFonds
+        from telemeta.models.fonds import MediaFonds
         mod = MediaFonds()
         pattern = pattern.strip()
         q = Q(code__contains=pattern)

diff --git a/telemeta/views/home.py b/telemeta/views/home.py
index 892604d4bebf2d3a2aaf578a921c90bdaaf3d917..9d3e4e99cc93c855a1c7925271a45a5ffa92d34a 100644 (file)
--- a/telemeta/views/home.py
+++ b/telemeta/views/home.py
@@ -416,4 +416,5 @@ class SearchView(ListView):
         context['fonds_num'] = self.fonds.count()
         context['type'] = self.type
         context['count'] = self.objects.count()
+        print self.objects.count()
         return context