Merge pull request django-haystack#742 from bigjust/simple-backend-score-fix

Simple: removed conflicting score field from raw result objects

Author: bigjust

haystack/backends/simple_backend.py

@@ -71,6 +71,7 @@ def search(self, query_string, **kwargs):
                 hits += len(qs)
 
                 for match in qs:
+                    del(match.__dict__['score'])
                     result = result_class(match._meta.app_label, match._meta.module_name, match.pk, 0, **match.__dict__)
                     # For efficiency.
                     result._model = match.__class__

tests/core/models.py

@@ -12,7 +12,8 @@ class MockModel(models.Model):
     foo = models.CharField(max_length=255, blank=True)
     pub_date = models.DateTimeField(default=datetime.datetime.now)
     tag = models.ForeignKey(MockTag)
-    
+    score = models.CharField(max_length=10, blank=True)
+
     def __unicode__(self):
         return self.author
 

tests/simple_tests/search_indexes.py

@@ -6,6 +6,7 @@ class SimpleMockSearchIndex(indexes.SearchIndex, indexes.Indexable):
     text = indexes.CharField(document=True, use_template=True)
     name = indexes.CharField(model_attr='author')
     pub_date = indexes.DateField(model_attr='pub_date')
-    
+    score = indexes.CharField(model_attr='score')
+
     def get_model(self):
         return MockModel

tests/simple_tests/tests/simple_backend.py

@@ -7,15 +7,7 @@
 from haystack.utils.loading import UnifiedIndex
 from core.models import MockModel
 from core.tests.mocks import MockSearchResult
-
-
-class SimpleMockSearchIndex(indexes.SearchIndex, indexes.Indexable):
-    text = indexes.CharField(document=True, use_template=True)
-    name = indexes.CharField(model_attr='author', faceted=True)
-    pub_date = indexes.DateField(model_attr='pub_date')
-
-    def get_model(self):
-        return MockModel
+from simple_tests.search_indexes import SimpleMockSearchIndex
 
 
 class SimpleSearchBackendTestCase(TestCase):