Smarter handler matching.

module/VuFind/src/VuFind/Recommend/SearchObject.php

@@ -133,7 +133,7 @@ abstract class SearchObject implements RecommendInterface
         $params->setLimit($this->limit);
         $params->setBasicSearch(
             $lookfor,
-            $params->getOptions()->getBasicHandlerForLabel($typeLabel)
+            $params->getOptions()->getHandlerForLabel($typeLabel)
         );
 
         // Perform the search:

module/VuFind/src/VuFind/Search/Base/Options.php

@@ -159,17 +159,25 @@ abstract class Options implements TranslatorAwareInterface
 
     /**
      * Given a label from the configuration file, return the name of the matching
-     * basic handler; return the default handler if no match is found.
+     * handler (basic checked first, then advanced); return the default handler
+     * if no match is found.
      *
      * @param string $label Label to search for
      *
      * @return string
      */
-    public function getBasicHandlerForLabel($label)
+    public function getHandlerForLabel($label)
     {
+        $label = $this->translate($label);
+
         $targetHandler = false;
         foreach ($this->getBasicHandlers() as $id => $currentLabel) {
-            if ($currentLabel == $label) {
+            if ($this->translate($currentLabel) == $label) {
+                return $id;
+            }
+        }
+        foreach ($this->getAdvancedHandlers() as $id => $currentLabel) {
+            if ($this->translate($currentLabel) == $label) {
                 return $id;
             }
         }

module/VuFind/src/VuFind/View/Helper/Root/SearchTabs.php

@@ -142,7 +142,7 @@ class SearchTabs extends \Zend\View\Helper\AbstractHelper
         $options = $results->getOptions();
 
         // Find matching handler for new query (and use default if no match):
-        $targetHandler = $options->getBasicHandlerForLabel(
+        $targetHandler = $options->getHandlerForLabel(
             $activeOptions->getLabelForBasicHandler($handler)
         );