Skip to content

Commit

Permalink
Don't list organisms that have no features in the dropdown list
Browse files Browse the repository at this point in the history
  • Loading branch information
almasaeed2010 committed Feb 2, 2018
1 parent c3422a8 commit ac12c87
Showing 1 changed file with 26 additions and 6 deletions.
32 changes: 26 additions & 6 deletions includes/tripal_elasticsearch.gene_search.form.inc
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,34 @@ function tripal_elasticsearch_gene_search_form(
else {
$default_organism = ['' => 'Any Organism'];
$organism_list = chado_query('SELECT genus, species, common_name FROM {organism}')->fetchAll();
$organisms = array_map(function ($organism) {
$name = "{$organism->genus} {$organism->species}";
if (!empty($organism->common_name)) {
$name .= " ({$organism->common_name})";
try {
$es = new ESInstance();
$organisms = [];
foreach ($organism_list as $organism) {
$name = "{$organism->genus} {$organism->species}";

$query = tripal_elasticsearch_gene_search_index_query_mapper([
'organism' => $name,
'search_term' => '*',
]);

// TODO: CACHE THE RESULTS OF THIS QUERY
$count = $es->setTableSearchParams('gene_search_index', '', $query)
->count();

if ($count < 1) {
continue;
}

if (!empty($organism->common_name)) {
$name .= " ({$organism->common_name})";
}

$organisms[] = $name;
}
} catch (Exception $exception) {

return $name;
}, $organism_list);
}

$form['options']['organism'] = [
'#type' => 'select',
Expand Down

0 comments on commit ac12c87

Please sign in to comment.