Fix notation search matches missing from labelpriority BIND

Add missing BIND for notation priority (5/6) in the SPARQL query's
labelpriority section, add ?nlabel to SELECT and GROUP BY, and add
a handler for notation-only matches in transformConceptSearchResult().

Previously, concepts matched solely by skos:notation had no output
variable bound (?plabel, ?alabel, ?hlabel all unbound), so the match
type information was silently lost.

Fixes #1931

Author: fvogel

src/model/sparql/GenericSparql.php

@@ -1128,14 +1128,15 @@ protected function generateConceptSearchQuery($fields, $unique, $params, $showDe
   BIND(IF((SUBSTR(STRBEFORE(?hit, '@'),1) != ?pri), STRLANG(STRAFTER(?hit, '@'), SUBSTR(STRBEFORE(?hit, '@'),2)), STRAFTER(?hit, '@')) AS ?match)
   BIND(IF((?pri = "1" || ?pri = "2") && ?match != ?label, ?match, ?unbound) as ?plabel)
   BIND(IF((?pri = "3" || ?pri = "4"), ?match, ?unbound) as ?alabel)
+  BIND(IF((?pri = "5" || ?pri = "6"), ?match, ?unbound) as ?nlabel)
   BIND(IF((?pri = "7" || ?pri = "8"), ?match, ?unbound) as ?hlabel)
 EOQ;
         $innerquery = $this->generateConceptSearchQueryInner($params->getSearchTerm(), $params->getLang(), $params->getSearchLang(), $props, $unique, $filterGraph);
         if ($params->getSearchTerm() === '*' || $params->getSearchTerm() === '') {
             $labelpriority = '';
         }
         $query = <<<EOQ
-SELECT DISTINCT ?s ?label ?plabel ?alabel ?hlabel ?graph ?notation (GROUP_CONCAT(DISTINCT STR(?type);separator=' ') as ?types) $extravars 
+SELECT DISTINCT ?s ?label ?plabel ?alabel ?nlabel ?hlabel ?graph ?notation (GROUP_CONCAT(DISTINCT STR(?type);separator=' ') as ?types) $extravars
 $fcl
 WHERE {
  $gcl {
@@ -1152,7 +1153,7 @@ protected function generateConceptSearchQuery($fields, $unique, $params, $showDe
  }
  $filterGraph
 }
-GROUP BY ?s ?match ?label ?plabel ?alabel ?hlabel ?notation ?graph
+GROUP BY ?s ?match ?label ?plabel ?alabel ?nlabel ?hlabel ?notation ?graph
 ORDER BY LCASE(STR(?match)) LANG(?match) $orderextra
 EOQ;
         return $query;
@@ -1234,6 +1235,8 @@ private function transformConceptSearchResult($row, $vocabs, $fields)
         } elseif (isset($row->alabel)) {
             $hit['altLabel'] = $row->alabel->getValue();
             $hit['lang'] = $row->alabel->getLang();
+        } elseif (isset($row->nlabel)) {
+            $hit['notation'] = $row->nlabel->getValue();
         } elseif (isset($row->hlabel)) {
             $hit['hiddenLabel'] = $row->hlabel->getValue();
             $hit['lang'] = $row->hlabel->getLang();