From 00b58b9fc54b9ae63d91033d9edcf944a871fb4d Mon Sep 17 00:00:00 2001 From: preecej Date: Tue, 19 Jul 2011 22:42:53 +0000 Subject: [PATCH] Minor query updates to better handle obsolete terms svn path=/; revision=122 --- preecej/semantic_wiki/prototyping/TermSearch_JSON.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/preecej/semantic_wiki/prototyping/TermSearch_JSON.php b/preecej/semantic_wiki/prototyping/TermSearch_JSON.php index e57cd89..89c1033 100644 --- a/preecej/semantic_wiki/prototyping/TermSearch_JSON.php +++ b/preecej/semantic_wiki/prototyping/TermSearch_JSON.php @@ -38,6 +38,7 @@ if(isset($_GET['user']) && ($_GET['user']) == 'paw') { . " LEFT JOIN term_definition d ON d.term_id = t.id" . " WHERE t.$field LIKE '%$qval%'" . " AND t.term_type in ('plant_anatomy','plant_growth_and_development_stage')" + . " AND t.is_obsolete = 0" . " AND UCASE(t.name) NOT LIKE 'OBSOLETE%'" . " AND UCASE(d.term_definition) NOT LIKE 'OBSOLETE%'" . " ORDER BY name LIMIT $number_of_terms"; @@ -68,6 +69,7 @@ if(isset($_GET['user']) && ($_GET['user']) == 'paw') { . " LEFT JOIN term_definition d ON d.term_id = t.id" . " WHERE t.name = '$qval'" . " AND t.term_type in ('plant_anatomy','plant_growth_and_development_stage')" + . " AND t.is_obsolete = 0" . " AND UCASE(t.name) NOT LIKE 'OBSOLETE%'" . " AND UCASE(d.term_definition) NOT LIKE 'OBSOLETE%'" . " ORDER BY t.name LIMIT 1"; -- 2.34.1