diff options
Diffstat (limited to 'app/Controller/SearchController.php')
| -rw-r--r-- | app/Controller/SearchController.php | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/app/Controller/SearchController.php b/app/Controller/SearchController.php index e33cbb220f..946c3875cb 100644 --- a/app/Controller/SearchController.php +++ b/app/Controller/SearchController.php @@ -21,6 +21,8 @@ use Fisharebest\Webtrees\ConfigData; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Filter; use Fisharebest\Webtrees\FlashMessages; +use Fisharebest\Webtrees\Functions\FunctionsDb; +use Fisharebest\Webtrees\Functions\FunctionsPrintLists; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; @@ -238,26 +240,26 @@ class SearchController extends PageController { // Search the individuals if ($this->srindi && $query_terms) { - $this->myindilist = search_indis($query_terms, $this->search_trees); + $this->myindilist = FunctionsDb::searchIndividuals($query_terms, $this->search_trees); } // Search the fams if ($this->srfams && $query_terms) { $this->myfamlist = array_merge( - search_fams($query_terms, $this->search_trees), - search_fams_names($query_terms, $this->search_trees) + FunctionsDb::searchFamilies($query_terms, $this->search_trees), + FunctionsDb::searchFamilyNames($query_terms, $this->search_trees) ); $this->myfamlist = array_unique($this->myfamlist); } // Search the sources if ($this->srsour && $query_terms) { - $this->mysourcelist = search_sources($query_terms, $this->search_trees); + $this->mysourcelist = FunctionsDb::searchSources($query_terms, $this->search_trees); } // Search the notes if ($this->srnote && $query_terms) { - $this->mynotelist = search_notes($query_terms, $this->search_trees); + $this->mynotelist = FunctionsDb::searchNotes($query_terms, $this->search_trees); } // If only 1 item is returned, automatically forward to that item @@ -462,7 +464,7 @@ class SearchController extends PageController { Log::addSearchLog($logstring, $this->search_trees); if ($this->search_trees) { - $this->myindilist = search_indis_soundex($this->soundex, $this->lastname, $this->firstname, $this->place, $this->search_trees); + $this->myindilist = FunctionsDb::searchIndividualsPhonetic($this->soundex, $this->lastname, $this->firstname, $this->place, $this->search_trees); } else { $this->myindilist = array(); } @@ -524,16 +526,16 @@ class SearchController extends PageController { } echo '</ul>'; if (!empty($this->myindilist)) { - echo '<div id="individual-results-tab">', format_indi_table($this->myindilist), '</div>'; + echo '<div id="individual-results-tab">', FunctionsPrintLists::individualTable($this->myindilist), '</div>'; } if (!empty($this->myfamlist)) { - echo '<div id="families-results-tab">', format_fam_table($this->myfamlist), '</div>'; + echo '<div id="families-results-tab">', FunctionsPrintLists::familyTable($this->myfamlist), '</div>'; } if (!empty($this->mysourcelist)) { - echo '<div id="sources-results-tab">', format_sour_table($this->mysourcelist), '</div>'; + echo '<div id="sources-results-tab">', FunctionsPrintLists::sourceTable($this->mysourcelist), '</div>'; } if (!empty($this->mynotelist)) { - echo '<div id="notes-results-tab">', format_note_table($this->mynotelist), '</div>'; + echo '<div id="notes-results-tab">', FunctionsPrintLists::noteTable($this->mynotelist), '</div>'; } } else { // One or more search terms were specified, but no results were found. |