Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack

Conflicts:
	src/django-haystack

diff --cc telemeta/search_indexes.py
index 65111b95d3d6dc0f839a0b5c2d365464d3390ab9,65111b95d3d6dc0f839a0b5c2d365464d3390ab9..a8d9472bc8b0b1f66e00526140e5e09b89187b36
--- 1/telemeta/search_indexes.py
--- 2/telemeta/search_indexes.py
+++ b/telemeta/search_indexes.py
@@@ -16,7 -16,7 +16,8 @@@ class MediaItemIndex(indexes.SearchInde
      #advance search
      title = indexes.NgramField(model_attr='title')
      code = indexes.NgramField(model_attr='code', default='')
--    location = indexes.NgramField(default='', null='None')
++    #location = indexes.NgramField(default='', null='None')
++    location = indexes.MultiValueField()
      ethnic_group = indexes.CharField(model_attr='ethnic_group', default='')
      instruments = indexes.NgramField(default='')
      collectors = indexes.NgramField(model_attr='collector', default='')
@@@ -45,7 -45,7 +46,10 @@@
                  location.append(rela.ancestor_location.name)
              for alias in location_alias:
                  location.append(alias.alias)
--        return u"".join(' ' + local for local in location).encode("utf-8")
++            #print u"".join(' ' + local for local in location).encode("utf-8")
++            #print u"%s".encode("utf-8") % location
++            print [local for local in location]
++        return [local for local in location]
  
      def prepare_instruments(self, obj):
          item = MediaItemPerformance.objects.all().filter(media_item__exact=obj)