diff options
| author | Pjotr Prins | 2016-10-07 10:34:32 +0000 |
|---|---|---|
| committer | Pjotr Prins | 2016-10-07 10:34:32 +0000 |
| commit | 420fd69ceda63871e9f6755112769c5615ed45f6 (patch) | |
| tree | d834a125aaf99dcd04868a8907b097445f576b4b /wqflask/base | |
| parent | 0f602fd058934feaaa37eb72d055bfcfcfc9ef8f (diff) | |
| parent | 28da8f4304f406b4eff5ad68757735a0cb524e94 (diff) | |
| download | genenetwork2-420fd69ceda63871e9f6755112769c5615ed45f6.tar.gz | |
Merge branch 'master' into chfi
Diffstat (limited to 'wqflask/base')
| -rw-r--r-- | wqflask/base/data_set.py | 3 | ||||
| -rw-r--r-- | wqflask/base/trait.py | 2 | ||||
| -rw-r--r-- | wqflask/base/webqtlCaseData.py | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py index 1b4e1195..fddfce58 100644 --- a/wqflask/base/data_set.py +++ b/wqflask/base/data_set.py @@ -107,7 +107,8 @@ Publish or ProbeSet. E.g. else: new_type = "ProbeSet" self.datasets[short_dataset_name] = new_type - logger.info("datasets",self.datasets) + # Set LOG_LEVEL_DEBUG=5 to see the following: + logger.debugf(5,"datasets",self.datasets) def __call__(self, name): return self.datasets[name] diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py index 900e050c..32032ba7 100644 --- a/wqflask/base/trait.py +++ b/wqflask/base/trait.py @@ -363,7 +363,7 @@ class GeneralTrait(object): FROM Homologene, Species, InbredSet WHERE - Homologene.GeneId =%s AND + Homologene.GeneId ='%s' AND InbredSet.Name = '%s' AND InbredSet.SpeciesId = Species.Id AND Species.TaxonomyId = Homologene.TaxonomyId diff --git a/wqflask/base/webqtlCaseData.py b/wqflask/base/webqtlCaseData.py index 8df9939e..2f88f778 100644 --- a/wqflask/base/webqtlCaseData.py +++ b/wqflask/base/webqtlCaseData.py @@ -16,8 +16,6 @@ # Contact Drs. Robert W. Williams and Xiaodong Zhou (2010) # at rwilliams@uthsc.edu and xzhou15@uthsc.edu # -# -# # This module is used by GeneNetwork project (www.genenetwork.org) # # Created by GeneNetwork Core Team 2010/08/10 |