Changed a number of variables (riset to group, db to dataset)

Put most of the code for cisLRS and transLRS searches into the class
CisTransLrsSearch (might change this name to something else later)

Simplified escape code for searches in do_search.py

Got search_results working again after some changes

1 files changed, 3 insertions, 2 deletions

diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index d9d3a52b..633f7545 100755
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -392,8 +392,9 @@ class MrnaAssayDataSet(DataSet):
             if len(description_display) > 1 and description_display != 'N/A' and len(target_string) > 1 and target_string != 'None':
                 description_display = description_display + '; ' + target_string.strip()
 
-            # Save it for the jinja2 tablet
+            # Save it for the jinja2 template
             this_trait.description_display = description_display
+            #print("  xxxxdd [%s]: %s" % (type(this_trait.description_display), description_display))
 
             #XZ: trait_location_value is used for sorting
             trait_location_repr = 'N/A'
@@ -418,7 +419,7 @@ class MrnaAssayDataSet(DataSet):
     where ProbeSetXRef.ProbeSetFreezeId = %s and
     ProbeSet.Id = ProbeSetXRef.ProbeSetId and
     ProbeSet.Name = '%s'
-            """ % (self.db_conn.escape_string(str(this_trait.db.id)),
+            """ % (self.db_conn.escape_string(str(this_trait.dataset.id)),
                    self.db_conn.escape_string(this_trait.name)))
 
             print("query is:", pf(query))