Fixed facet fieldname lookups to use the proper fieldname.

Author: toastdriven

haystack/sites.py

@@ -151,18 +151,19 @@ def get_index_fieldname(self, fieldname):
     def get_facet_field_name(self, fieldname):
         """
         Returns the actual name of the facet field in the index.
-
+        
         If not found, returns the fieldname provided.
         """
         facet_fieldname = None
-        if fieldname in self._field_mapping():
-            facet_fieldname = self._field_mapping()[fieldname]['facet_fieldname']
-
-        if facet_fieldname:
-            return self.get_index_fieldname(facet_fieldname)
-        else:
-            return fieldname
-
+        
+        reverse_map = {}
+        
+        for field, info in self._field_mapping().items():
+            if info['facet_fieldname'] and info['facet_fieldname'] == fieldname:
+                return info['index_fieldname']
+        
+        return self.get_index_fieldname(fieldname)
+    
     def _field_mapping(self):
         mapping = {}
 
@@ -174,14 +175,15 @@ def _field_mapping(self):
                 if field_name in mapping and field_object.index_fieldname != mapping[field_name]['index_fieldname']:
                     # We've already seen this field in the list. Raise an exception if index_fieldname differs.
                     raise SearchFieldError("All uses of the '%s' field need to use the same 'index_fieldname' attribute." % field_name)
-
+                
                 facet_fieldname = None
+                
                 if hasattr(field_object, 'facet_for'):
                     if field_object.facet_for:
                         facet_fieldname = field_object.facet_for
                     else:
                         facet_fieldname = field_object.instance_name
-                    
+                
                 mapping[field_name] = {
                     'index_fieldname': field_object.index_fieldname,
                     'facet_fieldname': facet_fieldname,

tests/core/tests/sites.py

@@ -235,8 +235,8 @@ def test_basic_get_facet_field_name(self):
         self.assertEqual(self.site.get_index_fieldname('title'), 'title')
 
         self.assertEqual(self.site.get_facet_field_name('text'), 'text')
-        self.assertEqual(self.site.get_facet_field_name('author'), 'author')
-        self.assertEqual(self.site.get_facet_field_name('title'), 'title')
+        self.assertEqual(self.site.get_facet_field_name('author'), 'author_exact')
+        self.assertEqual(self.site.get_facet_field_name('title'), 'title_exact')
 
     def test_more_advanced_get_facet_field_name(self):
         self.assertEqual(self.site._cached_field_mapping, None)
@@ -253,9 +253,7 @@ def test_more_advanced_get_facet_field_name(self):
             'title': {'facet_fieldname': None, 'index_fieldname': 'title'},
             'title_facet': {'facet_fieldname': 'title', 'index_fieldname': 'title_facet'},
         })
-        self.assertEqual(self.site.get_facet_field_name('title'), 'title')
-
-        self.assertEqual(self.site.get_facet_field_name('title'), 'title')
+        self.assertEqual(self.site.get_facet_field_name('title'), 'title_facet')
         self.assertEqual(self.site.get_facet_field_name('bare_facet'), 'bare_facet')