make graphviewer use Database.py

pyfpdb/GuiSessionViewer.py

@@ -25,29 +25,28 @@ from numpy import diff, nonzero
 
 import Card
 import fpdb_import
-import fpdb_db
+import Database
 import Filters
 import FpdbSQLQueries
 
 class GuiSessionViewer (threading.Thread):
     def __init__(self, config, querylist, debug=True):
-        self.debug=debug
-        self.conf=config
+        self.debug = debug
+        self.conf = config
+        self.sql = querylist
         self.MYSQL_INNODB   = 2
         self.PGSQL          = 3
         self.SQLITE         = 4
         
         # create new db connection to avoid conflicts with other threads
-        self.db = fpdb_db.fpdb_db()
-        self.db.do_connect(self.conf)
-        self.cursor=self.db.cursor
-        self.sql = querylist
+        self.db = Database.Database(self.conf, sql=self.sql)
+        self.cursor = self.db.cursor
 
         settings = {}
-        settings.update(config.get_db_parameters())
-        settings.update(config.get_tv_parameters())
-        settings.update(config.get_import_parameters())
-        settings.update(config.get_default_paths())
+        settings.update(self.conf.get_db_parameters())
+        settings.update(self.conf.get_tv_parameters())
+        settings.update(self.conf.get_import_parameters())
+        settings.update(self.conf.get_default_paths())
 
         # text used on screen stored here so that it can be configured
         self.filterText = {'handhead':'Hand Breakdown for all levels listed above'
@@ -66,7 +65,7 @@ class GuiSessionViewer (threading.Thread):
                             "Button2"  :  True
                           }
 
-        self.filters = Filters.Filters(self.db, settings, config, querylist, display = filters_display)
+        self.filters = Filters.Filters(self.db, self.conf, self.sql, display = filters_display)
         self.filters.registerButton2Name("_Refresh")
         self.filters.registerButton2Callback(self.refreshStats)
 
@@ -195,7 +194,7 @@ class GuiSessionViewer (threading.Thread):
         flags = [True]
         self.addTable(vbox1, 'playerDetailedStats', flags, playerids, sitenos, limits, seats)
 
-        self.db.db.commit()
+        self.db.rollback()
         print "Stats page displayed in %4.2f seconds" % (time() - starttime)
     #end def fillStatsFrame(self, vbox):