aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--misc/notes.txt5
-rwxr-xr-xwqflask/base/data_set.py12
2 files changed, 7 insertions, 10 deletions
diff --git a/misc/notes.txt b/misc/notes.txt
index 621d95d3..92ed267b 100644
--- a/misc/notes.txt
+++ b/misc/notes.txt
@@ -1,5 +1,3 @@
-fubar
-
Clone code from git repository:
git clone http://github.com/zsloan/genenetwork.git gene
@@ -10,8 +8,7 @@ Add all files in current directory branch to be staged to be committed
git add -A
Git push to my github repository
-git push https://github.com/zsloan/genenetwork.git flask
-
+git push https://github.com/zsloan/genenetwork.git master
Get the default path being used when a command is typed:
which _______
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 07fe9cd9..1668940c 100755
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -779,14 +779,14 @@ class MrnaAssayDataSet(DataSet):
#Max LRS and its Locus location
if this_trait.lrs and this_trait.locus:
- self.cursor.execute("""
+ query = """
select Geno.Chr, Geno.Mb from Geno, Species
- where Species.Name = '%s' and
- Geno.Name = '%s' and
+ where Species.Name = '{}' and
+ Geno.Name = '{}' and
Geno.SpeciesId = Species.Id
- """ % (species, this_trait.locus))
- result = self.cursor.fetchone()
-
+ """.format(species, this_trait.locus)
+ result = g.db.execute(query).fetchone()
+
if result:
#if result[0] and result[1]:
# lrs_chr = result[0]