From 51e120ae25a7955a895d5e79d5ee459764a331ea Mon Sep 17 00:00:00 2001
From: Zachary Sloan
Date: Tue, 2 Apr 2013 19:36:30 +0000
Subject: pylmm code is running for human data (plink .bed genotype files)

---
 wqflask/base/data_set.py     | 5 +++++
 wqflask/base/webqtlConfig.py | 1 +
 2 files changed, 6 insertions(+)

(limited to 'wqflask/base')

diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 71efc9b2..17881e53 100755
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -323,6 +323,11 @@ class PhenotypeDataSet(DataSet):
                     description = this_trait.pre_publication_description
             this_trait.description_display = description
 
+            try:
+                this_trait.description_display.decode('ascii')
+            except Exception:
+                this_trait.description_display = this_trait.description_display.decode('utf-8')
+
             if not this_trait.year.isdigit():
                 this_trait.pubmed_text = "N/A"
 
diff --git a/wqflask/base/webqtlConfig.py b/wqflask/base/webqtlConfig.py
index d05fa6e0..1845c749 100755
--- a/wqflask/base/webqtlConfig.py
+++ b/wqflask/base/webqtlConfig.py
@@ -52,6 +52,7 @@ ENSEMBLETRANSCRIPT_URL="http://useast.ensembl.org/Mus_musculus/Lucene/Details?sp
 SECUREDIR = GNROOT + 'secure/'
 COMMON_LIB = GNROOT + 'support/admin'
 HTMLPATH = GNROOT + 'web/'
+PYLMM_PATH = HTMLPATH + 'plink/'
 IMGDIR = HTMLPATH +'image/'
 IMAGESPATH = HTMLPATH + 'images/'
 UPLOADPATH = IMAGESPATH + 'upload/'
-- 
cgit v1.2.3