gbili/webservice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow to avoid escaping in Solr query

Browse Source
This commit is contained in:
Gilles Crettenand
2015-05-19 12:39:15 +02:00
parent 11f315c458
commit 5018bf35ec
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/BookSearch.php
View File

@@ -29,9 +29,11 @@ class BookSearch
$this->query->addParam('q.op', 'AND'); $this->query->addParam('q.op', 'AND');
} }
public function addQuery($queryText, $queryField = null) public function addQuery($queryText, $queryField = null, $escape = true)
{ {
$queryText= SolrUtils::escapeQueryChars($queryText); if($escape) {
$queryText = SolrUtils::escapeQueryChars($queryText);
}
if (strlen($queryField) > 0) { if (strlen($queryField) > 0) {
$queryText = "$queryField:\"$queryText\""; $queryText = "$queryField:\"$queryText\"";

4
mobile.netbiblio.php
View File

@@ -342,9 +342,9 @@ class NetBiblio extends WebService
}); });
if (count($selectedCategories) > 0) { if (count($selectedCategories) > 0) {
$selectedCategories = array_map(function ($c) { $selectedCategories = array_map(function ($c) {
return "categoryCode: $c"; return 'categoryCode:'.SolrUtils::escapeQueryChars($c);
}, $selectedCategories); }, $selectedCategories);
$bs->addQuery('(' . implode(' OR ', $selectedCategories) . ')'); $bs->addQuery('('.implode(' OR ', $selectedCategories).')', null, false);
} }
} }