Minor query updates to better handle obsolete terms

svn path=/; revision=122

diff --git a/preecej/semantic_wiki/prototyping/TermSearch_JSON.php b/preecej/semantic_wiki/prototyping/TermSearch_JSON.php
index e57cd89524ad9b9f0970414e851e5db3d9a3cef3..89c103326a2f6ba0c635f7131b4e3268bf9a8708 100644 (file)
--- 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";