about summary refs log tree commit diff
path: root/wqflask/base
diff options
context:
space:
mode:
authorzsloan2015-10-12 20:57:45 +0000
committerzsloan2015-10-12 20:57:45 +0000
commit0310301b30c59eca45235cd1bd1ff8e15923950a (patch)
treed143662ecceac5e05bd06afee4c87b2beb88859b /wqflask/base
parente9727c576312c22e3fdc0a7ba153c414ad8e98da (diff)
downloadgenenetwork2-0310301b30c59eca45235cd1bd1ff8e15923950a.tar.gz
Changed the location filter for correlation page
Diffstat (limited to 'wqflask/base')
-rwxr-xr-xwqflask/base/data_set.py2
-rwxr-xr-xwqflask/base/mrna_assay_tissue_data.py5
2 files changed, 4 insertions, 3 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 427fd991..d6a46c2e 100755
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -1257,7 +1257,7 @@ class MrnaAssayDataSet(DataSet):
                             Strain.Name
                     """ % (escape(trait), escape(self.name))
         results = g.db.execute(query).fetchall()
-        print("RETRIEVED RESULTS HERE:", results)
+        #print("RETRIEVED RESULTS HERE:", results)
         return results
     
     
diff --git a/wqflask/base/mrna_assay_tissue_data.py b/wqflask/base/mrna_assay_tissue_data.py
index b2c0448a..54a7ce8e 100755
--- a/wqflask/base/mrna_assay_tissue_data.py
+++ b/wqflask/base/mrna_assay_tissue_data.py
@@ -40,7 +40,6 @@ class MrnaAssayTissueData(object):
         # with highest mean value
         # Due to the limit size of TissueProbeSetFreezeId table in DB,
         # performance of inner join is acceptable.MrnaAssayTissueData(gene_symbols=symbol_list)
-        #print("len(gene_symbols): ", len(gene_symbols))
         if len(gene_symbols) == 0:
             query +=  '''Symbol!='' and Symbol Is Not Null group by Symbol)
                 as x inner join TissueProbeSetXRef as t on t.Symbol = x.Symbol
@@ -49,9 +48,11 @@ class MrnaAssayTissueData(object):
         else:
             in_clause = db_tools.create_in_clause(gene_symbols)
             
+            #ZS: This was in the query, not sure why: http://docs.python.org/2/library/string.html?highlight=lower#string.lower
+
             query += ''' Symbol in {} group by Symbol)
                 as x inner join TissueProbeSetXRef as t on t.Symbol = x.Symbol
-                and t.Mean = x.maxmean;http://docs.python.org/2/library/string.html?highlight=lower#string.lower
+                and t.Mean = x.maxmean;
                     '''.format(in_clause)
 
         results = g.db.execute(query).fetchall()