aboutsummaryrefslogtreecommitdiff
path: root/wqflask/base
diff options
context:
space:
mode:
Diffstat (limited to 'wqflask/base')
-rwxr-xr-xwqflask/base/data_set.py4
-rwxr-xr-xwqflask/base/trait.py8
2 files changed, 3 insertions, 9 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index c2a05c90..3fb7203d 100755
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -579,10 +579,10 @@ class DataSet(object):
""".format(*mescape(self.type, self.type, self.type, self.type,
self.name, dataset_type, self.type, self.type, dataset_type))
- print("trait data query: ", query)
+ #print("trait data query: ", query)
results = g.db.execute(query).fetchall()
- print("query results:", results)
+ #print("query results:", results)
trait_sample_data.append(results)
trait_count = len(trait_sample_data[0])
diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py
index 2bbd1f2a..71691899 100755
--- a/wqflask/base/trait.py
+++ b/wqflask/base/trait.py
@@ -315,7 +315,7 @@ class GeneralTrait(object):
ProbeSet.Name = '%s'
""" % (escape(display_fields_string),
escape(self.dataset.name),
- escape(self.name))
+ escape(str(self.name)))
trait_info = g.db.execute(query).fetchone()
#XZ, 05/08/2009: We also should use Geno.Id to find marker instead of just using Geno.Name
# to avoid the problem of same marker name from different species.
@@ -340,10 +340,6 @@ class GeneralTrait(object):
""" % (string.join(self.dataset.display_fields,','),
self.dataset.type, self.name)
trait_info = g.db.execute(query).fetchone()
-
-
- #self.cursor.execute(query)
- #trait_info = self.cursor.fetchone()
if trait_info:
self.haveinfo = True
@@ -440,8 +436,6 @@ class GeneralTrait(object):
PublishXRef.InbredSetId = PublishFreeze.InbredSetId AND
PublishFreeze.Id =%s
""", (self.name, self.dataset.id)).fetchone()
- #self.cursor.execute(query)
- #trait_qtl = self.cursor.fetchone()
if trait_qtl:
self.locus, self.lrs = trait_qtl
else: