tmdinosaurcenter
/
tainacan
mirror of https://github.com/tainacan/tainacan
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Text search also searches in relationship metadata (refs #100)

This commit is contained in:
Leo Germani 2018-08-06 14:55:08 -03:00
parent dab6ac8405
commit 5e545cdbca
3 changed files with 139 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
src/classes/class-tainacan-search-engine.php
View File

@ -24,7 +24,9 @@ class Search_Engine {
private $query_instance;
private $taxonomies = [];
private $relationships = [];
private $is_tainacan_search = false;
private $is_inner_query = false;
function __construct($ajax_query=false) {
$this->ajax_request = $ajax_query ? true : false;
@ -38,7 +40,10 @@ class Search_Engine {
function search_hooks() {
add_filter( 'posts_join', array( &$this, 'terms_join' ) );
add_filter( 'posts_join', array( &$this, 'search_metadata_join' ) );
add_filter( 'posts_join', array( &$this, 'relationships_join' ) );
//add_filter( 'posts_where', array( &$this, 'search_attachments' ) );
@ -48,8 +53,6 @@ class Search_Engine {
add_filter( 'posts_request', array( &$this, 'distinct' ) );
add_filter( 'posts_join', array( &$this, 'search_metadata_join' ) );
//add_filter( 'posts_request', array( &$this, 'log_query' ), 10, 2 );
}
@ -91,25 +94,33 @@ class Search_Engine {
$post_types = $this->query_instance->get('post_type');
$taxonomies = [];
$relationships = [];
if (!$post_types || empty($post_types) || !is_array($post_types)) {
$this->is_tainacan_search = false;
} else {
foreach ($post_types as $pt) {
$pattern = '/^' . \Tainacan\Entities\Collection::$db_identifier_prefix . '.+' . \Tainacan\Entities\Collection::$db_identifier_sufix . '$/';
if ( preg_match($pattern, $pt) ) {
$this->is_tainacan_search = true;
$pattern = '/^' . \Tainacan\Entities\Collection::$db_identifier_prefix . '(\d+)' . \Tainacan\Entities\Collection::$db_identifier_sufix . '$/';
if ( preg_match_all($pattern, $pt, $matches) ) {
$taxonomies = array_merge( $taxonomies, get_object_taxonomies($pt) );
if (isset($matches[1][0])) {
$this->is_inner_query = true;
$relationships = array_merge( $relationships, \Tainacan\Repositories\Metadata::get_instance()->fetch_ids_by_collection( (int) $matches[1][0], ['metadata_type' => 'Tainacan\Metadata_Types\Relationship'] ) );
$this->is_inner_query = false;
}
$this->is_tainacan_search = true;
} else {
$this->is_tainacan_search = false;
break;
}
}
}
if ( $this->is_tainacan_search ) {
$taxonomies = array_unique($taxonomies);
$relationships = array_unique($relationships);
$this->taxonomies = $taxonomies;
$this->relationships = $relationships;
}
}
@ -117,7 +128,11 @@ class Search_Engine {
// add where clause to the search query
function search_where( $where, $wp_query ) {
$this->query_instance = &$wp_query;
if ($this->is_inner_query) {
return $where;
}
$this->query_instance = &$wp_query;
$this->init_tainacan_search_vars();
@ -131,8 +146,11 @@ class Search_Engine {
$searchQuery .= $this->build_search_categories();
$searchQuery .= $this->build_search_metadata();
$searchQuery .= $this->build_search_relationships();
$searchQuery .= $this->search_authors();
if ( $searchQuery != '' ) {
// lets use _OUR_ query instead of WP's, as we have posts already included in our query as well(assuming it's not empty which we check for)
@ -231,6 +249,33 @@ class Search_Engine {
return $search;
}
function build_search_relationships(){
global $wpdb;
$s = $this->query_instance->query_vars['s'];
$search_terms = $this->get_search_terms();
$exact = ( isset( $this->query_instance->query_vars['exact'] ) && $this->query_instance->query_vars['exact'] ) ? true : false;
$search = '';
if ( !empty( $search_terms ) ) {
// Building search query
$searchand = '';
foreach ( $search_terms as $term ) {
$term = $wpdb->prepare("%s", $exact ? $term : "%$term%");
$search .= "{$searchand}(p2.post_title LIKE $term)";
$searchand = ' AND ';
}
$sentence_term = $wpdb->prepare("%s", $s);
if ( count( $search_terms ) > 1 && $search_terms[0] != $sentence_term ) {
$search = "($search) OR (p2.post_title LIKE $sentence_term)";
}
if ( !empty( $search ) )
$search = " OR ({$search}) ";
}
return $search;
}
// create the search meta data query
function build_search_metadata() {
@ -313,9 +358,14 @@ class Search_Engine {
//join for searching authors
function search_authors_join( $join ) {
if ($this->is_inner_query) {
return $join;
}
global $wpdb;
if ( !empty( $this->query_instance->query_vars['s'] ) ) {
if ( $this->is_tainacan_search ) {
$join .= " LEFT JOIN $wpdb->users AS u ON ($wpdb->posts.post_author = u.ID) ";
}
return $join;
@ -323,20 +373,47 @@ class Search_Engine {
//join for searching metadata
function search_metadata_join( $join ) {
if ($this->is_inner_query) {
return $join;
}
global $wpdb;
if ( !empty( $this->query_instance->query_vars['s'] ) ) {
if ( $this->is_tainacan_search ) {
$join .= " LEFT JOIN $wpdb->postmeta AS m ON ($wpdb->posts.ID = m.post_id) ";
}
return $join;
}
// join for relationship metadata
function relationships_join( $join ) {
if ($this->is_inner_query) {
return $join;
}
global $wpdb;
if ( $this->is_tainacan_search && !empty( $this->relationships ) ) {
$relationships = implode(',', $this->relationships);
$join .= " LEFT JOIN $wpdb->posts AS p2 ON (m.meta_value = p2.ID AND meta_key IN ($relationships)) ";
}
return $join;
}
//join for searching tags
function terms_join( $join ) {
if ($this->is_inner_query) {
return $join;
}
global $wpdb;
if ( !empty( $this->query_instance->query_vars['s'] ) && !empty( $this->taxonomies ) ) {
if ( $this->is_tainacan_search && !empty( $this->taxonomies ) ) {
foreach ( $this->taxonomies as $taxonomy ) {
$on[] = "ttax.taxonomy = '" . addslashes( $taxonomy )."'";

49
src/classes/repositories/class-tainacan-metadata.php
View File

@ -351,7 +351,7 @@ class Metadata extends Repository {
}
/**
* fetch metadatum by collection, considering inheritance
* fetch metadatum by collection, considering inheritance and order
*
* @param Entities\Collection $collection
* @param array $args WP_Query args plus disabled_metadata
@ -394,6 +394,53 @@ class Metadata extends Repository {
isset( $args['include_disabled'] ) ? $args['include_disabled'] : false
);
}
/**
* fetch metadata IDs by collection, considering inheritance
*
* @param Entities\Collection|int $collection object or ID
* @param array $args WP_Query args plus disabled_metadata
*
* @return array List of metadata IDs
* @throws \Exception
*/
public function fetch_ids_by_collection($collection, $args = []){
if ($collection instanceof Entities\Collection) {
$collection_id = $collection->get_id();
} elseif (is_integer($collection)) {
$collection_id = $collection;
} else {
throw new \InvalidArgumentException('fetch_ids_by_collection expects paramater 1 to be a integer or a \Tainacan\Entities\Collection object. ' . gettype($collection) . ' given');
}
//get parent collections
$parents = get_post_ancestors( $collection_id );
//insert the actual collection
$parents[] = $collection_id;
//search for default metadatum
$parents[] = $this->get_default_metadata_attribute();
$meta_query = array(
'key' => 'collection_id',
'value' => $parents,
'compare' => 'IN',
);
$args = array_merge([
'parent' => 0
], $args);
if( isset( $args['meta_query'] ) ){
$args['meta_query'][] = $meta_query;
} elseif(is_array($args)){
$args['meta_query'] = array( $meta_query );
}
return $this->fetch_ids( $args );
}
/**
* Ordinate the result from fetch response if $collection has an ordination,

3
tests/test-metadata.php
View File

@ -161,9 +161,12 @@ class Metadata extends TAINACAN_UnitTestCase {
);
$retrieve_metadata = $Tainacan_Metadata->fetch_by_collection( $collection_son, [], 'OBJECT' );
$retrieve_metadata_ids = $Tainacan_Metadata->fetch_ids_by_collection( $collection_son, [] );
// should return 6
$this->assertEquals( 6, sizeof( $retrieve_metadata ) );
$this->assertEquals( 6, sizeof( $retrieve_metadata_ids ) );
}
/**