Seperated detection of dismax and field search

Exact match: need to change full text field to String to be effective

src/AdvancedSearchQuery.php

@@ -152,16 +152,34 @@ class AdvancedSearchQuery {
       // disable for Lucene and wildcard
       //$q[] = "{!boost b=boost_document}";
 
+      // create a flag for active/inactive dismax
+      $isDismax = false;
+
       // To support negative queries we must first bring in all documents.
       $q[] = $this->negativeQuery($terms) ? "*:*" : "";
       $term = array_shift($terms);
       $q[] = $term->toSolrQuery($field_mapping);
+
+      // set dismax is enabled if the field set to "all"
+      if ($term->getField() === "all") {
+        $isDismax = true;
+      }
+
+      // for multiple conditions
       foreach ($terms as $term) {
         $q[] = $term->getConjunction();
         $q[] = $term->toSolrQuery($field_mapping);
+
+        // set dismax is enabled if the field set to "all"
+        if ($term->getField() === "all") {
+          $isDismax = true;
         }
+      }
+
       $q = implode(' ', $q);
 
+      // Limit extra processing if Luncene Search is enable
+      if ($isDismax) {
         $case_insensitive_field = $this::getConfig(SettingsForm::SOLR_CASE_INSENSITIVE_FIELD_PREFIX, '');
 
         /** @var Solarium\QueryType\Select\Query\Query $solarium_query */
@@ -217,14 +235,8 @@ class AdvancedSearchQuery {
           }
           $query_fields = implode(" ", array_unique($query_fields));
           $dismax->setQueryFields($query_fields);
-
-        // Looks like, somewhere in the previous steps, double quotes get added, we are removing them!
-        // ToDo: Look into where the original quotes are being added, and remove it there!
-        $q = trim($q);
-        $q = substr($q, 1);
-        $q = substr($q, 0, -1);
         }
-
+      }
       $solarium_query->setQuery($q);
     }
   }

src/AdvancedSearchQueryTerm.php

@@ -284,6 +284,13 @@ class AdvancedSearchQueryTerm {
     $terms = [];
     $query_helper = \Drupal::service('solarium.query_helper');
     $value = $query_helper->escapePhrase(trim($this->value));
+
+    // Added to handle exact matches keyword (surrounded by "")
+    if (preg_match('#^(\'|").+\1$#', $value) == 1) {
+      trim($value);
+      $value =  str_replace('"\\', '', $value);
+      $value =  str_replace('\\"', '', $value);
+    }
     if ($this->field === "all") {
       return $value;
     }
@@ -295,5 +302,12 @@ class AdvancedSearchQueryTerm {
     $terms = implode(' ', $terms);
     return $this->include ? "($terms)" : "-($terms)";
   }
+  /**
+   * Get Field search
+   */
+  public function getField() {
+    return $this->field;
+  }
+
 
 }