Merge /home/zas1024/gene

Conflicts:
	wqflask/base/data_set.py

2 files changed, 4 insertions, 3 deletions

diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index a9a8beb2..2ffa8767 100755
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -568,7 +568,7 @@ class DataSet(object):
                         and {}Freeze.Name = '{}'
                         and {}.Id = {}XRef.{}Id
                         order by {}.Id
-                        """.format(*mescape(self.type, self.type, self.type, self.name, 
+                        """.format(*mescape(self.type, self.type, self.type, self.name,
                                     dataset_type, self.type, dataset_type, dataset_type))
             else:
                 query += """
@@ -579,10 +579,10 @@ class DataSet(object):
                         """.format(*mescape(self.type, self.type, self.type, self.type,
                                    self.name, dataset_type, self.type, self.type, dataset_type))
                         
-            #print("trait data query: ", query)
+            print("trait data query: ", query)
             
             results = g.db.execute(query).fetchall()
-            #print("query results:", results)
+            print("query results:", results)
             trait_sample_data.append(results)
 
         trait_count = len(trait_sample_data[0])
diff --git a/wqflask/base/webqtlCaseData.py b/wqflask/base/webqtlCaseData.py
index 42763aed..6dc0c145 100755
--- a/wqflask/base/webqtlCaseData.py
+++ b/wqflask/base/webqtlCaseData.py
@@ -34,6 +34,7 @@ class webqtlCaseData(object):
         self.value = value                  # Trait Value
         self.variance = variance            # Trait Variance
         self.num_cases = num_cases          # Number of individuals/cases
+        self.z_score = None
         self.extra_attributes = None
         self.this_id = None   # Set a sane default (can't be just "id" cause that's a reserved word)
         self.outlier = None   # Not set to True/False until later