Merge pull request #1760 from MTG/docvalues_license

SOLR schema: convert license to a docValues field for faster faceting
MTG · Oct 17, 2024 · 4b5b709 · 4b5b709
2 parents f4e84af + 0942fac
commit 4b5b709
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/freesound/settings.py b/freesound/settings.py
@@ -566,7 +566,7 @@
 # -------------------------------------------------------------------------------
 # Search engine
 
-FCW_FILTER_VALUE = '("attribution" OR "creative commons 0")'
+FCW_FILTER_VALUE = '("Attribution" OR "Creative Commons 0")'
 
 # Define the names of some of the indexed sound fields which are to be used later
 SEARCH_SOUNDS_FIELD_ID = 'sound_id'

diff --git a/search/templatetags/search.py b/search/templatetags/search.py
@@ -90,10 +90,6 @@ def display_facet(context, facet_name, facet_title=None):
             element['display_value'] = element['value'][element['value'].find("_")+1:]
         elif element['value'] == settings.FCW_FILTER_VALUE:
             element['display_value'] = "Approved for Free Cultural Works"
-        elif facet_name == 'license':
-            # License field in solr is case insensitive and will return facet names in lowercase. 
-            # We need to properly capitalize them to use official CC license names.
-            element['display_value'] = element['value'].title().replace('Noncommercial', 'NonCommercial')
         elif facet_type == 'range':
             # Update display value for range facets
             gap = sqp.facets[facet_name]['gap']
@@ -157,4 +153,4 @@ def display_search_option(context, option_name, widget=None):
             search_query_processor_options.SearchOptionChoice: 'select',
         }.get(type(option), 'text')
     label = option.label if option.label else option_name.capitalize().replace('_', ' ')
-    return {'option': option, 'option_name': option_name, 'label': label, 'widget': widget}
+    return {'option': option, 'option_name': option_name, 'label': label, 'widget': widget}
diff --git a/utils/search/solr9/cores/freesound/conf/schema.xml b/utils/search/solr9/cores/freesound/conf/schema.xml
@@ -194,7 +194,7 @@
   <field name="tag" type="alphaOnlySort" indexed="true" stored="true" required="false" multiValued="true"/>
   <field name="is_explicit" type="boolean" indexed="true" stored="true" required="false" />
 
-  <field name="license" type="lowercase" indexed="true" stored="true" />
+  <field name="license" type="string" indexed="false" stored="false" />
 
   <field name="is_remix" type="boolean" indexed="true" stored="true" required="false" />
   <field name="was_remixed" type="boolean" indexed="true" stored="true" required="false" />
@@ -251,4 +251,4 @@
   <!-- Other fields -->
   <dynamicField name="random_*" type="random" indexed="true" stored="false"/>
 
-</schema>
+</schema>