Merge branch 'flask' of http://github.com/zsloan/genenetwork

2 files changed, 14 insertions, 5 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/web/webqtl/base/webqtlTrait.py b/web/webqtl/base/webqtlTrait.py
index f5051e45..2469504f 100644
--- a/web/webqtl/base/webqtlTrait.py
+++ b/web/webqtl/base/webqtlTrait.py
@@ -9,6 +9,10 @@ from dbFunction import webqtlDatabaseFunction
 from utility import webqtlUtil
 
 
+from __future__ import print_function, division
+
+from pprint import pformat as pf
+
 class webqtlTrait:
 	"""
 	Trait class defines a trait in webqtl, can be either Microarray, 	
@@ -215,6 +219,9 @@ class webqtlTrait:
 	def retrieveData(self, strainlist=[]):
 		assert self.db and self.cursor
 
+		debug_file = open("/home/zas1024/gn/web/traitlist_debug.txt", "w")
+		debug_file.write("strianlist is:" + strainlist + "\n")
+
 		if self.db.type == 'Temp':
 			query = '''
 				SELECT 
@@ -341,6 +348,8 @@ class webqtlTrait:
 			#end if
 		else:
 			pass
+
+		debug_file.write("self.data is:", pf(self.data) + "\n")
 			
 	def keys(self):
 		return self.__dict__.keys()