Switched RIL search to match new division on KnowPulse.

UofS-Pulse-Binfo · Sep 11, 2019 · a8130e1 · a8130e1
1 parent 886bd97
commit a8130e1
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/includes/RILSearch.inc b/includes/RILSearch.inc
@@ -225,13 +225,14 @@ class RILSearch extends GermplasmSearch {
     $where = [];
     $joins = [];
 
-    // -- Restrict to RILs.
-    $where[] = 's.type_id=:type_id';
-    $args[':type_id'] = 3967;
-
     // -- Remove RILL individuals.
-    if(!$filter_results['show_individiuals']) {
-      $where[] = "s.name~*'^[a-z]+-[0-9]+$'";
+    if($filter_results['show_individiuals']) {
+      $where[] = 's.type_id IN (:type_id)';
+      $args[':type_id'] = [3967, 6559];
+    }
+    else {
+      $where[] = 's.type_id=:type_id';
+      $args[':type_id'] = 3967;
     }
 
     // -- Genus.