Allow to avoid escaping in Solr query

master
Gilles Crettenand 11 years ago
parent 11f315c458
commit 5018bf35ec

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

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

Loading…
Cancel
Save