Skip to content

Commit

Permalink
Issue #2342653 by chr.fritsch: Add search_api query to elastica query…
Browse files Browse the repository at this point in the history
… alter. Github: Closes #52
  • Loading branch information
chr.fritsch authored and VeggieMeat committed Sep 23, 2014
1 parent 158535e commit 4d5ed29
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ class SearchApiElasticsearchElastica extends SearchApiElasticsearchAbstractServi
// Add facets.
$this->addSearchFacets($elastica_query, $query);

$response = SearchApiElasticsearchElasticaSearcher::search($elastica_type, $elastica_query, $query_options);
$response = SearchApiElasticsearchElasticaSearcher::search($elastica_type, $elastica_query, $query_options, $query);

// Show Elasticsearch query string from Elastica
// as json output when views debug output is enabled.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

class SearchApiElasticsearchElasticaSearcher {

static public function search($type, $query, $options) {
static public function search($type, $query, $options, SearchApiQueryInterface $search_api_query) {
if (!empty($options['mlt'])) {
SearchApiElasticsearchElasticaMLT::build($type, $options, $query);
}

drupal_alter('search_api_elasticsearch_elastica_query', $query);
drupal_alter('search_api_elasticsearch_elastica_query', $query, $search_api_query);

return $type->search($query);
}
Expand Down
4 changes: 3 additions & 1 deletion modules/elastica/search_api_elasticsearch_elastica.api.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ function hook_search_api_elasticsearch_elastica_add_index_alter(array $options)
*
* @param \Elastica\Query $elastica_query
* The Elastica query object to be altered.
* @param SearchApiQueryInterface $query
* The original Search API query.
*/
function hook_search_api_elasticsearch_elastica_query_alter(\Elastica\Query &$elastica_query) {
function hook_search_api_elasticsearch_elastica_query_alter(\Elastica\Query &$elastica_query, SearchApiQueryInterface $search_api_query) {

}

0 comments on commit 4d5ed29

Please sign in to comment.