Merge pull request #1098 from NatLibFi/fix-first-character-query-graph

Optimize alphabet letter query: use GRAPH instead of FROM
NatLibFi · Dec 7, 2020 · 254c2c6 · 254c2c6
2 parents 91a30e5 + 6db0e1e
commit 254c2c6
Showing 1 changed file with 28 additions and 24 deletions.
diff --git a/model/sparql/GenericSparql.php b/model/sparql/GenericSparql.php
@@ -1227,7 +1227,7 @@ private function formatFilterConditions($letter, $lang) {
      * @return string sparql query
      */
     protected function generateAlphabeticalListQuery($letter, $lang, $limit, $offset, $classes, $showDeprecated = false, $qualifier = null) {
-        $fcl = $this->generateFromClause();
+        $gcl = $this->graphClause;
         $classes = ($classes) ? $classes : array('http://www.w3.org/2004/02/skos/core#Concept');
         $values = $this->formatValues('?type', $classes, 'uri');
         $limitandoffset = $this->formatLimitAndOffset($limit, $offset);
@@ -1240,31 +1240,33 @@ protected function generateAlphabeticalListQuery($letter, $lang, $limit, $offset
             $filterDeprecated="FILTER NOT EXISTS { ?s owl:deprecated true }";
         }
         $query = <<<EOQ
-SELECT DISTINCT ?s ?label ?alabel ?qualifier $fcl
+SELECT DISTINCT ?s ?label ?alabel ?qualifier
 WHERE {
-  {
-    ?s skos:prefLabel ?label .
-    FILTER (
-      $filtercondLabel
-    )
-  }
-  UNION
-  {
+  $gcl {
     {
-      ?s skos:altLabel ?alabel .
+      ?s skos:prefLabel ?label .
       FILTER (
-        $filtercondALabel
+        $filtercondLabel
       )
     }
+    UNION
     {
-      ?s skos:prefLabel ?label .
-      FILTER (langMatches(lang(?label), '$lang'))
+      {
+        ?s skos:altLabel ?alabel .
+        FILTER (
+          $filtercondALabel
+        )
+      }
+      {
+        ?s skos:prefLabel ?label .
+        FILTER (langMatches(lang(?label), '$lang'))
+      }
     }
+    ?s a ?type .
+    $qualifierClause
+    $filterDeprecated
+    $values
   }
-  ?s a ?type .
-  $qualifierClause
-  $filterDeprecated
-  $values
 }
 ORDER BY LCASE(STR(COALESCE(?alabel, ?label))) STR(?s) LCASE(STR(?qualifier)) $limitandoffset
 EOQ;
@@ -1337,15 +1339,17 @@ public function queryConceptsAlphabetical($letter, $lang, $limit = null, $offset
      * @return string sparql query
      */
     private function generateFirstCharactersQuery($lang, $classes) {
-        $fcl = $this->generateFromClause();
+        $gcl = $this->graphClause;
         $classes = (isset($classes) && sizeof($classes) > 0) ? $classes : array('http://www.w3.org/2004/02/skos/core#Concept');
         $values = $this->formatValues('?type', $classes, 'uri');
         $query = <<<EOQ
-SELECT DISTINCT (ucase(str(substr(?label, 1, 1))) as ?l) $fcl WHERE {
-  ?c skos:prefLabel ?label .
-  ?c a ?type
-  FILTER(langMatches(lang(?label), '$lang'))
-  $values
+SELECT DISTINCT (ucase(str(substr(?label, 1, 1))) as ?l) WHERE {
+  $gcl {
+    ?c skos:prefLabel ?label .
+    ?c a ?type
+    FILTER(langMatches(lang(?label), '$lang'))
+    $values
+  }
 }
 EOQ;
         return $query;