Fixed call number sort configuration.

config/vufind/searches.ini

@@ -151,7 +151,7 @@ title = sort_title
 ; [Sorting] section above.  Any search type that is not listed here will be sorted
 ; using the default_sort setting in the [General] section above.
 [DefaultSortingByType]
-CallNumber = callnumber
+CallNumber = callnumber-sort
 
 ; Each search type defined in searchspecs.yaml can have one or more "recommendations
 ; modules" associated with it in the following sections.  These plug-ins will cause

module/VuFind/src/VuFind/Config/Upgrade.php

@@ -742,6 +742,19 @@ class Upgrade
             }
         }
 
+        // fix call number sort settings:
+        if (isset($newConfig['Sorting']['callnumber'])) {
+            $newConfig['Sorting']['callnumber-sort']
+                = $newConfig['Sorting']['callnumber'];
+            unset($newConfig['Sorting']['callnumber']);
+        }
+        if (isset($newConfig['DefaultSortingByType'])) {
+            foreach ($newConfig['DefaultSortingByType'] as & $v) {
+                if ($v === 'callnumber') {
+                    $v = 'callnumber-sort';
+                }
+            }
+        }
         $this->upgradeSpellingSettings('searches.ini', ['CallNumber']);
 
         // save the file

module/VuFind/tests/unit-tests/src/VuFindTest/Config/UpgradeTest.php

@@ -137,6 +137,14 @@ class UpgradeTest extends \VuFindTest\Unit\TestCase
             ],
             $results['searches.ini']['TopRecommendations']
         );
+        $this->assertEquals(
+            ['CallNumber' => 'callnumber-sort'],
+            $results['searches.ini']['DefaultSortingByType']
+        );
+        $this->assertEquals(
+            'sort_callnumber',
+            $results['searches.ini']['Sorting']['callnumber-sort']
+        );
         $this->assertEquals(
             ['SummonDatabases', 'SpellingSuggestions'],
             $results['Summon.ini']['General']['default_top_recommend']