Added the ability to "weight" individual fields to adjust their relevance.

Author: notanumber

haystack/backends/solr_backend.py

@@ -67,7 +67,7 @@ def update(self, index, iterable, commit=True):
 
         if len(docs) > 0:
             try:
-                self.conn.add(docs, commit=commit)
+                self.conn.add(docs, commit=commit, boost=index.get_field_weights())
             except (IOError, SolrError), e:
                 self.log.error("Failed to add documents to Solr: %s", e)
 

haystack/fields.py

@@ -20,7 +20,7 @@ class SearchField(object):
     def __init__(self, model_attr=None, use_template=False, template_name=None,
                  document=False, indexed=True, stored=True, faceted=False,
                  default=NOT_PROVIDED, null=False, index_fieldname=None,
-                 facet_class=None):
+                 facet_class=None, weight=1.0):
         # Track what the index thinks this field is called.
         self.instance_name = None
         self.model_attr = model_attr
@@ -33,6 +33,7 @@ def __init__(self, model_attr=None, use_template=False, template_name=None,
         self._default = default
         self.null = null
         self.index_fieldname = index_fieldname
+        self.weight = weight
         self.is_multivalued = False
 
         # We supply the facet_class for making it easy to create a faceted

haystack/indexes.py

@@ -166,6 +166,14 @@ def get_content_field(self):
             if field.document is True:
                 return field.index_fieldname
 
+    def get_field_weights(self):
+        """Returns a dict of fields with weight values"""
+        weights = {}
+        for field_name, field in self.fields.items():
+            if field.weight:
+                weights[field_name] = field.weight
+        return weights
+    
     def update(self):
         """Update the entire index"""
         self.backend.update(self, self.get_queryset())

tests/core/models.py

@@ -35,3 +35,12 @@ class AThirdMockModel(AnotherMockModel):
 
 class CharPKMockModel(models.Model):
     key = models.CharField(primary_key=True, max_length=10)
+
+
+class AFourthMockModel(models.Model):
+    author = models.CharField(max_length=255)
+    editor = models.CharField(max_length=255)
+    pub_date = models.DateTimeField(default=datetime.datetime.now)
+    
+    def __unicode__(self):
+        return self.author

tests/solr_test_schema.xml

@@ -68,7 +68,8 @@
     <field name="type"    type="string"   indexed="true"  stored="true"  multiValued="false" /> 
     <field name="name"    type="string"   indexed="true"  stored="true"  multiValued="false" /> 
     <field name="name_exact"    type="string"   indexed="true"  stored="true"  multiValued="false" /> 
-    <field name="author"    type="string"   indexed="true"  stored="true"  multiValued="false" /> 
+    <field name="author"    type="string"   indexed="true"  stored="true"  multiValued="false" omitNorms="false" /> 
+	<field name="editor"    type="string"   indexed="true"  stored="true"  multiValued="false" omitNorms="false" />
     <field name="text"    type="text"     indexed="true"  stored="true"  multiValued="false" />
     <field name="pub_date"    type="date"     indexed="true"  stored="true"  multiValued="false" /> 
     <field name="month"    type="string"   indexed="false"  stored="true"  multiValued="false" /> 

tests/solr_tests/tests/solr_backend.py

@@ -9,7 +9,7 @@
 from haystack.exceptions import HaystackError
 from haystack.query import SearchQuerySet, RelatedSearchQuerySet, SQ
 from haystack.sites import SearchSite
-from core.models import MockModel, AnotherMockModel
+from core.models import MockModel, AnotherMockModel, AFourthMockModel
 try:
     set
 except NameError:
@@ -63,6 +63,16 @@ def prepare_text(self, obj):
         return u"You might be searching for the user %s" % obj.author
 
 
+class SolrBoostMockSearchIndex(SearchIndex):
+    text = CharField(
+        document=True, use_template=True,
+        template_name='search/indexes/core/mockmodel_template.txt'
+    )
+    author = CharField(model_attr='author', weight=2.0)
+    editor = CharField(model_attr='editor')
+    pub_date = DateField(model_attr='pub_date')
+
+
 class SolrRoundTripSearchIndex(SearchIndex):
     text = CharField(document=True, default='')
     name = CharField()
@@ -974,3 +984,55 @@ def test_pickling(self):
             like_a_cuke = pickle.loads(in_a_pickle)
             self.assertEqual(len(like_a_cuke), len(results))
             self.assertEqual(like_a_cuke[0].id, results[0].id)
+
+
+class SolrBoostBackendTestCase(TestCase):
+    def setUp(self):
+        super(SolrBoostBackendTestCase, self).setUp()
+        
+        # Wipe it clean.
+        self.raw_solr = pysolr.Solr(settings.HAYSTACK_SOLR_URL)
+        clear_solr_index()
+        
+        self.site = SearchSite()
+        self.sb = SearchBackend(site=self.site)
+        self.smmi = SolrBoostMockSearchIndex(AFourthMockModel, backend=self.sb)
+        self.site.register(AFourthMockModel, SolrBoostMockSearchIndex)
+        
+        # Stow.
+        import haystack
+        self.old_site = haystack.site
+        haystack.site = self.site
+        self.sample_objs = []
+        
+        for i in xrange(1, 5):
+            mock = AFourthMockModel()
+            mock.id = i
+            
+            if i % 2:
+                mock.author = 'daniel'
+                mock.editor = 'david'
+            else:
+                mock.author = 'david'
+                mock.editor = 'daniel'
+            
+            mock.pub_date = datetime.date(2009, 2, 25) - datetime.timedelta(days=i)
+            self.sample_objs.append(mock)
+    
+    def tearDown(self):
+        import haystack
+        haystack.site = self.old_site
+        super(SolrBoostBackendTestCase, self).tearDown()
+    
+    def test_boost(self):
+        self.sb.update(self.smmi, self.sample_objs)
+        self.assertEqual(self.raw_solr.search('*:*').hits, 4)
+        
+        results = SearchQuerySet().filter(SQ(author='daniel') | SQ(editor='daniel'))
+        
+        self.assertEqual([result.id for result in results], [
+            'core.afourthmockmodel.1',
+            'core.afourthmockmodel.3',
+            'core.afourthmockmodel.2',
+            'core.afourthmockmodel.4'
+        ])