Commit b9130b78 authored by Andrew Minich's avatar Andrew Minich Committed by Thomas Seidl
Browse files

Issue #3321499 by andrew-minich, Shriaas, siddharthjain_7998, drunken monkey:... 

Issue #3321499 by andrew-minich, Shriaas, siddharthjain_7998, drunken monkey: Fixed errors with views on disabled indexes.
parent 855a5ee2

CHANGELOG.txt

+2 −0
Original line number Diff line number Diff line 
Search API 1.x, dev (xxxx-xx-xx):

---------------------------------

- #3321499 by andrew-minich, Shriaas, siddharthjain_7998, drunken monkey: Fixed

  errors with views on disabled indexes.

- #3361041 by BigDave91, drunken monkey: Fixed integer overflow error in DB

  backend for large score values.

- #3325360 by Jelle_S, drunken monkey: Fixed referenced entity tracking not

src/Plugin/views/cache/SearchApiCachePluginTrait.php

+9 −1
Original line number Diff line number Diff line
@@ -203,7 +203,10 @@ trait SearchApiCachePluginTrait { 
   */

  public function generateResultsKey() {

    if (!isset($this->resultsKey)) {

      $this->getQuery()->getSearchApiQuery()->preExecute();

      $query = $this->getQuery()->getSearchApiQuery();

      if ($query) {

        $query->preExecute();

      }



      $view = $this->getView();

      $build_info = $view->build_info;
@@ -284,6 +287,11 @@ trait SearchApiCachePluginTrait { 
    // every single cacheable display in the view, thus we are resetting the

    // query to its original unprocessed state.

    $query = $this->getQuery(TRUE)->getSearchApiQuery();

    // In case the search index is disabled, or the query couldn't be created

    // for some other reason, there is nothing to do here.

    if (!$query) {

      return;

    }

    // Add a tag to the query to indicate that this is not a real search but the

    // save process of a view. Modules like facets can use this information to

    // not perform their normal search time tasks on this query. This is

src/Plugin/views/query/SearchApiQuery.php

+5 −4
Original line number Diff line number Diff line
@@ -870,12 +870,13 @@ class SearchApiQuery extends QueryPluginBase { 
  /**

   * Retrieves the Search API result set returned for this query.

   *

   * @return \Drupal\search_api\Query\ResultSetInterface

   *   The result set of this query. Might not contain the actual results yet if

   *   the query hasn't been executed yet.

   * @return \Drupal\search_api\Query\ResultSetInterface|null

   *   The result set of this query, or NULL if no search query has been

   *   created for this view. If a result set is returned, it might not contain

   *   the actual results yet if the query hasn't been executed yet.

   */

  public function getSearchApiResults() {

    return $this->query->getResults();

    return $this->query ? $this->query->getResults() : NULL;

  }



  /**