diff options
Diffstat (limited to 'wqflask/base')
| -rwxr-xr-x | wqflask/base/data_set.py | 2 | ||||
| -rwxr-xr-x | wqflask/base/trait.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py index 4c5c46a5..0c7676c4 100755 --- a/wqflask/base/data_set.py +++ b/wqflask/base/data_set.py @@ -809,7 +809,7 @@ class MrnaAssayDataSet(DataSet): this_trait.LRS_location_repr = 'Chr %s: %.4f Mb' % (lrs_chr, float(lrs_mb)) - def convert_location_to_value(chromosome, mb): + def convert_location_to_value(self, chromosome, mb): try: location_value = int(chromosome)*1000 + float(mb) except ValueError: diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py index 5fde114f..53f41779 100755 --- a/wqflask/base/trait.py +++ b/wqflask/base/trait.py @@ -23,7 +23,7 @@ class GeneralTrait(object): """ def __init__(self, **kw): - print("in GeneralTrait") + #print("in GeneralTrait") self.dataset = kw.get('dataset') # database name self.name = kw.get('name') # Trait ID, ProbeSet ID, Published ID, etc. self.cellid = kw.get('cellid') @@ -269,7 +269,7 @@ class GeneralTrait(object): escape(self.dataset.name), escape(self.name)) traitInfo = g.db.execute(query).fetchone() - print("traitInfo is: ", pf(traitInfo)) + #print("traitInfo is: ", pf(traitInfo)) #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. elif self.dataset.type == 'Geno': @@ -287,7 +287,7 @@ class GeneralTrait(object): escape(self.dataset.name), escape(self.name)) traitInfo = g.db.execute(query).fetchone() - print("traitInfo is: ", pf(traitInfo)) + #print("traitInfo is: ", pf(traitInfo)) else: #Temp type query = """SELECT %s FROM %s WHERE Name = %s """ % (string.join(self.dataset.display_fields,','), |