|
@@ -41,7 +41,7 @@ discard block |
|
|
block discarded – undo |
|
41
|
41
|
// 1. Ensure characters with special meaning in Lucene are escaped |
|
42
|
42
|
$lucenemap = array(); |
|
43
|
43
|
foreach (str_split(self::LUCENE_ESCAPE_CHARS) as $char) { |
|
44
|
|
- $lucenemap[$char] = '\\' . $char; // escape with a backslash |
|
|
44
|
+ $lucenemap[$char] = '\\'.$char; // escape with a backslash |
|
45
|
45
|
} |
|
46
|
46
|
$term = strtr($term, $lucenemap); |
|
47
|
47
|
|
|
@@ -92,7 +92,7 @@ discard block |
|
|
block discarded – undo |
|
92
|
92
|
* @return string sparql order by clause |
|
93
|
93
|
*/ |
|
94
|
94
|
private function formatOrderBy($expression, $lang) { |
|
95
|
|
- if(!$this->model->getConfig()->getCollationEnabled()) { |
|
|
95
|
+ if (!$this->model->getConfig()->getCollationEnabled()) { |
|
96
|
96
|
return $expression; |
|
97
|
97
|
} |
|
98
|
98
|
$orderby = sprintf('arq:collation(\'%2$s\', %1$s)', $expression, $lang); |
|
@@ -126,15 +126,15 @@ discard block |
|
|
block discarded – undo |
|
126
|
126
|
# make text query clause |
|
127
|
127
|
$lcletter = mb_strtolower($letter, 'UTF-8'); // convert to lower case, UTF-8 safe |
|
128
|
128
|
$langClause = $this->generateLangClause($lang); |
|
129
|
|
- $textcondPref = $this->createTextQueryCondition($letter . '*', 'skos:prefLabel', $langClause); |
|
130
|
|
- $textcondAlt = $this->createTextQueryCondition($letter . '*', 'skos:altLabel', $langClause); |
|
131
|
|
- $orderbyclause = $this->formatOrderBy("LCASE(?match)", $lang) . " STR(?s) LCASE(STR(?qualifier))"; |
|
|
129
|
+ $textcondPref = $this->createTextQueryCondition($letter.'*', 'skos:prefLabel', $langClause); |
|
|
130
|
+ $textcondAlt = $this->createTextQueryCondition($letter.'*', 'skos:altLabel', $langClause); |
|
|
131
|
+ $orderbyclause = $this->formatOrderBy("LCASE(?match)", $lang)." STR(?s) LCASE(STR(?qualifier))"; |
|
132
|
132
|
|
|
133
|
|
- $qualifierClause = $qualifier ? "OPTIONAL { ?s <" . $qualifier->getURI() . "> ?qualifier }" : ""; |
|
|
133
|
+ $qualifierClause = $qualifier ? "OPTIONAL { ?s <".$qualifier->getURI()."> ?qualifier }" : ""; |
|
134
|
134
|
|
|
135
|
|
- $filterDeprecated=""; |
|
136
|
|
- if(!$showDeprecated){ |
|
137
|
|
- $filterDeprecated="FILTER NOT EXISTS { ?s owl:deprecated true }"; |
|
|
135
|
+ $filterDeprecated = ""; |
|
|
136
|
+ if (!$showDeprecated) { |
|
|
137
|
+ $filterDeprecated = "FILTER NOT EXISTS { ?s owl:deprecated true }"; |
|
138
|
138
|
} |
|
139
|
139
|
|
|
140
|
140
|
$query = <<<EOQ |