From 52ac4b6e1c014801080cbbcad53df868058d2657 Mon Sep 17 00:00:00 2001
From: Zachary Sloan
Date: Thu, 20 Jun 2013 22:08:45 +0000
Subject: Added explanation of pushing to github to notes

---
 misc/notes.txt | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'misc/notes.txt')

diff --git a/misc/notes.txt b/misc/notes.txt
index 01f2c96d..67133d4a 100644
--- a/misc/notes.txt
+++ b/misc/notes.txt
@@ -7,6 +7,9 @@ git pull origin flask(or whatever the branch is)
 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
+
 
 Get the default path being used when a command is typed:
 which _______
-- 
cgit v1.2.3


From aec9cbf92c04820392a80f3fd1a7fb30d21f0d8c Mon Sep 17 00:00:00 2001
From: Zachary Sloan
Date: Thu, 20 Jun 2013 22:53:25 +0000
Subject: Added fubar to the top of notes.txt

---
 misc/notes.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'misc/notes.txt')

diff --git a/misc/notes.txt b/misc/notes.txt
index 67133d4a..621d95d3 100644
--- a/misc/notes.txt
+++ b/misc/notes.txt
@@ -1,3 +1,5 @@
+fubar
+
 Clone code from git repository:
 git clone http://github.com/zsloan/genenetwork.git gene 
 
-- 
cgit v1.2.3


From 1b227abd09eabc9ff60e4b9cb393d66ed90f2cf5 Mon Sep 17 00:00:00 2001
From: Zachary Sloan
Date: Thu, 20 Jun 2013 23:01:42 +0000
Subject: Removed foobar from top of notes.txt

---
 misc/notes.txt | 2 --
 1 file changed, 2 deletions(-)

(limited to 'misc/notes.txt')

diff --git a/misc/notes.txt b/misc/notes.txt
index 621d95d3..67133d4a 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 
 
-- 
cgit v1.2.3


From a0a1d8b70e02871328fb044c7ae190f805b0a04e Mon Sep 17 00:00:00 2001
From: Zachary Sloan
Date: Fri, 21 Jun 2013 20:58:12 +0000
Subject: Fixed bug where cursor was still being used in query

---
 misc/notes.txt           |  3 +--
 wqflask/base/data_set.py | 12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'misc/notes.txt')

diff --git a/misc/notes.txt b/misc/notes.txt
index 67133d4a..92ed267b 100644
--- a/misc/notes.txt
+++ b/misc/notes.txt
@@ -8,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]
-- 
cgit v1.2.3