From 28e0085fb6ec32d8d53a81b418c166276db50443 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Mon, 6 Jan 2014 13:55:35 -0500
Subject: [PATCH] Factored out redundant if ($handler) checks.
---
.../Backend/Solr/QueryBuilder.php | 32 ++++++++-----------
1 file changed, 14 insertions(+), 18 deletions(-)
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/QueryBuilder.php b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/QueryBuilder.php
index cc821c5dfc9..02734b91e72 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/QueryBuilder.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/QueryBuilder.php
@@ -135,12 +135,11 @@ class QueryBuilder implements QueryBuilderInterface
}
$string = $query->getString() ?: '*:*';
- $handler = $this->getSearchHandler($query->getHandler(), $string);
- if (!($handler && $handler->hasExtendedDismax())
- && $this->getLuceneHelper()->containsAdvancedLuceneSyntax($string)
- ) {
- if ($handler) {
+ if ($handler = $this->getSearchHandler($query->getHandler(), $string)) {
+ if (!$handler->hasExtendedDismax()
+ && $this->getLuceneHelper()->containsAdvancedLuceneSyntax($string)
+ ) {
$string = $this->createAdvancedInnerSearchString($string, $handler);
if ($handler->hasDismax()) {
$oldString = $string;
@@ -152,19 +151,17 @@ class QueryBuilder implements QueryBuilderInterface
$params->set('hl.q', $oldString);
}
}
- }
- } else {
- if ($handler && $handler->hasDismax()) {
- $params->set('qf', implode(' ', $handler->getDismaxFields()));
- $params->set('qt', $handler->getDismaxHandler());
- foreach ($handler->getDismaxParams() as $param) {
- $params->add(reset($param), next($param));
- }
- if ($handler->hasFilterQuery()) {
- $params->add('fq', $handler->getFilterQuery());
- }
} else {
- if ($handler) {
+ if ($handler->hasDismax()) {
+ $params->set('qf', implode(' ', $handler->getDismaxFields()));
+ $params->set('qt', $handler->getDismaxHandler());
+ foreach ($handler->getDismaxParams() as $param) {
+ $params->add(reset($param), next($param));
+ }
+ if ($handler->hasFilterQuery()) {
+ $params->add('fq', $handler->getFilterQuery());
+ }
+ } else {
$string = $handler->createSimpleQueryString($string);
}
}
@@ -360,7 +357,6 @@ class QueryBuilder implements QueryBuilderInterface
* @param SearchHandler $handler Search handler
*
* @return string
- *
*/
protected function createAdvancedInnerSearchString($string,
SearchHandler $handler
--
GitLab