# HG changeset patch
# User fabien@tzone.org
# Date 1230700045 18000
# Node ID d79722064d8d044349d7b0096b662e033a5ec0f0
# Parent  c1f1491f098cf7f9dd50cd7520a151fa88bf1000# Parent  a0aa025ee6a205f8a4f9352729e7d9782c1d5bc5
Merge previous changeset and ensure everything seems to work.

diff -r c1f1491f098c -r d79722064d8d lib/my_db.py
--- a/lib/my_db.py	Wed Dec 31 00:00:09 2008 -0500
+++ b/lib/my_db.py	Wed Dec 31 00:07:25 2008 -0500
@@ -9,15 +9,16 @@
 
 class MyDbConnexion:
 	def __init__(self, config):
+		self.userid = None 
 		self.cnx = pgdb.connect(database = config.db_name,
 			host = config.db_host+':%d'%config.db_port,
 			user = config.db_user, password = config.db_passwd)
 		self.crs = self.cnx.cursor();
 	def connect_user(self, name):
 		if (self.userid == None):
-			self.userid = self._get_user_id(username)
+			self.userid = self._get_user_id(name)
 			if self.userid == None:
-				self.userid = self._create_user(username)
+				self.userid = self._create_user(name)
 			else:
 				self.userid = self.userid[0]
 		return self.userid
@@ -67,7 +68,7 @@
 			DELETE FROM preferences WHERE userid = %d;
 			DELETE FROM keywords WHERE userid = %d;
 			DELETE FROM db_sequence WHERE userid = %d;
-			""" % ((userid,)*5))
+			""" % ((userid,)*6))
 		self.cnx.commit()
 	def get_preferences(self):
 		self.crs.execute("""
@@ -398,4 +399,7 @@
 
 def connect(config, username):
 	db = MyDbConnexion(config)
-	db.connect_user(username)
+	userid = db.connect_user(username)
+	if userid == None:
+		raise "Can't connect user!"
+	return db
diff -r c1f1491f098c -r d79722064d8d lib/templates.py
--- a/lib/templates.py	Wed Dec 31 00:00:09 2008 -0500
+++ b/lib/templates.py	Wed Dec 31 00:07:25 2008 -0500
@@ -1,7 +1,7 @@
 from htmltmpl import TemplateManager, TemplateProcessor
 from urlparse import urljoin
 from os import environ, path
-from config import template_dir
+from config import CONFIG
 
 def get_curl():
 	url = "http"
@@ -15,7 +15,7 @@
 class Template:
 	def __init__(self, template, prefs, status = "msg", status_msg = ""):
 		self.tproc = TemplateProcessor()
-		self.tmpl = TemplateManager().prepare(path.join(template_dir, template))
+		self.tmpl = TemplateManager().prepare(path.join(CONFIG.template_dir, template))
     		self.set("remote_user", prefs["fullname"])
     		self.set("kw_size", prefs['keywords_box'])
     		self.set("kw_sort", prefs['keywords_sort'])
diff -r c1f1491f098c -r d79722064d8d tests/lib/test_my_db.py
--- a/tests/lib/test_my_db.py	Wed Dec 31 00:00:09 2008 -0500
+++ b/tests/lib/test_my_db.py	Wed Dec 31 00:07:25 2008 -0500
@@ -1,10 +1,6 @@
-if __name__ == '__main__':
-    import sys
-    sys.path.insert(0, "../../lib")
-
+import testconfig
 import unittest
 import my_db
-import testconfig
 import pgdb
 
 class TestMyDbConnexion(unittest.TestCase):
@@ -19,22 +15,25 @@
     
     def tearDown(self):
         " Tear down the test-db environment"
-        self.db.delete_user('test')
+        self.db.delete_user(self.db.userid)
         pass
 
     def testConnect(self):
-        self.assertNotEqual(db, None)
-        self.assertNotEqual(db.userid, -1)
+        self.assertNotEqual(self.db, None)
+        self.assertNotEqual(self.db.userid, -1)
 
     def testGetPreferences(self):
         prefs = self.db.get_preferences()
-        self.assertEqual(prefs, self.prefs)
+	keys = prefs.keys()
+	keys.sort()
+	expKeys = self.prefs.keys()
+	expKeys.sort()
+        self.assertEqual(expKeys, keys)
 
     def testSetPreferences(self):
         self.db.set_preferences(self.prefs)
         prefs = self.db.get_preferences()
         self.assertEqual(prefs, self.prefs)
 
-
 if __name__ == '__main__':
     unittest.main()