about summary refs log tree commit diff
path: root/wqflask/base
diff options
context:
space:
mode:
authorzsloan2015-05-22 21:47:48 +0000
committerzsloan2015-05-22 21:47:48 +0000
commit809990fca27c0bae3573c0572c384cb6f6f3325d (patch)
treeacc0c8f346629716d1f2b6d5ecda1c3226447187 /wqflask/base
parentcce1715090f0ef7579881c0b9de49b3a49f5a249 (diff)
downloadgenenetwork2-809990fca27c0bae3573c0572c384cb6f6f3325d.tar.gz
Fixed issue where correlation didn't work for human traits (and probably some others)
Diffstat (limited to 'wqflask/base')
-rwxr-xr-xwqflask/base/mrna_assay_tissue_data.py6
-rwxr-xr-xwqflask/base/trait.py2
2 files changed, 5 insertions, 3 deletions
diff --git a/wqflask/base/mrna_assay_tissue_data.py b/wqflask/base/mrna_assay_tissue_data.py
index 1a05fce7..b2c0448a 100755
--- a/wqflask/base/mrna_assay_tissue_data.py
+++ b/wqflask/base/mrna_assay_tissue_data.py
@@ -51,15 +51,15 @@ class MrnaAssayTissueData(object):
             
             query += ''' Symbol in {} group by Symbol)
                 as x inner join TissueProbeSetXRef as t on t.Symbol = x.Symbol
-                and t.Mean = x.maxmean;
+                and t.Mean = x.maxmean;http://docs.python.org/2/library/string.html?highlight=lower#string.lower
                     '''.format(in_clause)
 
         results = g.db.execute(query).fetchall()
         
         for result in results:
             symbol = result[0]
-            if symbol in gene_symbols:
-            #gene_symbols.append(symbol)
+            if symbol.lower() in [gene_symbol.lower() for gene_symbol in gene_symbols]:
+                #gene_symbols.append(symbol)
                 symbol = symbol.lower()
                 
                 self.data[symbol].gene_id = result.GeneId
diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py
index 8930c917..7f1170a9 100755
--- a/wqflask/base/trait.py
+++ b/wqflask/base/trait.py
@@ -423,6 +423,8 @@ class GeneralTrait(object):
                             if result:
                                 self.locus_chr = result[0]
                                 self.locus_mb = result[1]
+                            else:
+                                self.locus = self.locus_chr = self.locus_mb = ""
                         else:
                             self.locus = self.locus_chr = self.locus_mb = ""
                     else: