Define stub Blender2Mappings.yaml that inherits from Blender1 mappings.

Author: maccabeelevine

config/vufind/Blender.ini

@@ -30,9 +30,6 @@ blockSize = 7
 ;adaptiveBlockSizes[] = "0-20:3"
 ;adaptiveBlockSizes[] = "21-10000:5"
 
-; Mappings configuration filename.  Omit the ".yaml" extension.
-mappings = BlenderMappings
-
 ; ---------- config.ini settings ----------
 
 [Record]

config/vufind/Blender2.ini

@@ -1,9 +1,6 @@
 ; This configuration file can be used to set up a secondary Blender, i.e. to
 ; combine a different set of backends. This instance is accessible under /Blender2
-; URLs within VuFind.
-;
-; Note that BlenderMappings.yaml is still used by this secondary Blender, unless
-; otherwise specified in "mappings" below.
+; URLs within VuFind. See also Blender2Mappings.yaml.
 ;
 ; All of the settings are copied from Blender.ini. To ease maintenance of
 ; documentation, comments from that file are not duplicated here. See Blender.ini
@@ -31,8 +28,6 @@ blockSize = 7
 ;adaptiveBlockSizes[] = "0-20:3"
 ;adaptiveBlockSizes[] = "21-10000:5"
 
-mappings = BlenderMappings
-
 ; ---------- config.ini settings ----------
 
 [Record]

config/vufind/Blender2Mappings.yaml

@@ -0,0 +1,8 @@
+# This is the Blender mappings configuration for the backend configured in Blender2.ini.
+# Blender2-specific rules can be defined below.
+
+# By default, Blender2 inherits rules from the parent configuration. Disable this line
+# to not inherit those rules. Only sections not found in this file will be loaded in
+# from the parent file.
+"@parent_config_name": "BlenderMappings"
+

module/VuFind/src/VuFind/Search/Blender/ParamsFactory.php

@@ -92,7 +92,6 @@ public function __invoke(
         if (!$backendConfig) {
             throw new \Exception('No backends enabled in ' . $this->blenderIni . '.ini');
         }
-        $this->blenderMappingsYaml = $blenderConfig->Blending->mappings ?? $this->blenderMappingsYaml;
 
         $facetHelper
             = $container->get(\VuFind\Search\Solr\HierarchicalFacetHelper::class);

module/VuFind/src/VuFind/Search/Blender2/ParamsFactory.php

@@ -48,4 +48,13 @@ class ParamsFactory extends \VuFind\Search\Blender\ParamsFactory
      * @var string
      */
     protected $blenderIni = 'Blender2';
+
+    /**
+     * Configuration file to read Blender mappings settings from
+     *
+     * Note that any change to this must be made before calling the constructor of this class.
+     *
+     * @var string
+     */
+    protected $blenderMappingsYaml = 'Blender2Mappings';
 }

module/VuFind/src/VuFind/Search/Factory/Blender2BackendFactory.php

@@ -53,4 +53,11 @@ class Blender2BackendFactory extends BlenderBackendFactory
      * @var string
      */
     protected $facetConfig = 'Blender2';
+
+    /**
+     * Mappings YAML configuration file identifier.
+     *
+     * @var string
+     */
+    protected $mappingsConfig = 'Blender2Mappings';
 }