Merge branch 'master' of git://git.assembla.com/mctfpdb.git

2009-01-07 12:36:09 -05:00
parent 3f782994a9 d14dddca90
commit ff3d6c75b8
7 changed files with 238 additions and 11 deletions
@@ -66,11 +66,7 @@ class Importer:
            #TODO: Is this value in the xml file?
            self.settings['handCount'] = 0
        self.fdb = fpdb_db.fpdb_db()   # sets self.fdb.db self.fdb.cursor and self.fdb.sql
-        self.fdb.connect(self.settings['db-backend'],
-                         self.settings['db-host'],
-                         self.settings['db-databaseName'],
-                         self.settings['db-user'], 
-                         self.settings['db-password'])
+        self.fdb.do_connect(self.config)

    #Set functions
    def setCallHud(self, value):