From 409848a4b3873fb0512ae17135b9794030eff024 Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Fri, 13 May 2016 03:21:20 -0500
Subject: WebqtlConfig.py: Constant handling

---
 wqflask/base/webqtlConfig.py                               | 7 +------
 wqflask/wqflask/marker_regression/marker_regression_gn1.py | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/base/webqtlConfig.py b/wqflask/base/webqtlConfig.py
index f62207e0..6890dacf 100755
--- a/wqflask/base/webqtlConfig.py
+++ b/wqflask/base/webqtlConfig.py
@@ -71,14 +71,9 @@ GENERATED_TEXT_DIR   = mk_dir(TMPDIR+'/generated_text/')
 GENODIR              = flat_files('genotype')+'/'
 JSON_GENODIR         = assert_dir(GENODIR+'json/')
 
-# SITENAME = 'GN'
-# PORTADDR = "http://50.16.251.170"
-# BASEHREF = '<base href="http://50.16.251.170/">'
+PORTADDR = "http://50.16.251.170"
 
 INFOPAGEHREF = '/dbdoc/%s.html'
 CGIDIR = '/webqtl/' #XZ: The variable name 'CGIDIR' should be changed to 'PYTHONDIR'
 SCRIPTFILE = 'main.py'
 
-# GLOSSARYFILE = "/glossary.html"
-# REFRESHSTR = '<meta http-equiv="refresh" content="5;url=%s' + SCRIPTFILE +'?sid=%s">'
-# REFRESHDIR = '%s' + SCRIPTFILE +'?sid=%s'
diff --git a/wqflask/wqflask/marker_regression/marker_regression_gn1.py b/wqflask/wqflask/marker_regression/marker_regression_gn1.py
index 97e4b934..4460c06d 100644
--- a/wqflask/wqflask/marker_regression/marker_regression_gn1.py
+++ b/wqflask/wqflask/marker_regression/marker_regression_gn1.py
@@ -674,7 +674,7 @@ class MarkerRegression(object):
 
         fpText.write("Source: WebQTL, The GeneNetwork (%s)\n" % webqtlConfig.PORTADDR)
         #
-        fpText.write("Site: %s\n" % webqtlConfig.SITENAME)
+        fpText.write("Site: GN\n")
         fpText.write("Page: Map Viewer\n")
         fpText.write(time.strftime("Date and Time (US Center): %b %d, %Y at %I.%M %p\n", time.localtime()))
         fpText.write("Trait ID: %s\n" % self.this_trait.name)
-- 
cgit v1.2.3