aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xweb/webqtl/base/webqtlConfigLocal.py10
-rwxr-xr-xwqflask/base/webqtlConfigLocal.py11
-rwxr-xr-xwqflask/wqflask/dataSharing/SharingInfoPage.py4
-rw-r--r--wqflask/wqflask/views.py1
4 files changed, 15 insertions, 11 deletions
diff --git a/web/webqtl/base/webqtlConfigLocal.py b/web/webqtl/base/webqtlConfigLocal.py
index dc86bb10..1f986aa7 100755
--- a/web/webqtl/base/webqtlConfigLocal.py
+++ b/web/webqtl/base/webqtlConfigLocal.py
@@ -3,15 +3,15 @@
#########################################
MYSQL_SERVER = 'localhost'
-DB_NAME = 'db_webqtl'
-DB_USER = 'webqtl'
+DB_NAME = 'db_webqtl_zas1024'
+DB_USER = 'webqtlupd'
DB_PASSWD = 'webqtl'
MYSQL_UPDSERVER = 'localhost'
-DB_UPDNAME = 'db_webqtl'
-DB_UPDUSER = 'webqtl'
+DB_UPDNAME = 'db_webqtl_zas1024'
+DB_UPDUSER = 'webqtlupd'
DB_UPDPASSWD = 'webqtl'
-GNROOT = '/gnshare/gn/'
+GNROOT = '/home/zas1024/gn/'
PythonPath = '/usr/bin/python'
PIDDLE_FONT_PATH = '/usr/lib/python2.4/site-packages/piddle/truetypefonts/'
diff --git a/wqflask/base/webqtlConfigLocal.py b/wqflask/base/webqtlConfigLocal.py
index 35da73c2..5aab48ac 100755
--- a/wqflask/base/webqtlConfigLocal.py
+++ b/wqflask/base/webqtlConfigLocal.py
@@ -3,16 +3,17 @@
#########################################
MYSQL_SERVER = 'localhost'
-DB_NAME = 'db_webqtl'
+DB_NAME = 'db_webqtl_zas1024'
DB_USER = 'webqtlupd'
-DB_PASSWD = 'zhou&yan@ut'
+DB_PASSWD = 'webqtl'
MYSQL_UPDSERVER = 'localhost'
-DB_UPDNAME = 'db_webqtl'
+DB_UPDNAME = 'db_webqtl_zas1024'
DB_UPDUSER = 'webqtlupd'
-DB_UPDPASSWD = 'zhou&yan@ut'
+DB_UPDPASSWD = 'webqtl'
-GNROOT = '/gnshare/gn/'
+GNROOT = '/home/zas1024/gn/'
+ROOT_URL = 'http://alexandria.uthsc.edu:91/'
PythonPath = '/usr/bin/python'
PIDDLE_FONT_PATH = '/usr/lib/python2.4/site-packages/piddle/truetypefonts/'
diff --git a/wqflask/wqflask/dataSharing/SharingInfoPage.py b/wqflask/wqflask/dataSharing/SharingInfoPage.py
index 5503ff74..7ad44440 100755
--- a/wqflask/wqflask/dataSharing/SharingInfoPage.py
+++ b/wqflask/wqflask/dataSharing/SharingInfoPage.py
@@ -28,6 +28,8 @@ from __future__ import print_function, division
from pprint import pformat as pf
+import urlparse
+
import flask
from base.templatePage import templatePage
@@ -54,7 +56,7 @@ class SharingInfoPage(templatePage):
sql = "select GN_AccesionId from InfoFiles where InfoPageName = %s"
cursor.execute(sql, InfoPageName)
GN_AccessionId = cursor.fetchone()
- self.redirect_url = "http://23.21.59.238:5001/data_sharing?GN_AccessionId=%s" % GN_AccessionId
+ self.redirect_url = urlparse.urljoin(webqtlConfig.ROOT_URL, "/data_sharing?GN_AccessionId=%s" % GN_AccessionId)
#self.redirect_url = flask.url_for('data_sharing', GN_AccessionId=GN_AccessionId[0])
print("set self.redirect_url")
#print("before redirect")
diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py
index 06d8227c..852e6a16 100644
--- a/wqflask/wqflask/views.py
+++ b/wqflask/wqflask/views.py
@@ -19,6 +19,7 @@ print("latest blue")
@app.route("/")
def index_page():
+ print("Sending index_page")
return render_template("index_page.html")