diff options
author | Zachary Sloan | 2013-07-18 17:39:10 -0500 |
---|---|---|
committer | Zachary Sloan | 2013-07-18 17:39:10 -0500 |
commit | 0fcadee805a6d4a2007e57a69ab130eb9b1c1a3c (patch) | |
tree | c5c981b472d6d4754ad67cdb7e3682641fa6f35e /wqflask/base | |
parent | 89c4dc078c6371e4bc56bf8708fc7dca6c49b350 (diff) | |
download | genenetwork2-0fcadee805a6d4a2007e57a69ab130eb9b1c1a3c.tar.gz |
Added Amelie's rat data genotypes
Got human mapping mostly working
Fixed dataset dropdown menus
Diffstat (limited to 'wqflask/base')
-rwxr-xr-x | wqflask/base/trait.py | 3 | ||||
-rwxr-xr-x | wqflask/base/webqtlConfig.py | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py index 6648047c..a1e6b0d3 100755 --- a/wqflask/base/trait.py +++ b/wqflask/base/trait.py @@ -319,10 +319,9 @@ class GeneralTrait(object): #XZ: assign SQL query result to trait attributes. for i, field in enumerate(self.dataset.display_fields): - print(" mike: {} -> {} - {}".format(field, type(trait_info[i]), trait_info[i])) + #print(" mike: {} -> {} - {}".format(field, type(trait_info[i]), trait_info[i])) holder = trait_info[i] if isinstance(trait_info[i], basestring): - print("is basestring") holder = unicode(trait_info[i], "utf8") setattr(self, field, holder) diff --git a/wqflask/base/webqtlConfig.py b/wqflask/base/webqtlConfig.py index 716986db..d4511212 100755 --- a/wqflask/base/webqtlConfig.py +++ b/wqflask/base/webqtlConfig.py @@ -53,8 +53,8 @@ GNROOT = "/home/zas1024/gene/" # Will remove this and dependent items later SECUREDIR = GNROOT + 'secure/' COMMON_LIB = GNROOT + 'support/admin' HTMLPATH = GNROOT + 'web/' -PYLMM_PATH = '/home/zas1024/' -SNP_PATH = '/mnt/xvdf1/snps/' +PYLMM_PATH = '/home/zas1024/plink/' +SNP_PATH = '/home/zas1024/snps/' IMGDIR = HTMLPATH +'image/' IMAGESPATH = HTMLPATH + 'images/' UPLOADPATH = IMAGESPATH + 'upload/' |