diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index f3d74a9a..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.pyc
-*~
diff --git a/pyfpdb/AbsoluteToFpdb.py b/pyfpdb/AbsoluteToFpdb.py
index 503c1f4e..796e5e6e 100644
--- a/pyfpdb/AbsoluteToFpdb.py
+++ b/pyfpdb/AbsoluteToFpdb.py
@@ -26,6 +26,12 @@ from HandHistoryConverter import *
 # Class for converting Absolute HH format.
 
 class Absolute(HandHistoryConverter):
+
+    # Class Variables
+    sitename = "Absolute"
+    filetype = "text"
+    codepage = "cp1252"
+    siteid   = 8
     
     # Static regexes
     re_SplitHands  = re.compile(r"\n\n\n+")
@@ -35,7 +41,7 @@ class Absolute(HandHistoryConverter):
 #Seat 6 - FETS63 ($0.75 in chips)
 #Board [10s 5d Kh Qh 8c]
 
-    re_GameInfo     = re.compile(ur"^Stage #([0-9]+): (?P<GAME>Holdem|)  (?P<LIMIT>No Limit|) (?P<CURRENCY>\$| €|)(?P<BB>[0-9]*[.0-9]+)", re.MULTILINE)
+    re_GameInfo     = re.compile(ur"^Stage #([0-9]+): (?P<GAME>Holdem|)  (?P<LIMIT>No Limit|Pot Limit|Normal) (?P<CURRENCY>\$| €|)(?P<BB>[0-9]*[.0-9]+)", re.MULTILINE)
     re_HandInfo     = re.compile(ur"^Stage #(?P<HID>[0-9]+): .*(?P<DATETIME>\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d).*\nTable: (?P<TABLE>.*) \(Real Money\)", re.MULTILINE)
     re_Button       = re.compile(ur"Seat #(?P<BUTTON>[0-9]) is the ?[dead]* dealer$", re.MULTILINE) # TODO: that's not the right way to match for "dead" dealer is it?
     re_PlayerInfo   = re.compile(ur"^Seat (?P<SEAT>[0-9]) - (?P<PNAME>.*) \((?:\$| €|)(?P<CASH>[0-9]*[.0-9]+) in chips\)", re.MULTILINE)
@@ -48,24 +54,6 @@ class Absolute(HandHistoryConverter):
 #    re_Board       = re.compile(ur"\[ (?P<CARDS>.+) \]")
     
     
-    def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True, debugging=False, index=0):
-        """\
-in_path   (default '-' = sys.stdin)
-out_path  (default '-' = sys.stdout)
-follow :  whether to tail -f the input
-autostart: whether to run the thread (or you can call start() yourself)
-debugging: if False, pass on partially supported game types. If true, have a go and error..."""
-        #print "DEBUG: XXXXXXXXXXXXXXX"
-        HandHistoryConverter.__init__(self, in_path, out_path, sitename="Absolute", follow=follow, index=index)
-        logging.info("Initialising Absolute converter class")
-        self.filetype = "text"
-        self.codepage = "cp1252"
-        self.siteId   = 8 # Needs to match id entry in Sites database
-        self.debugging = debugging
-        if autostart:
-            self.start()
-            # otherwise you need to call start yourself.
-
     def compilePlayerRegexs(self, hand):
         players = set([player[1] for player in hand.players])
         if not players <= self.compiledPlayers: # x <= y means 'x is subset of y'
@@ -124,7 +112,7 @@ or None if we fail to get the info """
         mg = m.groupdict()
         
         # translations from captured groups to our info strings
-        limits = { 'No Limit':'nl', 'PL':'pl', '':'fl' }
+        limits = { 'No Limit':'nl', 'Pot Limit':'pl', 'Normal':'fl' }
         games = {              # base, category
                   "Holdem" : ('hold','holdem'), 
                     'Omaha' : ('hold','omahahi'), 
diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py
index 43af4ab6..223ef8b2 100755
--- a/pyfpdb/Configuration.py
+++ b/pyfpdb/Configuration.py
@@ -79,11 +79,17 @@ class Layout:
 
 class Site:
     def __init__(self, node):
+        def normalizePath(path):
+            "Normalized existing pathes"
+            if os.path.exists(path):
+                return os.path.abspath(path)
+            return path
+        
         self.site_name    = node.getAttribute("site_name")
         self.table_finder = node.getAttribute("table_finder")
         self.screen_name  = node.getAttribute("screen_name")
-        self.site_path    = node.getAttribute("site_path")
-        self.HH_path      = node.getAttribute("HH_path")
+        self.site_path    = normalizePath(node.getAttribute("site_path"))
+        self.HH_path      = normalizePath(node.getAttribute("HH_path"))
         self.decoder      = node.getAttribute("decoder")
         self.hudopacity   = node.getAttribute("hudopacity")
         self.hudbgcolor   = node.getAttribute("bgcolor")
@@ -97,6 +103,8 @@ class Site:
         self.xpad         = node.getAttribute("xpad")
         self.ypad         = node.getAttribute("ypad")
         self.layout       = {}
+            
+        print self.site_name, self.HH_path
 
         for layout_node in node.getElementsByTagName('layout'):
             lo = Layout(layout_node)
@@ -310,7 +318,7 @@ class Config:
         try:
             log.info("Reading configuration file %s" % (file))
             doc = xml.dom.minidom.parse(file)
-        except:
+        except: 
             log.error("Error parsing %s.  See error log file." % (file))
             traceback.print_exc(file=sys.stderr)
             print "press enter to continue"
@@ -607,8 +615,8 @@ class Config:
             path = os.path.expanduser(self.supported_sites[site].HH_path)
             assert(os.path.isdir(path) or os.path.isfile(path)) # maybe it should try another site?
             paths['hud-defaultPath'] = paths['bulkImport-defaultPath'] = path
-        except:
-            paths['hud-defaultPath'] = paths['bulkImport-defaultPath'] = "default"
+        except AssertionError: 
+            paths['hud-defaultPath'] = paths['bulkImport-defaultPath'] = "** ERROR DEFAULT PATH IN CONFIG DOES NOT EXIST **"
         return paths
     
     def get_frames(self, site = "PokerStars"):
diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 0cbafbd1..4b8d0591 100755
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -1052,6 +1052,22 @@ class Database:
             print "Error during fdb.lock_for_insert:", str(sys.exc_value)
     #end def lock_for_insert
 
+    def getGameTypeId(self, siteid, game):
+        c = self.get_cursor()
+        #FIXME: Fixed for NL at the moment
+        c.execute(self.sql.query['getGametypeNL'], (siteid, game['type'], game['category'], game['limitType'], 
+                        int(Decimal(game['sb'])*100), int(Decimal(game['bb'])*100)))
+        tmp = c.fetchone()
+        if (tmp == None):
+            hilo = "h"
+            if game['category'] in ['studhilo', 'omahahilo']:
+                hilo = "s"
+            elif game['category'] in ['razz','27_3draw','badugi']:
+                hilo = "l"
+            tmp  = self.insertGameTypes( (siteid, game['type'], game['base'], game['category'], game['limitType'], hilo,
+                                    int(Decimal(game['sb'])*100), int(Decimal(game['bb'])*100), 0, 0) )
+        return tmp[0]
+
     def getSqlPlayerIDs(self, pnames, siteid):
         result = {}
         if(self.pcache == None):
@@ -1165,11 +1181,16 @@ class Database:
             boardcard2, 
             boardcard3, 
             boardcard4, 
-            boardcard5
+            boardcard5,
+            street1Pot,
+            street2Pot,
+            street3Pot,
+            street4Pot,
+            showdownPot
              ) 
              VALUES 
               (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s,
-                %s, %s)"""
+               %s, %s, %s, %s, %s, %s, %s)"""
 #---            texture,
 #--            playersVpi,
 #--            playersAtStreet1, 
@@ -1182,11 +1203,6 @@ class Database:
 #--            street2Raises,
 #--            street3Raises,
 #--            street4Raises,
-#--            street1Pot,
-#--            street2Pot,
-#--            street3Pot,
-#--            street4Pot,
-#--            showdownPot
 #--            seats, 
 
         q = q.replace('%s', self.sql.query['placeholder'])
@@ -1205,7 +1221,7 @@ class Database:
                 p['boardcard2'], 
                 p['boardcard3'], 
                 p['boardcard4'], 
-                p['boardcard5'])
+                p['boardcard5'],
 #                hudCache['playersVpi'], 
 #                hudCache['playersAtStreet1'], 
 #                hudCache['playersAtStreet2'],
@@ -1217,12 +1233,12 @@ class Database:
 #                hudCache['street2Raises'],
 #                hudCache['street3Raises'], 
 #                hudCache['street4Raises'], 
-#                hudCache['street1Pot'],
-#                hudCache['street2Pot'], 
-#                hudCache['street3Pot'],
-#                hudCache['street4Pot'],
-#                hudCache['showdownPot']
-        )
+                p['street1Pot'],
+                p['street2Pot'],
+                p['street3Pot'],
+                p['street4Pot'],
+                p['showdownPot']
+        ))
         #return getLastInsertId(backend, conn, cursor)
     # def storeHand
 
diff --git a/pyfpdb/Exceptions.py b/pyfpdb/Exceptions.py
index 45ba2b07..61c1d7a1 100644
--- a/pyfpdb/Exceptions.py
+++ b/pyfpdb/Exceptions.py
@@ -1,6 +1,8 @@
-
 class FpdbError(Exception):
-    pass
+    def __init__(self, value):
+        self.value = value
+    def __str__(self):
+        return repr(self.value)
 
 class FpdbParseError(FpdbError): 
     def __init__(self,value='',hid=''):
@@ -13,8 +15,4 @@ class FpdbParseError(FpdbError):
             return repr(self.value)
 
 class DuplicateError(FpdbError):
-    def __init__(self, value):
-        self.value = value
-    def __str__(self):
-        return repr(self.value)
-
+    pass
diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 19a666f1..2e8725ff 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -29,11 +29,12 @@ class Fulltilt(HandHistoryConverter):
     
     sitename = "Fulltilt"
     filetype = "text"
-    codepage = "cp1252"
+    codepage = "utf-16"
     siteId   = 1 # Needs to match id entry in Sites database
 
     # Static regexes
-    re_GameInfo     = re.compile('''(?:(?P<TOURNAMENT>.+)\s\((?P<TOURNO>\d+)\),\s)?
+    re_GameInfo     = re.compile('''.*\#(?P<HID>[0-9]+):\s
+                                    (?:(?P<TOURNAMENT>.+)\s\((?P<TOURNO>\d+)\),\s)?
                                     .+
                                     -\s(?P<CURRENCY>\$|)?
                                     (?P<SB>[.0-9]+)/
@@ -56,7 +57,7 @@ class Fulltilt(HandHistoryConverter):
                                     (?:.*?\n(?P<CANCELLED>Hand\s\#(?P=HID)\shas\sbeen\scanceled))?
                                  ''', re.VERBOSE|re.DOTALL)
     re_Button       = re.compile('^The button is in seat #(?P<BUTTON>\d+)', re.MULTILINE)
-    re_PlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\$?(?P<CASH>[,.0-9]+)\)$', re.MULTILINE)
+    re_PlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\$?(?P<CASH>[,.0-9]+)\)', re.MULTILINE)
     re_Board        = re.compile(r"\[(?P<CARDS>.+)\]")
 
 # These regexes are for FTP only
@@ -66,6 +67,7 @@ class Fulltilt(HandHistoryConverter):
 
     mixes = { 'HORSE': 'horse', '7-Game': '7game', 'HOSE': 'hose', 'HA': 'ha'}
 
+
     def compilePlayerRegexs(self,  hand):
         players = set([player[1] for player in hand.players])
         if not players <= self.compiledPlayers: # x <= y means 'x is subset of y'
@@ -81,7 +83,7 @@ class Fulltilt(HandHistoryConverter):
             self.re_HeroCards        = re.compile(r"^Dealt to %s(?: \[(?P<OLDCARDS>.+?)\])?( \[(?P<NEWCARDS>.+?)\])" % player_re, re.MULTILINE)
             self.re_Action           = re.compile(r"^%s(?P<ATYPE> bets| checks| raises to| completes it to| calls| folds)( \$?(?P<BET>[.,\d]+))?" % player_re, re.MULTILINE)
             self.re_ShowdownAction   = re.compile(r"^%s shows \[(?P<CARDS>.*)\]" % player_re, re.MULTILINE)
-            self.re_CollectPot       = re.compile(r"^Seat (?P<SEAT>[0-9]+): %s (\(button\) |\(small blind\) |\(big blind\) )?(collected|showed \[.*\] and won) \(\$(?P<POT>[.\d]+)\)(, mucked| with.*)" % player_re, re.MULTILINE)
+            self.re_CollectPot       = re.compile(r"^Seat (?P<SEAT>[0-9]+): %s (\(button\) |\(small blind\) |\(big blind\) )?(collected|showed \[.*\] and won) \(\$?(?P<POT>[.,\d]+)\)(, mucked| with.*)" % player_re, re.MULTILINE)
             self.re_SitsOut          = re.compile(r"^%s sits out" % player_re, re.MULTILINE)
             self.re_ShownCards       = re.compile(r"^Seat (?P<SEAT>[0-9]+): %s \(.*\) showed \[(?P<CARDS>.*)\].*" % player_re, re.MULTILINE)
 
@@ -110,7 +112,7 @@ class Fulltilt(HandHistoryConverter):
         if not m: 
             return None
         mg = m.groupdict()
-
+        print mg
         # translations from captured groups to our info strings
         limits = { 'No Limit':'nl', 'Pot Limit':'pl', 'Limit':'fl' }
         games = {              # base, category
@@ -132,27 +134,9 @@ class Fulltilt(HandHistoryConverter):
         if mg['TOURNO'] == None:  info['type'] = "ring"
         else:                     info['type'] = "tour"
         # NB: SB, BB must be interpreted as blinds or bets depending on limit type.
-        if info['type'] == "tour": return None # importer is screwed on tournies, pass on those hands so we don't interrupt other autoimporting
+#        if info['type'] == "tour": return None # importer is screwed on tournies, pass on those hands so we don't interrupt other autoimporting
         return info
 
-    #Following function is a hack, we should be dealing with this in readFile (i think correct codepage....)
-    # Same function as parent class, removing the 2 end characters. - CG
-    def allHandsAsList(self):
-        """Return a list of handtexts in the file at self.in_path"""
-        #TODO : any need for this to be generator? e.g. stars support can email one huge file of all hands in a year. Better to read bit by bit than all at once.
-        self.readFile()
-
-        # FIXME: it's a hack
-        if self.obs[:2] == u'\xff\xfe':
-            self.obs = self.obs[2:].replace('\x00', '')
-
-        self.obs = self.obs.strip()
-        self.obs = self.obs.replace('\r\n', '\n')
-        if self.obs == "" or self.obs == None:
-            logging.info("Read no hands.")
-            return
-        return re.split(self.re_SplitHands,  self.obs)
-
     def readHandInfo(self, hand):
         m =  self.re_HandInfo.search(hand.handText)
         if(m == None):
@@ -175,6 +159,16 @@ class Fulltilt(HandHistoryConverter):
             hand.gametype['currency'] = 'play'
             
         # TODO: if there's a way to figure these out, we should.. otherwise we have to stuff it with unknowns
+        re_SNGBuyInFee  = re.compile('''(?P<CURRENCY>\$)?(?P<BUYIN>[.0-9]+) \+ \$?(?P<FEE>[.0-9]+) (?P<EXTRA_INFO>[\sA-Za-z&()]+)?''')
+        # TO DO : See if important info can be retrieved from EXTRA_INFO (sould be things like Turbo, Matrix, KO, ...)
+        try:
+            n = re_SNGBuyInFee.search(m.group('TOURNAMENT'))
+            #print "cur %s BUYIN %s FEE %s EXTRA %s" %(n.group('CURRENCY'), n.group('BUYIN'), n.group('FEE'), n.group('EXTRA_INFO'))
+            hand.buyin = "%s%s+%s%s" %(n.group('CURRENCY'), n.group('BUYIN'), n.group('CURRENCY'), n.group('FEE'))
+        except:
+            #print "Unable to collect BuyIn/Fee Info"
+            logging.info("Unable to collect BuyIn/Fee Info from HandInfo")
+
         if hand.buyin == None:
             hand.buyin = "$0.00+$0.00"
         if hand.level == None:
@@ -318,7 +312,7 @@ class Fulltilt(HandHistoryConverter):
 
     def readCollectPot(self,hand):
         for m in self.re_CollectPot.finditer(hand.handText):
-            hand.addCollectPot(player=m.group('PNAME'),pot=m.group('POT'))
+            hand.addCollectPot(player=m.group('PNAME'),pot=re.sub(u',',u'',m.group('POT')))
 
     def readShownCards(self,hand):
         for m in self.re_ShownCards.finditer(hand.handText):
diff --git a/pyfpdb/GuiAutoImport.py b/pyfpdb/GuiAutoImport.py
index b1815e95..80272e93 100755
--- a/pyfpdb/GuiAutoImport.py
+++ b/pyfpdb/GuiAutoImport.py
@@ -136,12 +136,19 @@ class GuiAutoImport (threading.Thread):
     def do_import(self):
         """Callback for timer to do an import iteration."""
         if self.doAutoImportBool:
+            self.startButton.set_label(u' I M P O R T I N G  ')
             self.importer.runUpdated()
             sys.stdout.write(".")
             sys.stdout.flush()
+            gobject.timeout_add(1000, self.reset_startbutton)
             return True
         else:
             return False
+        
+    def reset_startbutton(self):
+        self.startButton.set_label(u'  _Stop Autoimport  ')
+        return False
+
 
     def startClicked(self, widget, data):
         """runs when user clicks start on auto import tab"""
@@ -161,33 +168,34 @@ class GuiAutoImport (threading.Thread):
             # - Ideally we want to release the lock if the auto-import is killed by some 
             # kind of exception - is this possible?
             if self.settings['global_lock'].acquire(False):   # returns false immediately if lock not acquired
-                try:
-                    print "\nGlobal lock taken ..."
-                    self.doAutoImportBool = True
-                    widget.set_label(u'  _Stop Autoimport  ')
-                    if self.pipe_to_hud is None:
-                        if os.name == 'nt':
-                            command = "python HUD_main.py" + " " + self.settings['cl_options']
-                            bs = 0    # windows is not happy with line buffing here
-                            self.pipe_to_hud = subprocess.Popen(command, bufsize = bs, stdin = subprocess.PIPE, 
-                                                            universal_newlines=True)
-                        else:
-                            command = os.path.join(sys.path[0],  'HUD_main.py')
-                            cl = [command, ] + string.split(self.settings['cl_options'])
-                            self.pipe_to_hud = subprocess.Popen(cl, bufsize = 1, stdin = subprocess.PIPE, 
-                                                            universal_newlines=True)
-
-                        # Add directories to importer object.
+                print "\nGlobal lock taken ..."
+                self.doAutoImportBool = True
+                widget.set_label(u'  _Stop Autoimport  ')
+                if self.pipe_to_hud is None:
+                    if os.name == 'nt':
+                        command = "python HUD_main.py " + self.settings['cl_options']
+                        bs = 0
+                    else:
+                        command = os.path.join(sys.path[0], 'HUD_main.py')
+                        command = [command, ] + string.split(self.settings['cl_options'])
+                        bs = 1
+                    try:
+                        self.pipe_to_hud = subprocess.Popen(command, bufsize = bs, stdin = subprocess.PIPE,
+                                                            universal_newlines = True)
+                    except:
+                        err = traceback.extract_tb(sys.exc_info()[2])[-1]
+                        print "*** Error: " + err[2] + "(" + str(err[1]) + "): " + str(sys.exc_info()[1])
+                    
+                    print "self.pipe_to_hud = ", self.pipe_to_hud
+                    if self.pipe_to_hud is not None:
                         for site in self.input_settings:
                             self.importer.addImportDirectory(self.input_settings[site][0], True, site, self.input_settings[site][1])
-                            print "Adding import directories - Site: " + site + " dir: "+ str(self.input_settings[site][0])
+                            print "+Import directory - Site: " + site + " dir: " + str(self.input_settings[site][0])
                             self.do_import()
-
-                            interval=int(self.intervalEntry.get_text())
+                            
+                            interval = int(self.intervalEntry.get_text())
                             gobject.timeout_add(interval*1000, self.do_import)
-                except:
-                    err = traceback.extract_tb(sys.exc_info()[2])[-1]
-                    print "***Error: "+err[2]+"("+str(err[1])+"): "+str(sys.exc_info()[1])
+                        
             else:
                 print "auto-import aborted - global lock not available"
         else: # toggled off
diff --git a/pyfpdb/GuiTableViewer.py b/pyfpdb/GuiTableViewer.py
index 71cfb900..c730f962 100644
--- a/pyfpdb/GuiTableViewer.py
+++ b/pyfpdb/GuiTableViewer.py
@@ -22,7 +22,6 @@ import gtk
 import os
 import fpdb_simple
 
-    
 import fpdb_import
 import fpdb_db
 from Exceptions import *
diff --git a/pyfpdb/HUD_config.xml.example b/pyfpdb/HUD_config.xml.example
index bd8cb7df..adc8141c 100644
--- a/pyfpdb/HUD_config.xml.example
+++ b/pyfpdb/HUD_config.xml.example
@@ -252,10 +252,10 @@
 
 	    <site enabled="False"
 	          site_name="PartyPoker"
-	          table_finder="PartyPoker.exe"
+	          table_finder="PartyGaming.exe"
 	          screen_name="YOUR SCREEN NAME HERE"
-	          site_path=""
-	          HH_path=""
+	          site_path="C:/Program Files/PartyGaming/PartyPoker"
+	          HH_path="C:/Program Files/PartyGaming/PartyPoker/HandHistory/YOUR SCREEN NAME HERE/"
 	          decoder="everleaf_decode_table"
               converter="PartyPokerToFpdb"
 	          supported_games="holdem">
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 68274f45..cf5f3317 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -5,12 +5,12 @@
 #This program is free software: you can redistribute it and/or modify
 #it under the terms of the GNU Affero General Public License as published by
 #the Free Software Foundation, version 3 of the License.
-#   
+#
 #This program is distributed in the hope that it will be useful,
 #but WITHOUT ANY WARRANTY; without even the implied warranty of
 #MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 #GNU General Public License for more details.
-#       
+#
 #You should have received a copy of the GNU Affero General Public License
 #along with this program. If not, see <http://www.gnu.org/licenses/>.
 #In the "official" distribution you can find the license in
@@ -121,7 +121,7 @@ class Hand(object):
                  ("MIXED", self.mixed),
                  ("LASTBET", self.lastBet),
                  ("ACTION STREETS", self.actionStreets),
-                 ("STREETS", self.streets),   
+                 ("STREETS", self.streets),
                  ("ALL STREETS", self.allStreets),
                  ("COMMUNITY STREETS", self.communityStreets),
                  ("HOLE STREETS", self.holeStreets),
@@ -134,7 +134,7 @@ class Hand(object):
                  ("RAKE", self.rake),
                  ("START TIME", self.starttime),
         )
- 
+
         structs = ( ("PLAYERS", self.players),
                     ("STACKS", self.stacks),
                     ("POSTED", self.posted),
@@ -190,21 +190,7 @@ db: a connected fpdb_db object"""
         sqlids = db.getSqlPlayerIDs([p[1] for p in self.players], self.siteId)
 
         #Gametypes
-
-        print "DEBUG: self.gametype %s" % self.gametype
-        #Nice way to discover if the game is already listed in the db?
-        #Also this is using an old method from fpdb_simple - should probably conform to the rest of the inserts
-
-        hilo = "h"
-        if self.gametype['category'] in ['studhilo', 'omahahilo']:
-            hilo = "s"
-        elif self.gametype['category'] in ['razz','27_3draw','badugi']:
-            hilo = "l"
-
-        gtid = db.insertGameTypes( (self.siteId, self.gametype['type'], self.gametype['base'], 
-                                    self.gametype['category'], self.gametype['limitType'], hilo,
-                                    int(Decimal(self.gametype['sb'])*100), int(Decimal(self.gametype['bb'])*100), 0, 0) )
-        
+        gtid = db.getGameTypeId(self.siteId, self.gametype)
 
         # HudCache data to come from DerivedStats class
         # HandsActions - all actions for all players for all streets - self.actions
@@ -213,16 +199,11 @@ db: a connected fpdb_db object"""
         hh = {}
         hh['siteHandNo'] =  self.handid
         hh['handStart'] = self.starttime
-        hh['gameTypeId'] = gtid[0]
+        hh['gameTypeId'] = gtid
         # seats TINYINT NOT NULL,
         hh['tableName'] = self.tablename
         hh['maxSeats'] = self.maxseats
         hh['seats'] = len(sqlids)
-             # boardcard1 smallint,  /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */
-             # boardcard2 smallint,
-             # boardcard3 smallint,
-             # boardcard4 smallint,
-             # boardcard5 smallint,
         # Flop turn and river may all be empty - add (likely) too many elements and trim with range
         boardcards = self.board['FLOP'] + self.board['TURN'] + self.board['RIVER'] + [u'0x', u'0x', u'0x', u'0x', u'0x']
         cards = [Card.encodeCard(c) for c in boardcards[0:5]]
@@ -232,7 +213,6 @@ db: a connected fpdb_db object"""
         hh['boardcard4'] = cards[3]
         hh['boardcard5'] = cards[4]
 
-        print hh
              # texture smallint,
              # playersVpi SMALLINT NOT NULL,         /* num of players vpi */
                 # Needs to be recorded
@@ -256,17 +236,14 @@ db: a connected fpdb_db object"""
                 # Needs to be recorded
              # street4Raises TINYINT NOT NULL, /* num big bets paid to see showdown */
                 # Needs to be recorded
-             # street1Pot INT,                  /* pot size at flop/street4 */
-                # Needs to be recorded
-             # street2Pot INT,                  /* pot size at turn/street5 */
-                # Needs to be recorded
-             # street3Pot INT,                  /* pot size at river/street6 */
-                # Needs to be recorded
-             # street4Pot INT,                  /* pot size at sd/street7 */
-                # Needs to be recorded
-             # showdownPot INT,                 /* pot size at sd/street7 */
+
+        #print "DEBUG: self.getStreetTotals = (%s, %s, %s, %s, %s)" %  self.getStreetTotals()
+        #FIXME: Pot size still in decimal, needs to be converted to cents
+        (hh['street1Pot'], hh['street2Pot'], hh['street3Pot'], hh['street4Pot'], hh['showdownPot']) = self.getStreetTotals()
+
              # comment TEXT,
              # commentTs DATETIME
+        #print hh
         handid = db.storeHand(hh)
         # HandsPlayers - ? ... Do we fix winnings?
         # Tourneys ?
@@ -276,8 +253,8 @@ db: a connected fpdb_db object"""
 
     def select(self, handId):
         """ Function to create Hand object from database """
-        
-        
+
+
 
 
     def addPlayer(self, seat, name, chips):
@@ -326,14 +303,13 @@ If a player has None chips he won't be added."""
         return c
 
     def addAnte(self, player, ante):
-        log.debug("%s %s antes %s" % ('ANTES', player, ante))
+        log.debug("%s %s antes %s" % ('BLINDSANTES', player, ante))
         if player is not None:
             ante = re.sub(u',', u'', ante) #some sites have commas
-            self.bets['ANTES'][player].append(Decimal(ante))
+            self.bets['BLINDSANTES'][player].append(Decimal(ante))
             self.stacks[player] -= Decimal(ante)
             act = (player, 'posts', "ante", ante, self.stacks[player]==0)
-            self.actions['ANTES'].append(act)
-            #~ self.lastBet['ANTES'] = Decimal(ante)   
+            self.actions['BLINDSANTES'].append(act)
             self.pot.addMoney(player, Decimal(ante))
 
     def addBlind(self, player, blindtype, amount):
@@ -348,19 +324,19 @@ If a player has None chips he won't be added."""
         log.debug("addBlind: %s posts %s, %s" % (player, blindtype, amount))
         if player is not None:
             amount = re.sub(u',', u'', amount) #some sites have commas
-            self.bets['PREFLOP'][player].append(Decimal(amount))
             self.stacks[player] -= Decimal(amount)
-            #print "DEBUG %s posts, stack %s" % (player, self.stacks[player])
             act = (player, 'posts', blindtype, amount, self.stacks[player]==0)
             self.actions['BLINDSANTES'].append(act)
+
+            if blindtype == 'both':
+                amount = self.bb
+                self.bets['BLINDSANTES'][player].append(Decimal(self.sb))
+                self.pot.addCommonMoney(Decimal(self.sb))
+
+            self.bets['PREFLOP'][player].append(Decimal(amount))
             self.pot.addMoney(player, Decimal(amount))
-            if blindtype == 'big blind':
-                self.lastBet['PREFLOP'] = Decimal(amount)
-            elif blindtype == 'both':
-                # extra small blind is 'dead'
-                self.lastBet['PREFLOP'] = Decimal(self.bb)
+            self.lastBet['PREFLOP'] = Decimal(amount)
             self.posted = self.posted + [[player,blindtype]]
-        #print "DEBUG: self.posted: %s" %(self.posted)
 
 
 
@@ -378,22 +354,22 @@ If a player has None chips he won't be added."""
             act = (player, 'calls', amount, self.stacks[player]==0)
             self.actions[street].append(act)
             self.pot.addMoney(player, Decimal(amount))
-            
+
     def addRaiseBy(self, street, player, amountBy):
         """\
-Add a raise by amountBy on [street] by [player] 
+Add a raise by amountBy on [street] by [player]
 """
         #Given only the amount raised by, the amount of the raise can be calculated by
-        # working out how much this player has already in the pot 
+        # working out how much this player has already in the pot
         #   (which is the sum of self.bets[street][player])
-        # and how much he needs to call to match the previous player 
+        # and how much he needs to call to match the previous player
         #   (which is tracked by self.lastBet)
-        # let Bp = previous bet 
+        # let Bp = previous bet
         #     Bc = amount player has committed so far
         #     Rb = raise by
         # then: C = Bp - Bc (amount to call)
         #      Rt = Bp + Rb (raise to)
-        # 
+        #
         amountBy = re.sub(u',', u'', amountBy) #some sites have commas
         self.checkPlayerExists(player)
         Rb = Decimal(amountBy)
@@ -401,7 +377,7 @@ Add a raise by amountBy on [street] by [player]
         Bc = reduce(operator.add, self.bets[street][player], 0)
         C = Bp - Bc
         Rt = Bp + Rb
-        
+
         self._addRaise(street, player, C, Rb, Rt)
         #~ self.bets[street][player].append(C + Rb)
         #~ self.stacks[player] -= (C + Rb)
@@ -419,7 +395,7 @@ For sites which by "raises x" mean "calls and raises putting a total of x in the
         C = Bp - Bc
         Rb = CRb - C
         Rt = Bp + Rb
-        
+
         self._addRaise(street, player, C, Rb, Rt)
 
     def addRaiseTo(self, street, player, amountTo):
@@ -444,9 +420,9 @@ Add a raise on [street] by [player] to [amountTo]
         self.actions[street].append(act)
         self.lastBet[street] = Rt # TODO check this is correct
         self.pot.addMoney(player, C+Rb)
-    
-        
-        
+
+
+
     def addBet(self, street, player, amount):
         log.debug("%s %s bets %s" %(street, player, amount))
         amount = re.sub(u',', u'', amount) #some sites have commas
@@ -464,7 +440,7 @@ Add a raise on [street] by [player] to [amountTo]
         self.checkPlayerExists(player)
         act = (player, 'stands pat')
         self.actions[street].append(act)
-        
+
 
     def addFold(self, street, player):
         log.debug("%s %s folds" % (street, player))
@@ -472,7 +448,7 @@ Add a raise on [street] by [player] to [amountTo]
         self.folded.add(player)
         self.pot.addFold(player)
         self.actions[street].append((player, 'folds'))
-        
+
 
     def addCheck(self, street, player):
         #print "DEBUG: %s %s checked" % (street, player)
@@ -496,6 +472,7 @@ Add a raise on [street] by [player] to [amountTo]
 For when a player shows cards for any reason (for showdown or out of choice).
 Card ranks will be uppercased
 """
+        import sys; sys.exit(1)
         log.debug("addShownCards %s hole=%s all=%s" % (player, cards,  holeandboard))
         if cards is not None:
             self.addHoleCards(cards,player,shown, mucked)
@@ -504,10 +481,9 @@ Card ranks will be uppercased
             board = set([c for s in self.board.values() for c in s])
             self.addHoleCards(holeandboard.difference(board),player,shown, mucked)
 
-
     def totalPot(self):
         """If all bets and blinds have been added, totals up the total pot size"""
-        
+
         # This gives us the total amount put in the pot
         if self.totalpot is None:
             self.pot.end()
@@ -577,6 +553,8 @@ Map the tuple self.gametype onto the pokerstars string describing it
                 return ("%s: posts big blind %s%s%s" %(act[0], self.sym, act[3], ' and is all-in' if act[4] else ''))
             elif(act[2] == "both"):
                 return ("%s: posts small & big blinds %s%s%s" %(act[0], self.sym, act[3], ' and is all-in' if act[4] else ''))
+            elif(act[2] == "ante"):
+                return ("%s: posts the ante %s%s%s" %(act[0], self.sym, act[3], ' and is all-in' if act[4] else ''))
         elif act[1] == 'bringin':
             return ("%s: brings in for %s%s%s" %(act[0], self.sym, act[2], ' and is all-in' if act[3] else ''))
         elif act[1] == 'discards':
@@ -588,17 +566,20 @@ Map the tuple self.gametype onto the pokerstars string describing it
         """Return a string of the stakes of the current hand."""
         return "%s%s/%s%s" % (self.sym, self.sb, self.sym, self.bb)
 
+    def getStreetTotals(self):
+        pass
+
     def writeGameLine(self):
         """Return the first HH line for the current hand."""
         gs = "PokerStars Game #%s: " % self.handid
-            
+
         if self.tourNo != None and self.mixed != None: # mixed tournament
             gs = gs + "Tournament #%s, %s %s (%s) - Level %s (%s) - " % (self.tourNo, self.buyin, self.MS[self.mixed], self.getGameTypeAsString(), self.level, self.getStakesAsString())
         elif self.tourNo != None: # all other tournaments
-            gs = gs + "Tournament #%s, %s %s - Level %s (%s) - " % (self.tourNo, 
+            gs = gs + "Tournament #%s, %s %s - Level %s (%s) - " % (self.tourNo,
                             self.buyin, self.getGameTypeAsString(), self.level, self.getStakesAsString())
         elif self.mixed != None: # all other mixed games
-            gs = gs + " %s (%s, %s) - " % (self.MS[self.mixed], 
+            gs = gs + " %s (%s, %s) - " % (self.MS[self.mixed],
                             self.getGameTypeAsString(), self.getStakesAsString())
         else: # non-mixed cash games
             gs = gs + " %s (%s) - " % (self.getGameTypeAsString(), self.getStakesAsString())
@@ -617,8 +598,8 @@ Map the tuple self.gametype onto the pokerstars string describing it
 
     def writeHand(self, fh=sys.__stdout__):
         # PokerStars format.
-        print >>fh, self.writeGameLine() 
-        print >>fh, self.writeTableLine() 
+        print >>fh, self.writeGameLine()
+        print >>fh, self.writeTableLine()
 
 
 class HoldemOmahaHand(Hand):
@@ -633,9 +614,9 @@ class HoldemOmahaHand(Hand):
         Hand.__init__(self, sitename, gametype, handText, builtFrom = "HHC")
         self.sb = gametype['sb']
         self.bb = gametype['bb']
-        
+
         #Populate a HoldemOmahaHand
-        #Generally, we call 'read' methods here, which get the info according to the particular filter (hhc) 
+        #Generally, we call 'read' methods here, which get the info according to the particular filter (hhc)
         # which then invokes a 'addXXX' callback
         if builtFrom == "HHC":
             hhc.readHandInfo(self)
@@ -643,6 +624,7 @@ class HoldemOmahaHand(Hand):
             hhc.compilePlayerRegexs(self)
             hhc.markStreets(self)
             hhc.readBlinds(self)
+            hhc.readAntes(self)
             hhc.readButton(self)
             hhc.readHeroCards(self)
             hhc.readShowdownActions(self)
@@ -653,6 +635,7 @@ class HoldemOmahaHand(Hand):
             for street in self.actionStreets:
                 if self.streets[street]:
                     hhc.readAction(self, street)
+                    self.pot.markTotal(street)
             hhc.readCollectPot(self)
             hhc.readShownCards(self)
             self.totalPot() # finalise it (total the pot)
@@ -668,7 +651,7 @@ class HoldemOmahaHand(Hand):
         else:
             log.warning("HoldemOmahaHand.__init__:Neither HHC nor DB+handid provided")
             pass
-                
+
 
     def addShownCards(self, cards, player, shown=True, mucked=False, dealt=False):
         if player == self.hero: # we have hero's cards just update shown/mucked
@@ -677,6 +660,18 @@ class HoldemOmahaHand(Hand):
         else:
             self.addHoleCards('PREFLOP', player, open=[], closed=cards, shown=shown, mucked=mucked, dealt=dealt)
 
+    def getStreetTotals(self):
+        # street1Pot INT,                  /* pot size at flop/street4 */
+        # street2Pot INT,                  /* pot size at turn/street5 */
+        # street3Pot INT,                  /* pot size at river/street6 */
+        # street4Pot INT,                  /* pot size at sd/street7 */
+        # showdownPot INT,                 /* pot size at sd/street7 */
+        tmp1 = self.pot.getTotalAtStreet('FLOP')
+        tmp2 = self.pot.getTotalAtStreet('TURN')
+        tmp3 = self.pot.getTotalAtStreet('RIVER')
+        tmp4 = 0
+        tmp5 = 0
+        return (tmp1,tmp2,tmp3,tmp4,tmp5)
 
     def writeHTMLHand(self):
         from nevow import tags as T
@@ -711,7 +706,7 @@ class HoldemOmahaHand(Hand):
                         ]
                     )
                 if street in self.actionStreets and self.actions[street]:
-                    lines.append( 
+                    lines.append(
                         T.ol(class_='actions', data=self.actions[street], render=render_action) [
                             T.li(pattern='list_item')[ T.slot(name='action') ]
                         ]
@@ -745,8 +740,8 @@ class HoldemOmahaHand(Hand):
                 context.tag[ pat().fillSlots('action', x)]
             return context.tag
 
-        s = T.p[ 
-            T.h1[ 
+        s = T.p[
+            T.h1[
                 T.span(class_='site')["%s Game #%s]" % ('PokerStars', self.handid)],
                 T.span(class_='type_limit')[ "%s ($%s/$%s)" %(self.getGameTypeAsString(), self.sb, self.bb) ],
                 T.span(class_='date')[ datetime.datetime.strftime(self.starttime,'%Y/%m/%d - %H:%M:%S ET') ]
@@ -772,7 +767,7 @@ class HoldemOmahaHand(Hand):
 
         return str(tidy.parseString(flat.flatten(s), **options))
 
-        
+
     def writeHand(self, fh=sys.__stdout__):
         # PokerStars format.
         super(HoldemOmahaHand, self).writeHand(fh)
@@ -786,7 +781,7 @@ class HoldemOmahaHand(Hand):
         if self.actions['BLINDSANTES']:
             for act in self.actions['BLINDSANTES']:
                 print >>fh, self.actionString(act)
-        
+
         print >>fh, ("*** HOLE CARDS ***")
         for player in self.dealt:
             print >>fh, ("Dealt to %s [%s]" %(player, " ".join(self.holecards['PREFLOP'][player][1])))
@@ -832,7 +827,7 @@ class HoldemOmahaHand(Hand):
                     numOfHoleCardsNeeded = 2
                 if len(self.holecards['PREFLOP'][name]) == numOfHoleCardsNeeded:
                     print >>fh, ("%s shows [%s] (a hand...)" % (name, " ".join(self.holecards['PREFLOP'][name][1])))
-                
+
         # Current PS format has the lines:
         # Uncalled bet ($111.25) returned to s0rrow
         # s0rrow collected $5.15 from side pot
@@ -874,7 +869,7 @@ class HoldemOmahaHand(Hand):
                     print >>fh, ("Seat %d: %s mucked" % (seatnum, name))
 
         print >>fh, "\n\n"
-        
+
 class DrawHand(Hand):
     def __init__(self, hhc, sitename, gametype, handText, builtFrom = "HHC"):
         if gametype['base'] != 'draw':
@@ -894,6 +889,7 @@ class DrawHand(Hand):
             hhc.compilePlayerRegexs(self)
             hhc.markStreets(self)
             hhc.readBlinds(self)
+            hhc.readAntes(self)
             hhc.readButton(self)
             hhc.readHeroCards(self)
             hhc.readShowdownActions(self)
@@ -901,6 +897,7 @@ class DrawHand(Hand):
             for street in self.streetList:
                 if self.streets[street]:
                     hhc.readAction(self, street)
+                    self.pot.markTotal(street)
             hhc.readCollectPot(self)
             hhc.readShownCards(self)
             self.totalPot() # finalise it (total the pot)
@@ -919,8 +916,8 @@ class DrawHand(Hand):
         #   - this is a bet of 1 sb, as yet uncalled.
         # Player in the big blind posts
         #   - this is a call of 1 sb and a raise to 1 bb
-        # 
-        
+        #
+
         log.debug("addBlind: %s posts %s, %s" % (player, blindtype, amount))
         if player is not None:
             self.bets['DEAL'][player].append(Decimal(amount))
@@ -930,7 +927,7 @@ class DrawHand(Hand):
             self.actions['BLINDSANTES'].append(act)
             self.pot.addMoney(player, Decimal(amount))
             if blindtype == 'big blind':
-                self.lastBet['DEAL'] = Decimal(amount)            
+                self.lastBet['DEAL'] = Decimal(amount)
             elif blindtype == 'both':
                 # extra small blind is 'dead'
                 self.lastBet['DEAL'] = Decimal(self.bb)
@@ -961,6 +958,14 @@ class DrawHand(Hand):
             act = (player, 'discards', num)
         self.actions[street].append(act)
 
+    def getStreetTotals(self):
+        # street1Pot INT,                  /* pot size at flop/street4 */
+        # street2Pot INT,                  /* pot size at turn/street5 */
+        # street3Pot INT,                  /* pot size at river/street6 */
+        # street4Pot INT,                  /* pot size at sd/street7 */
+        # showdownPot INT,                 /* pot size at sd/street7 */
+        return (0,0,0,0,0)
+
 
     def writeHand(self, fh=sys.__stdout__):
         # PokerStars format.
@@ -1042,17 +1047,17 @@ class StudHand(Hand):
         if gametype['base'] != 'stud':
             pass # or indeed don't pass and complain instead
 
-        self.allStreets = ['ANTES','THIRD','FOURTH','FIFTH','SIXTH','SEVENTH']
+        self.allStreets = ['BLINDSANTES','THIRD','FOURTH','FIFTH','SIXTH','SEVENTH']
         self.communityStreets = []
-        self.actionStreets = ['ANTES','THIRD','FOURTH','FIFTH','SIXTH','SEVENTH']
+        self.actionStreets = ['BLINDSANTES','THIRD','FOURTH','FIFTH','SIXTH','SEVENTH']
 
-        self.streetList = ['ANTES','THIRD','FOURTH','FIFTH','SIXTH','SEVENTH'] # a list of the observed street names in order
+        self.streetList = ['BLINDSANTES','THIRD','FOURTH','FIFTH','SIXTH','SEVENTH'] # a list of the observed street names in order
         self.holeStreets = ['THIRD','FOURTH','FIFTH','SIXTH','SEVENTH']
         Hand.__init__(self, sitename, gametype, handText)
         self.sb = gametype['sb']
         self.bb = gametype['bb']
         #Populate the StudHand
-        #Generally, we call a 'read' method here, which gets the info according to the particular filter (hhc) 
+        #Generally, we call a 'read' method here, which gets the info according to the particular filter (hhc)
         # which then invokes a 'addXXX' callback
         if builtFrom == "HHC":
             hhc.readHandInfo(self)
@@ -1064,10 +1069,11 @@ class StudHand(Hand):
             hhc.readHeroCards(self)
             # Read actions in street order
             for street in self.actionStreets:
-                if street == 'ANTES': continue # OMG--sometime someone folds in the ante round
+                if street == 'BLINDSANTES': continue # OMG--sometime someone folds in the ante round
                 if self.streets[street]:
                     log.debug(street + self.streets[street])
                     hhc.readAction(self, street)
+                    self.pot.markTotal(street)
             hhc.readCollectPot(self)
             hhc.readShownCards(self) # not done yet
             self.totalPot() # finalise it (total the pot)
@@ -1127,7 +1133,7 @@ Add a complete on [street] by [player] to [amountTo]
         #~ self.actions[street].append(act)
         #~ self.lastBet[street] = Rt # TODO check this is correct
         #~ self.pot.addMoney(player, C+Rb)
-        
+
     def addBringIn(self, player, bringin):
         if player is not None:
             log.debug("Bringin: %s, %s" % (player , bringin))
@@ -1138,20 +1144,28 @@ Add a complete on [street] by [player] to [amountTo]
             self.lastBet['THIRD'] = Decimal(bringin)
             self.pot.addMoney(player, Decimal(bringin))
 
+    def getStreetTotals(self):
+        # street1Pot INT,                  /* pot size at flop/street4 */
+        # street2Pot INT,                  /* pot size at turn/street5 */
+        # street3Pot INT,                  /* pot size at river/street6 */
+        # street4Pot INT,                  /* pot size at sd/street7 */
+        # showdownPot INT,                 /* pot size at sd/street7 */
+        return (0,0,0,0,0)
+
     
     def writeHand(self, fh=sys.__stdout__):
         # PokerStars format.
 
         super(StudHand, self).writeHand(fh)
-        
-        players_who_post_antes = set([x[0] for x in self.actions['ANTES']])
+
+        players_who_post_antes = set([x[0] for x in self.actions['BLINDSANTES']])
 
         for player in [x for x in self.players if x[1] in players_who_post_antes]:
             #Only print stacks of players who do something preflop
             print >>fh, _("Seat %s: %s (%s%s in chips)" %(player[0], player[1], self.sym, player[2]))
 
-        if 'ANTES' in self.actions:
-            for act in self.actions['ANTES']:
+        if 'BLINDSANTES' in self.actions:
+            for act in self.actions['BLINDSANTES']:
                 print >>fh, _("%s: posts the ante %s%s" %(act[0], self.sym, act[3]))
 
         if 'THIRD' in self.actions:
@@ -1274,7 +1288,7 @@ Add a complete on [street] by [player] to [amountTo]
             else:
                 return hc + " ".join(self.holecards[street][player][0]) + ']'
 
-        if street == 'SEVENTH' and player != self.hero: return # only write 7th st line for hero, LDO 
+        if street == 'SEVENTH' and player != self.hero: return # only write 7th st line for hero, LDO
         return hc + " ".join(self.holecards[street][player][1]) + "] [" + " ".join(self.holecards[street][player][0]) + "]"
 
     def join_holecards(self, player):
@@ -1296,30 +1310,43 @@ class Pot(object):
 
 
     def __init__(self):
-        self.contenders = set()
-        self.committed = {}
-        self.total = None
-        self.returned = {}
-        self.sym = u'$' # this is the default currency symbol
+        self.contenders   = set()
+        self.committed    = {}
+        self.streettotals = {}
+        self.common       = Decimal(0)
+        self.total        = None
+        self.returned     = {}
+        self.sym          = u'$' # this is the default currency symbol
 
     def setSym(self, sym):
         self.sym = sym
-    
+
     def addPlayer(self,player):
         self.committed[player] = Decimal(0)
-    
+
     def addFold(self, player):
         # addFold must be called when a player folds
         self.contenders.discard(player)
-        
+
+    def addCommonMoney(self, amount):
+        self.common += amount
+
     def addMoney(self, player, amount):
         # addMoney must be called for any actions that put money in the pot, in the order they occur
         self.contenders.add(player)
         self.committed[player] += amount
 
+    def markTotal(self, street):
+        self.streettotals[street] = sum(self.committed.values()) + self.common
+
+    def getTotalAtStreet(self, street):
+        if street in self.streettotals:
+            return self.streettotals[street]
+        return 0
+
     def end(self):
-        self.total = sum(self.committed.values())
-        
+        self.total = sum(self.committed.values()) + self.common
+
         # Return any uncalled bet.
         committed = sorted([ (v,k) for (k,v) in self.committed.items()])
         lastbet = committed[-1][0] - committed[-2][0]
@@ -1337,7 +1364,7 @@ class Pot(object):
         self.pots = []
         while len(commitsall) > 0:
             commitslive = [(v,k) for (v,k) in commitsall if k in self.contenders]
-            v1 = commitslive[0][0]        
+            v1 = commitslive[0][0]
             self.pots += [sum([min(v,v1) for (v,k) in commitsall])]
             commitsall = [((v-v1),k) for (v,k) in commitsall if v-v1 >0]
 
@@ -1347,7 +1374,7 @@ class Pot(object):
         # and y+z+r = x
         # for example:
         # Total pot $124.30 Main pot $98.90. Side pot $23.40. | Rake $2
-        
+
     def __str__(self):
         if self.sym is None:
             self.sym = "C"
@@ -1355,17 +1382,17 @@ class Pot(object):
             print "call Pot.end() before printing pot total"
             # NB if I'm sure end() is idempotent, call it here.
             raise FpdbParseError
-        
+
         ret = "Total pot %s%.2f" % (self.sym, self.total)
         if len(self.pots) < 2:
             return ret;
         ret += " Main pot %s%.2f" % (self.sym, self.pots[0])
-        
+
         return ret + ''.join([ (" Side pot %s%.2f." % (self.sym, self.pots[x]) ) for x in xrange(1, len(self.pots)) ])
 
 def assemble(cnxn, handid):
     c = cnxn.cursor()
-    
+
     # We need at least sitename, gametype, handid
     # for the Hand.__init__
     c.execute("""
@@ -1408,10 +1435,10 @@ limit 1""", {'handid':handid})
         h.setCommunityCards('FLOP', cards[0:3])
     if cards[3]:
         h.setCommunityCards('TURN', [cards[3]])
-    if cards[4]:      
+    if cards[4]:
         h.setCommunityCards('RIVER', [cards[4]])
     #[Card.valueSuitFromCard(x) for x in cards]
-    
+
     # HandInfo : HID, TABLE
     # BUTTON - why is this treated specially in Hand?
     # answer: it is written out in hand histories
@@ -1429,7 +1456,7 @@ WHERE h.id = %(handid)s
     h.handid = res[0]
     h.tablename = res[1]
     h.starttime = res[2] # automatically a datetime
-    
+
     # PlayerStacks
     c.execute("""
 SELECT
@@ -1454,7 +1481,7 @@ and p.id = hp.playerid
             h.addCollectPot(name, winnings)
         if position == 'B':
             h.buttonpos = seat
-    
+
 
     # actions
     c.execute("""
@@ -1502,7 +1529,7 @@ ORDER BY
     #hc.readShownCards(self)
     h.totalPot()
     h.rake = h.totalpot - h.totalcollected
-    
+
 
     return h
 
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 5b7d062e..8035dae0 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -76,11 +76,11 @@ follow :  whether to tail -f the input"""
         else:
             # TODO: out_path should be sanity checked.
             out_dir = os.path.dirname(self.out_path)
-            if not os.path.isdir(out_dir):
+            if not os.path.isdir(out_dir) and out_dir != '':
                 log.info("Creating directory '%s'" % out_dir)
                 os.makedirs(out_dir)
             try:
-                self.out_fh = open(self.out_path, 'w')
+                self.out_fh = codecs.open(self.out_path, 'w', 'cp1252')
                 log.debug("out_path %s opened as %s" % (self.out_path, self.out_fh))
             except:
                 log.error("out_path %s couldn't be opened" % (self.out_path))
@@ -215,7 +215,7 @@ which it expects to find at self.re_TailSplitHands -- see for e.g. Everleaf.py.
         self.obs = self.obs.replace('\r\n', '\n')
         if self.obs == "" or self.obs == None:
             log.info("Read no hands.")
-            return
+            return []
         return re.split(self.re_SplitHands,  self.obs)
         
     def processHand(self, handText):
diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py
index 8a7aa740..ad1c6913 100644
--- a/pyfpdb/Hud.py
+++ b/pyfpdb/Hud.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 """Hud.py
 
 Create and manage the hud overlays.
@@ -95,6 +96,8 @@ class Hud:
                 if my_import == None:
                     continue
                 self.aux_windows.append(my_import(self, config, aux_params))
+        
+        self.creation_attrs = None
 
     def create_mw(self):
 
@@ -146,6 +149,21 @@ class Hud:
         self.item4.connect("activate", self.debug_stat_windows)
         self.item4.show()
         
+        self.item5 = gtk.MenuItem('Set max seats')
+        self.menu.append(self.item5)
+        self.item5.show()
+        self.maxSeatsMenu = gtk.Menu()
+        self.item5.set_submenu(self.maxSeatsMenu)
+        for i in range(2, 11, 1):
+            item = gtk.MenuItem('%d-max' % i)
+            item.ms = i
+            self.maxSeatsMenu.append(item)
+            item.connect("activate", self.change_max_seats)
+            item.show()
+            setattr(self, 'maxSeatsMenuItem%d' % (i-1), item) 
+        
+            
+        
         self.ebox.connect_object("button-press-event", self.on_button_press, self.menu)
 
         self.main_window.show_all()
@@ -162,7 +180,19 @@ class Hud:
             self.main_window.gdkhandle.set_transient_for(self.main_window.parentgdkhandle) #
             
         self.update_table_position()
-               
+           
+    def change_max_seats(self, widget):
+        if self.max != widget.ms:
+            print 'change_max_seats', widget.ms
+            self.max = widget.ms
+            try:
+                self.kill()
+                self.create(*self.creation_attrs)
+                self.update(self.hand, self.config)
+            except Exception, e:
+                print "Expcetion:",str(e)
+                pass
+        
     def update_table_position(self):
         if os.name == 'nt':
             if not win32gui.IsWindow(self.table.number):
@@ -181,6 +211,11 @@ class Hud:
             for i, w in enumerate(self.stat_windows.itervalues()):
                 (x, y) = loc[adj[i+1]]
                 w.relocate(x, y)
+
+        # While we're at it, fix the positions of mucked cards too
+        for aux in self.aux_windows:
+            aux.update_card_positions()
+
         return True
 
     def on_button_press(self, widget, event):
@@ -205,6 +240,7 @@ class Hud:
         self.aux_windows = []
 
     def reposition_windows(self, *args):
+        self.update_table_position()
         for w in self.stat_windows.itervalues():
             if type(w) == int:
 #                print "in reposition, w =", w
@@ -264,6 +300,8 @@ class Hud:
 #
 #    this method also manages the creating and destruction of stat
 #    windows via calls to the Stat_Window class
+        self.creation_attrs = hand, config, stat_dict, cards 
+
         self.hand = hand  
         if not self.mw_created:
             self.create_mw()
diff --git a/pyfpdb/Mucked.py b/pyfpdb/Mucked.py
index 3bd84cb7..ebe31b3a 100755
--- a/pyfpdb/Mucked.py
+++ b/pyfpdb/Mucked.py
@@ -345,6 +345,22 @@ class Aux_Seats(Aux_Window):
     def create_contents(self): pass
     def update_contents(self): pass
 
+    def update_card_positions(self):
+        # self.adj does not exist until .create() has been run
+        try:
+            adj = self.adj
+        except AttributeError:
+            return
+        loc = self.config.get_aux_locations(self.params['name'], int(self.hud.max))
+        for i in (range(1, self.hud.max + 1) + ['common']):
+            if i == 'common':
+                (x, y) = self.params['layout'][self.hud.max].common
+            else:
+                (x, y) = loc[adj[i]]
+            self.positions[i] = self.card_positions(x, self.hud.table.x, y, self.hud.table.y)
+            self.m_windows[i].move(self.positions[i][0], self.positions[i][1])
+
+
     def create(self):
         self.adj = self.hud.adj_seats(0, self.config)  # move adj_seats to aux and get rid of it in Hud.py
         loc = self.config.get_aux_locations(self.params['name'], int(self.hud.max))
@@ -362,7 +378,7 @@ class Aux_Seats(Aux_Window):
             self.m_windows[i].set_transient_for(self.hud.main_window)
             self.m_windows[i].set_focus_on_map(False)
             self.m_windows[i].connect("configure_event", self.configure_event_cb, i)
-            self.positions[i] = (int(x) + self.hud.table.x, int(y) + self.hud.table.y)
+            self.positions[i] = self.card_positions(x, self.hud.table.x, y, self.hud.table.y)
             self.m_windows[i].move(self.positions[i][0], self.positions[i][1])
             if self.params.has_key('opacity'):
                 self.m_windows[i].set_opacity(float(self.params['opacity']))
@@ -374,6 +390,13 @@ class Aux_Seats(Aux_Window):
             if self.uses_timer:
                 self.m_windows[i].hide()
 
+
+    def card_positions(self, x, table_x, y, table_y):
+        _x = int(x) + int(table_x)
+        _y = int(y) + int(table_y)
+        return (_x, _y)
+
+
     def update_gui(self, new_hand_id):
         """Update the gui, LDO."""
         for i in self.m_windows.keys():
diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py
index 2b1619db..a3ea0ad0 100755
--- a/pyfpdb/PartyPokerToFpdb.py
+++ b/pyfpdb/PartyPokerToFpdb.py
@@ -2,17 +2,17 @@
 # -*- coding: utf-8 -*-
 #
 #    Copyright 2009, Grigorij Indigirkin
-#    
+#
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
-#    
+#
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 #    GNU General Public License for more details.
-#    
+#
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@@ -21,25 +21,24 @@
 import sys
 from collections import defaultdict
 
+from Exceptions import FpdbParseError
 from HandHistoryConverter import *
 
 # PartyPoker HH Format
 
+class PartyPokerParseError(FpdbParseError):
+    "Usage: raise PartyPokerParseError(<msg>[, hh=<hh>][, hid=<hid>])"
+    def __init__(self, msg='', hh=None, hid=None):
+        if hh is not None:
+            msg += "\n\nHand history attached below:\n" + self.wrapHh(hh)
+        return super(PartyPokerParseError, self).__init__(hid=hid)
+        #return super(PartyPokerParseError, self).__init__(msg, hid=hid)
+    def wrapHh(self, hh):
+        return ("%(DELIMETER)s\n%(HH)s\n%(DELIMETER)s") % \
+                {'DELIMETER': '#'*50, 'HH': hh}
+
 class PartyPoker(HandHistoryConverter):
-    class ParsingException(Exception):
-        "Usage: raise ParsingException(<msg>[, hh=<hh>])"
-        def __init__(self, *args, **kwargs):
-            if len(args)==0: args=[''] + list(args)
-            msg, args = args[0], args[1:]
-            if 'hh' in kwargs:
-                msg += self.wrapHh(kwargs['hh'])
-                del kwargs['hh']
-            return Exception.__init__(self, msg, *args, **kwargs)
-        def wrapHh(self, hh):
-            return ("\n\nHand history attached below:\n"
-                    "%(DELIMETER)s\n%(HH)s\n%(DELIMETER)s") % \
-                    {'DELIMETER': '#'*50, 'HH': hh}
-                    
+
 ############################################################
 #    Class Variables
 
@@ -55,15 +54,15 @@ class PartyPoker(HandHistoryConverter):
     # $5 USD NL Texas Hold'em - Saturday, July 25, 07:53:52 EDT 2009
     # NL Texas Hold'em $1 USD Buy-in Trny:45685440 Level:8  Blinds-Antes(600/1 200 -50) - Sunday, May 17, 11:25:07 MSKS 2009
     re_GameInfoRing     = re.compile("""
-            (?P<CURRENCY>\$|)\s*(?P<RINGLIMIT>\d+)\s*(?:USD)?\s*
-            (?P<LIMIT>(NL))\s+
-            (?P<GAME>(Texas\ Hold\'em))
+            (?P<CURRENCY>\$|)\s*(?P<RINGLIMIT>[0-9,]+)\s*(?:USD)?\s*
+            (?P<LIMIT>(NL|PL|))\s+
+            (?P<GAME>(Texas\ Hold\'em|Omaha))
             \s*\-\s*
             (?P<DATETIME>.+)
             """, re.VERBOSE)
     re_GameInfoTrny     = re.compile("""
-            (?P<LIMIT>(NL))\s+
-            (?P<GAME>(Texas\ Hold\'em))\s+
+            (?P<LIMIT>(NL|PL|))\s+
+            (?P<GAME>(Texas\ Hold\'em|Omaha))\s+
             (?P<BUYIN>\$?[.0-9]+)\s*(?P<BUYIN_CURRENCY>USD)?\s*Buy-in\s+
             Trny:\s?(?P<TOURNO>\d+)\s+
             Level:\s*(?P<LEVEL>\d+)\s+
@@ -81,7 +80,7 @@ class PartyPoker(HandHistoryConverter):
           Seat\s(?P<SEAT>\d+):\s
           (?P<PNAME>.*)\s
           \(\s*\$?(?P<CASH>[0-9,.]+)\s*(?:USD|)\s*\)
-          """ , 
+          """ ,
           re.VERBOSE)
 
     re_HandInfo     = re.compile("""
@@ -91,41 +90,61 @@ class PartyPoker(HandHistoryConverter):
             (?:[^ ]+\s+\#(?P<MTTTABLE>\d+).+)? # table number for mtt
             \((?P<PLAY>Real|Play)\s+Money\)\s+ # FIXME: check if play money is correct
             Seat\s+(?P<BUTTON>\d+)\sis\sthe\sbutton
-            """, 
+            """,
           re.MULTILINE|re.VERBOSE)
 
+    re_TotalPlayers = re.compile("^Total\s+number\s+of\s+players\s*:\s*(?P<MAXSEATS>\d+)", re.MULTILINE)
     re_SplitHands   = re.compile('\x00+')
     re_TailSplitHands   = re.compile('(\x00+)')
     lineSplitter    = '\n'
     re_Button       = re.compile('Seat (?P<BUTTON>\d+) is the button', re.MULTILINE)
     re_Board        = re.compile(r"\[(?P<CARDS>.+)\]")
-    re_NoSmallBlind = re.compile('^There is no Small Blind in this hand as the Big Blind of the previous hand left the table')
+    re_NoSmallBlind = re.compile(
+                    '^There is no Small Blind in this hand as the Big Blind '
+                    'of the previous hand left the table', re.MULTILINE)
 
 
     def allHandsAsList(self):
         list = HandHistoryConverter.allHandsAsList(self)
+        if list is None:
+            return []
         return filter(lambda text: len(text.strip()), list)
 
+    def guessMaxSeats(self, hand):
+        """Return a guess at max_seats when not specified in HH."""
+        mo = self.maxOccSeat(hand)
+
+        if mo == 10: return mo
+        if mo == 2: return 2
+        if mo <= 6: return 6
+        # there are 9-max tables for cash and 10-max for tournaments
+        return 9 if hand.gametype['type']=='ring' else 10
+
     def compilePlayerRegexs(self,  hand):
         players = set([player[1] for player in hand.players])
         if not players <= self.compiledPlayers: # x <= y means 'x is subset of y'
+
             self.compiledPlayers = players
             player_re = "(?P<PNAME>" + "|".join(map(re.escape, players)) + ")"
             subst = {'PLYR': player_re, 'CUR_SYM': hand.SYMBOL[hand.gametype['currency']],
                 'CUR': hand.gametype['currency'] if hand.gametype['currency']!='T$' else ''}
             for key in ('CUR_SYM', 'CUR'):
                 subst[key] = re.escape(subst[key])
-            log.debug("player_re: " + subst['PLYR'])
-            log.debug("CUR_SYM: " + subst['CUR_SYM'])
-            log.debug("CUR: " + subst['CUR'])
+            log.debug("player_re: '%s'" % subst['PLYR'])
+            log.debug("CUR_SYM: '%s'" % subst['CUR_SYM'])
+            log.debug("CUR: '%s'" % subst['CUR'])
             self.re_PostSB = re.compile(
-                r"^%(PLYR)s posts small blind \[%(CUR_SYM)s(?P<SB>[.0-9]+) ?%(CUR)s\]\." %  subst, 
+                r"^%(PLYR)s posts small blind \[%(CUR_SYM)s(?P<SB>[.0-9]+) ?%(CUR)s\]\." %  subst,
                 re.MULTILINE)
             self.re_PostBB = re.compile(
-                r"^%(PLYR)s posts big blind \[%(CUR_SYM)s(?P<BB>[.0-9]+) ?%(CUR)s\]\." %  subst, 
+                r"^%(PLYR)s posts big blind \[%(CUR_SYM)s(?P<BB>[.0-9]+) ?%(CUR)s\]\." %  subst,
+                re.MULTILINE)
+            # NOTE: comma is used as a fraction part delimeter in re below
+            self.re_PostDead = re.compile(
+                r"^%(PLYR)s posts big blind \+ dead \[(?P<BBNDEAD>[.,0-9]+) ?%(CUR_SYM)s\]\." %  subst,
                 re.MULTILINE)
             self.re_Antes = re.compile(
-                r"^%(PLYR)s posts ante \[%(CUR_SYM)s(?P<ANTE>[.0-9]+) ?%(CUR)s\]\." %  subst,
+                r"^%(PLYR)s posts ante \[%(CUR_SYM)s(?P<ANTE>[.0-9]+) ?%(CUR)s\]" %  subst,
                 re.MULTILINE)
             self.re_HeroCards = re.compile(
                 r"^Dealt to %(PLYR)s \[\s*(?P<NEWCARDS>.+)\s*\]" % subst,
@@ -133,28 +152,30 @@ class PartyPoker(HandHistoryConverter):
             self.re_Action = re.compile(r"""
                 ^%(PLYR)s\s+(?P<ATYPE>bets|checks|raises|calls|folds|is\sall-In)
                 (?:\s+\[%(CUR_SYM)s(?P<BET>[.,\d]+)\s*%(CUR)s\])?
-                """ %  subst, 
+                """ %  subst,
                 re.MULTILINE|re.VERBOSE)
             self.re_ShownCards = re.compile(
-                r"^%s (?P<SHOWED>(?:doesn\'t )?shows?) "  %  player_re + 
-                r"\[ *(?P<CARDS>.+) *\](?P<COMBINATION>.+)\.", 
+                r"^%s (?P<SHOWED>(?:doesn\'t )?shows?) "  %  player_re +
+                r"\[ *(?P<CARDS>.+) *\](?P<COMBINATION>.+)\.",
                 re.MULTILINE)
             self.re_CollectPot = re.compile(
-                r""""^%(PLYR)s \s+ wins \s+
-                %(CUR_SYM)s(?P<POT>[.\d]+)\s*%(CUR)s""" %  subst, 
+                r"""^%(PLYR)s \s+ wins \s+
+                %(CUR_SYM)s(?P<POT>[.,\d]+)\s*%(CUR)s""" %  subst,
                 re.MULTILINE|re.VERBOSE)
 
     def readSupportedGames(self):
         return [["ring", "hold", "nl"],
-                #["ring", "hold", "pl"],
-                #["ring", "hold", "fl"],
+                ["ring", "hold", "pl"],
+                ["ring", "hold", "fl"],
 
                 ["tour", "hold", "nl"],
-                #["tour", "hold", "pl"],
-                #["tour", "hold", "fl"],
+                ["tour", "hold", "pl"],
+                ["tour", "hold", "fl"],
                ]
 
     def _getGameType(self, handText):
+        if not hasattr(self, '_gameType'):
+            self._gameType = None
         if self._gameType is None:
             # let's determine whether hand is trny
             # and whether 5-th line contains head line
@@ -166,47 +187,45 @@ class PartyPoker(HandHistoryConverter):
                         self._gameType = m
                         return self._gameType
         return self._gameType
-    
+
     def determineGameType(self, handText):
         """inspect the handText and return the gametype dict
-        
+
         gametype dict is:
         {'limitType': xxx, 'base': xxx, 'category': xxx}"""
 
-        log.debug(self.ParsingException().wrapHh( handText ))
-        
+        log.debug(PartyPokerParseError().wrapHh( handText ))
+
         info = {}
         m = self._getGameType(handText)
         if m is None:
             return None
-        
+
         mg = m.groupdict()
         # translations from captured groups to fpdb info strings
-        limits = { 'NL':'nl', 
-#            'Pot Limit':'pl', 'Limit':'fl' 
-            }
+        limits = { 'NL':'nl', 'PL':'pl', '':'fl' }
         games = {                          # base, category
-                         "Texas Hold'em" : ('hold','holdem'), 
-                                #'Omaha' : ('hold','omahahi'),
+                         "Texas Hold'em" : ('hold','holdem'),
+                                'Omaha' : ('hold','omahahi'),
                }
         currencies = { '$':'USD', '':'T$' }
 
         for expectedField in ['LIMIT', 'GAME']:
             if mg[expectedField] is None:
-                raise self.ParsingException(
+                raise PartyPokerParseError(
                     "Cannot fetch field '%s'" % expectedField,
                     hh = handText)
         try:
-            info['limitType'] = limits[mg['LIMIT']]
+            info['limitType'] = limits[mg['LIMIT'].strip()]
         except:
-            raise self.ParsingException(
+            raise PartyPokerParseError(
                 "Unknown limit '%s'" % mg['LIMIT'],
                 hh = handText)
 
         try:
             (info['base'], info['category']) = games[mg['GAME']]
         except:
-            raise self.ParsingException(
+            raise PartyPokerParseError(
                 "Unknown game type '%s'" % mg['GAME'],
                 hh = handText)
 
@@ -215,36 +234,64 @@ class PartyPoker(HandHistoryConverter):
             info['type'] = 'tour'
         else:
             info['type'] = 'ring'
-        
+
         if info['type'] == 'ring':
             info['sb'], info['bb'] = ringBlinds(mg['RINGLIMIT'])
             # FIXME: there are only $ and play money availible for cash
+            # to be honest, party doesn't save play money hh
             info['currency'] = currencies[mg['CURRENCY']]
         else:
-            info['sb'] = renderTrnyMoney(mg['SB'])
-            info['bb'] = renderTrnyMoney(mg['BB'])
+            info['sb'] = clearMoneyString(mg['SB'])
+            info['bb'] = clearMoneyString(mg['BB'])
             info['currency'] = 'T$'
-            
+
         # NB: SB, BB must be interpreted as blinds or bets depending on limit type.
         return info
 
 
     def readHandInfo(self, hand):
         info = {}
-        m = self.re_HandInfo.search(hand.handText,re.DOTALL)
-        if m:
-            info.update(m.groupdict())
-        else:
-            raise self.ParsingException("Cannot read Handinfo for current hand", hh=hand.handText)
-        m = self._getGameType(hand.handText)
-        if m: info.update(m.groupdict())
-        m = self.re_Hid.search(hand.handText)
+        try:
+            info.update(self.re_Hid.search(hand.handText).groupdict())
+        except:
+            raise PartyPokerParseError("Cannot read HID for current hand", hh=hand.handText)
+
+        try:
+            info.update(self.re_HandInfo.search(hand.handText,re.DOTALL).groupdict())
+        except:
+            raise PartyPokerParseError("Cannot read Handinfo for current hand",
+            hh=hand.handText, hid = info['HID'])
+
+        try:
+            info.update(self._getGameType(hand.handText).groupdict())
+        except:
+            raise PartyPokerParseError("Cannot read GameType for current hand",
+            hh=hand.handText, hid = info['HID'])
+
+
+        m = self.re_TotalPlayers.search(hand.handText)
         if m: info.update(m.groupdict())
 
-        # FIXME: it's a hack cause party doesn't supply hand.maxseats info
-        #hand.maxseats = ???
-        hand.mixed = None
-        
+
+        # FIXME: it's dirty hack
+        # party doesnt subtract uncalled money from commited money
+        # so hand.totalPot calculation has to be redefined
+        from Hand import Pot, HoldemOmahaHand
+        def getNewTotalPot(origTotalPot):
+            def totalPot(self):
+                if self.totalpot is None:
+                    self.pot.end()
+                    self.totalpot = self.pot.total
+                for i,v in enumerate(self.collected):
+                    if v[0] in self.pot.returned:
+                        self.collected[i][1] = Decimal(v[1]) - self.pot.returned[v[0]]
+                return origTotalPot()
+            return totalPot
+        instancemethod = type(hand.totalPot)
+        hand.totalPot = instancemethod(getNewTotalPot(hand.totalPot), hand, HoldemOmahaHand)
+
+
+
         log.debug("readHandInfo: %s" % info)
         for key in info:
             if key == 'DATETIME':
@@ -260,7 +307,7 @@ class PartyPoker(HandHistoryConverter):
                 # FIXME: some timezone correction required
                 #tzShift = defaultdict(lambda:0, {'EDT': -5, 'EST': -6, 'MSKS': 3})
                 #hand.starttime -= datetime.timedelta(hours=tzShift[m2.group('TZ')])
-                  
+
             if key == 'HID':
                 hand.handid = info[key]
             if key == 'TABLE':
@@ -270,14 +317,14 @@ class PartyPoker(HandHistoryConverter):
             if key == 'TOURNO':
                 hand.tourNo = info[key]
             if key == 'BUYIN':
-                #FIXME: it's dirty hack T_T
+                # FIXME: it's dirty hack T_T
+                # code below assumes that rake is equal to zero
                 cur = info[key][0] if info[key][0] not in '0123456789' else ''
                 hand.buyin = info[key] + '+%s0' % cur
             if key == 'LEVEL':
                 hand.level = info[key]
             if key == 'PLAY' and info['PLAY'] != 'Real':
-                # TODO: play money wasn't tested
-#                hand.currency = 'play' # overrides previously set value
+                # if realy there's no play money hh on party
                 hand.gametype['currency'] = 'play'
 
     def readButton(self, hand):
@@ -293,13 +340,9 @@ class PartyPoker(HandHistoryConverter):
         players = []
         for a in m:
             hand.addPlayer(int(a.group('SEAT')), a.group('PNAME'),
-                           renderTrnyMoney(a.group('CASH')))
+                           clearMoneyString(a.group('CASH')))
 
     def markStreets(self, hand):
-        # PREFLOP = ** Dealing down cards **
-        # This re fails if,  say, river is missing; then we don't get the ** that starts the river.
-        assert hand.gametype['base'] == "hold", \
-            "wtf! There're no %s games on party" % hand.gametype['base']
         m =  re.search(
             r"\*{2} Dealing down cards \*{2}"
             r"(?P<PREFLOP>.+?)"
@@ -309,8 +352,8 @@ class PartyPoker(HandHistoryConverter):
             , hand.handText,re.DOTALL)
         hand.addStreets(m)
 
-    def readCommunityCards(self, hand, street): 
-        if street in ('FLOP','TURN','RIVER'):   
+    def readCommunityCards(self, hand, street):
+        if street in ('FLOP','TURN','RIVER'):
             m = self.re_Board.search(hand.streets[street])
             hand.setCommunityCards(street, renderCards(m.group('CARDS')))
 
@@ -319,12 +362,7 @@ class PartyPoker(HandHistoryConverter):
         m = self.re_Antes.finditer(hand.handText)
         for player in m:
             hand.addAnte(player.group('PNAME'), player.group('ANTE'))
-    
-    def readBringIn(self, hand):
-        m = self.re_BringIn.search(hand.handText,re.DOTALL)
-        if m:
-            hand.addBringIn(m.group('PNAME'),  m.group('BRINGIN'))
-        
+
     def readBlinds(self, hand):
         noSmallBlind = bool(self.re_NoSmallBlind.search(hand.handText))
         if hand.gametype['type'] == 'ring':
@@ -334,39 +372,44 @@ class PartyPoker(HandHistoryConverter):
                 hand.addBlind(m.group('PNAME'), 'small blind', m.group('SB'))
             except: # no small blind
                 hand.addBlind(None, None, None)
-              
+
             for a in self.re_PostBB.finditer(hand.handText):
                 hand.addBlind(a.group('PNAME'), 'big blind', a.group('BB'))
-        else: 
+
+            deadFilter = lambda s: s.replace(',', '.')
+            for a in self.re_PostDead.finditer(hand.handText):
+                hand.addBlind(a.group('PNAME'), 'both', deadFilter(a.group('BBNDEAD')))
+        else:
             # party doesn't track blinds for tournaments
             # so there're some cra^Wcaclulations
             if hand.buttonpos == 0:
                 self.readButton(hand)
             # NOTE: code below depends on Hand's implementation
             # playersMap - dict {seat: (pname,stack)}
-            playersMap = dict([(f[0], f[1:3]) for f in hand.players]) 
+            playersMap = dict([(f[0], f[1:3]) for f in hand.players])
             maxSeat = max(playersMap)
-            
+
             def findFirstNonEmptySeat(startSeat):
                 while startSeat not in playersMap:
-                    if startSeat >= maxSeat: 
+                    if startSeat >= maxSeat:
                         startSeat = 0
                     startSeat += 1
                 return startSeat
             smartMin = lambda A,B: A if float(A) <= float(B) else B
-            
+
             if noSmallBlind:
                 hand.addBlind(None, None, None)
+                smallBlindSeat = int(hand.buttonpos)
             else:
                 smallBlindSeat = findFirstNonEmptySeat(int(hand.buttonpos) + 1)
                 blind = smartMin(hand.sb, playersMap[smallBlindSeat][1])
                 hand.addBlind(playersMap[smallBlindSeat][0], 'small blind', blind)
-                    
+
             bigBlindSeat = findFirstNonEmptySeat(smallBlindSeat + 1)
             blind = smartMin(hand.bb, playersMap[bigBlindSeat][1])
-            hand.addBlind(playersMap[bigBlindSeat][0], 'small blind', blind)
-            
-                
+            hand.addBlind(playersMap[bigBlindSeat][0], 'big blind', blind)
+
+
 
     def readHeroCards(self, hand):
         # we need to grab hero's cards
@@ -383,18 +426,39 @@ class PartyPoker(HandHistoryConverter):
         m = self.re_Action.finditer(hand.streets[street])
         for action in m:
             acts = action.groupdict()
-            if action.group('ATYPE') in ('raises','is all-In'):
-                hand.addRaiseBy( street, action.group('PNAME'), action.group('BET') )
-            elif action.group('ATYPE') == 'calls':
-                hand.addCall( street, action.group('PNAME'), action.group('BET') )
-            elif action.group('ATYPE') == 'bets':
-                hand.addBet( street, action.group('PNAME'), action.group('BET') )
-            elif action.group('ATYPE') == 'folds':
-                hand.addFold( street, action.group('PNAME'))
-            elif action.group('ATYPE') == 'checks':
-                hand.addCheck( street, action.group('PNAME'))
+            playerName = action.group('PNAME')
+            amount = clearMoneyString(action.group('BET')) if action.group('BET') else None
+            actionType = action.group('ATYPE')
+
+            if actionType == 'is all-In':
+                # party's allin can mean either raise or bet or call
+                Bp = hand.lastBet[street]
+                if Bp == 0:
+                    actionType = 'bets'
+                elif Bp < Decimal(amount):
+                    actionType = 'raises'
+                else:
+                    actionType = 'calls'
+
+            if actionType == 'raises':
+                if street == 'PREFLOP' and \
+                    playerName in [item[0] for item in hand.actions['BLINDSANTES'] if item[2]!='ante']:
+                    # preflop raise from blind
+                    hand.addRaiseBy( street, playerName, amount )
+                else:
+                    hand.addCallandRaise( street, playerName, amount )
+            elif actionType == 'calls':
+                hand.addCall( street, playerName, amount )
+            elif actionType == 'bets':
+                hand.addBet( street, playerName, amount )
+            elif actionType == 'folds':
+                hand.addFold( street, playerName )
+            elif actionType == 'checks':
+                hand.addCheck( street, playerName )
             else:
-                print "DEBUG: unimplemented readAction: '%s' '%s'" %(action.group('PNAME'),action.group('ATYPE'),)
+                raise PartyPokerParseError(
+                    "Unimplemented readAction: '%s' '%s'" % (playerName,actionType,),
+                    hid = hand.hid, hh = hand.handText )
 
 
     def readShowdownActions(self, hand):
@@ -403,7 +467,7 @@ class PartyPoker(HandHistoryConverter):
 
     def readCollectPot(self,hand):
         for m in self.re_CollectPot.finditer(hand.handText):
-            hand.addCollectPot(player=m.group('PNAME'),pot=m.group('POT'))
+            hand.addCollectPot(player=m.group('PNAME'),pot=clearMoneyString(m.group('POT')))
 
     def readShownCards(self,hand):
         for m in self.re_ShownCards.finditer(hand.handText):
@@ -415,22 +479,22 @@ class PartyPoker(HandHistoryConverter):
                 else: mucked = True
 
                 hand.addShownCards(cards=cards, player=m.group('PNAME'), shown=shown, mucked=mucked)
-                
+
 def ringBlinds(ringLimit):
-    "Returns blinds for current limit"
-    ringLimit = float(ringLimit)
+    "Returns blinds for current limit in cash games"
+    ringLimit = float(clearMoneyString(ringLimit))
     if ringLimit == 5.: ringLimit = 4.
     return ('%.2f' % (ringLimit/200.), '%.2f' % (ringLimit/100.)  )
 
-def renderTrnyMoney(money):
-    "renders 'numbers' like '1 200' and '2,000'"
+def clearMoneyString(money):
+    "Renders 'numbers' like '1 200' and '2,000'"
     return money.replace(' ', '').replace(',', '')
 
 def renderCards(string):
-    "splits strings like ' Js, 4d '"
+    "Splits strings like ' Js, 4d '"
     cards = string.strip().split(' ')
     return filter(len, map(lambda x: x.strip(' ,'), cards))
-    
+
 
 if __name__ == "__main__":
     parser = OptionParser()
diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index 7f845b38..9085f3dd 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -37,7 +37,7 @@ class PokerStars(HandHistoryConverter):
     mixes = { 'HORSE': 'horse', '8-Game': '8game', 'HOSE': 'hose'} # Legal mixed games
     sym = {'USD': "\$", 'CAD': "\$", 'T$': "", "EUR": "\x80", "GBP": "\xa3"}         # ADD Euro, Sterling, etc HERE
     substitutions = {
-                     'LEGAL_ISO' : "USD|EUR|GBP|CAD",    # legal ISO currency codes
+                     'LEGAL_ISO' : "USD|EUR|GBP|CAD|FPP",    # legal ISO currency codes
                             'LS' : "\$|\x80|\xa3"        # legal currency symbols  ADD Euro, Sterling, etc HERE
                     }
 
diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index 18eaad5c..95bb24cc 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -1,2905 +1,2780 @@
-#!/usr/bin/env python
-"""SQL.py
-
-Set up all of the SQL statements for a given game and database type.
-"""
-#    Copyright 2008, Ray E. Barker
-#   
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#   
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#    GNU General Public License for more details.
-#   
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-#    NOTES:  The sql statements use the placeholder %s for bind variables
-#            which is then replaced by ? for sqlite. Comments can be included 
-#            within sql statements using C style /* ... */ comments, BUT
-#            THE COMMENTS MUST NOT INCLUDE %s OR ?.
-
-########################################################################
-
-#    Standard Library modules
-import re
-
-#    pyGTK modules
-
-#    FreePokerTools modules
-
-class Sql:
-   
-    def __init__(self, game = 'holdem', type = 'PT3', db_server = 'mysql'):
-        self.query = {}
-
-############################################################################
-#
-#    Support for the ptracks database, a cut down PT2 stud database.
-#    You can safely ignore this unless you are me.
-#
-        if game == 'razz' and type == 'ptracks':
-           
-            self.query['get_table_name'] = "select table_name from game where game_id = %s"
-
-            self.query['get_last_hand'] = "select max(game_id) from game"
-
-            self.query['get_recent_hands'] = "select game_id from game where game_id > %(last_hand)d"
-           
-            self.query['get_xml'] = "select xml from hand_history where game_id = %s"
-
-            self.query['get_player_id'] = """
-                    select player_id from players
-                    where screen_name = %(player)s
-                """
-               
-            self.query['get_hand_info'] = """
-                    SELECT
-                        game_id,
-                        CONCAT(hole_card_1, hole_card_2, hole_card_3, hole_card_4, hole_card_5, hole_card_6, hole_card_7) AS hand, 
-                        total_won-total_bet AS net
-                    FROM game_players
-                    WHERE game_id = %s AND player_id = 3
-                """
-
-            self.query['get_cards'] = """
-                    select
-                        seat_number,
-                        screen_name,
-                        hole_card_1,
-                        hole_card_2,
-                        hole_card_3,
-                        hole_card_4,
-                        hole_card_5,
-                        hole_card_6,
-                        hole_card_7
-                    from game_players, players
-                    where game_id = %s and game_players.player_id = players.player_id
-                    order by seat_number
-                """
-       
-            self.query['get_stats_from_hand'] = """
-                    SELECT player_id,
-                        count(*)                    AS n,
-                        sum(pre_fourth_raise_n)     AS pfr,
-                        sum(fourth_raise_n)         AS raise_n_2,
-                        sum(fourth_ck_raise_n)      AS cr_n_2,
-                        sum(fifth_bet_raise_n)      AS br_n_3,
-                        sum(fifth_bet_ck_raise_n)   AS cr_n_3,
-                        sum(sixth_bet_raise_n)      AS br_n_4,
-                        sum(sixth_bet_ck_raise_n)   AS cr_n_4,
-                        sum(river_bet_raise_n)      AS br_n_5,
-                        sum(river_bet_ck_raise_n)   AS cr_n_5,
-                        sum(went_to_showdown_n)     AS sd,
-                        sum(saw_fourth_n)           AS saw_f,
-                        sum(raised_first_pf)        AS first_pfr,
-                        sum(vol_put_money_in_pot)   AS vpip,
-                        sum(limp_with_prev_callers) AS limp_w_callers,
-
-                        sum(ppossible_actions)      AS poss_a_pf,
-                        sum(pfold)                  AS fold_pf,
-                        sum(pcheck)                 AS check_pf,
-                        sum(praise)                 AS raise_pf,
-                        sum(pcall)                  AS raise_pf,
-                        sum(limp_call_reraise_pf)   AS limp_call_pf,
-
-                        sum(pfr_check)              AS check_after_raise,
-                        sum(pfr_call)               AS call_after_raise,
-                        sum(pfr_fold)               AS fold_after_raise,
-                        sum(pfr_bet)                AS bet_after_raise,
-                        sum(pfr_raise)              AS raise_after_raise,
-                        sum(folded_to_river_bet)    AS fold_to_r_bet,
-
-                        sum(fpossible_actions)      AS poss_a_2,
-                        sum(ffold)                  AS fold_2,
-                        sum(fcheck)                 AS check_2,
-                        sum(fbet)                   AS bet_2,
-                        sum(fraise)                 AS raise_2,
-                        sum(fcall)                  AS raise_2,
-
-                        sum(fifpossible_actions)    AS poss_a_3,
-                        sum(fiffold)                AS fold_3,
-                        sum(fifcheck)               AS check_3,
-                        sum(fifbet)                 AS bet_3,
-                        sum(fifraise)               AS raise_3,
-                        sum(fifcall)                AS call_3,
-
-                        sum(spossible_actions)      AS poss_a_4,
-                        sum(sfold)                  AS fold_4,
-                        sum(scheck)                 AS check_4,
-                        sum(sbet)                   AS bet_4,
-                        sum(sraise)                 AS raise_4,
-                        sum(scall)                  AS call_4,
-
-                        sum(rpossible_actions)      AS poss_a_5,
-                        sum(rfold)                  AS fold_5,
-                        sum(rcheck)                 AS check_5,
-                        sum(rbet)                   AS bet_5,
-                        sum(rraise)                 AS raise_5,
-                        sum(rcall)                  AS call_5,
-
-                        sum(cold_call_pf)           AS cc_pf,
-                        sum(saw_fifth_n)            AS saw_3,
-                        sum(saw_sixth_n)            AS saw_4,
-                        sum(saw_river_n)            AS saw_5
-                    FROM game_players
-                    WHERE player_id in
-                        (SELECT player_id FROM game_players
-                        WHERE game_id = %s AND NOT player_id = %s)
-                    GROUP BY player_id
-                """
-# alternate form of WHERE for above
-#                        WHERE game_id = %(hand)d AND NOT player_id = %(hero)d)
-#                        WHERE game_id = %s AND NOT player_id = %s)
-
-            self.query['get_players_from_hand'] = """
-                    SELECT game_players.player_id, seat_number, screen_name
-                    FROM game_players INNER JOIN players ON (game_players.player_id = players.player_id)
-                    WHERE game_id = %s
-                """
-
-###############################################################################3
-#    Support for the Free Poker DataBase = fpdb   http://fpdb.sourceforge.net/
-#
-        if type == 'fpdb':
-
-            ################################
-            # List tables
-            ################################
-            if db_server == 'mysql':
-                self.query['list_tables'] = """SHOW TABLES"""
-            elif db_server == 'postgresql':
-                self.query['list_tables'] = """SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'"""
-            elif db_server == 'sqlite':
-                self.query['list_tables'] = """SELECT name FROM sqlite_master
-                WHERE type='table'
-                ORDER BY name;"""
-
-            ##################################################################
-            # Drop Tables - MySQL, PostgreSQL and SQLite all share same syntax
-            ##################################################################
-
-            self.query['drop_table'] = """DROP TABLE IF EXISTS """   
-
-
-            ################################
-            # Create Settings
-            ################################
-            if db_server == 'mysql':
-                self.query['createSettingsTable'] = """CREATE TABLE Settings (
-                                            version SMALLINT NOT NULL)
-                                    ENGINE=INNODB"""
-            elif db_server == 'postgresql':
-                self.query['createSettingsTable'] =  """CREATE TABLE Settings (version SMALLINT NOT NULL)"""
-
-            elif db_server == 'sqlite':
-                self.query['createSettingsTable'] = """CREATE TABLE Settings
-                (version INTEGER NOT NULL) """
-
-
-            ################################
-            # Create Sites
-            ################################
-
-            if db_server == 'mysql':
-                self.query['createSitesTable'] = """CREATE TABLE Sites (
-                            id SMALLINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
-                            name varchar(32) NOT NULL,
-                            currency char(3) NOT NULL)
-                            ENGINE=INNODB"""
-            elif db_server == 'postgresql':
-                self.query['createSitesTable'] = """CREATE TABLE Sites (
-                            id SERIAL, PRIMARY KEY (id),
-                            name varchar(32),
-                            currency char(3))"""
-            elif db_server == 'sqlite':
-                self.query['createSitesTable'] = """CREATE TABLE Sites (
-                            id INTEGER PRIMARY KEY,
-                            name TEXT NOT NULL,
-                            currency TEXT NOT NULL)"""
-
-
-            ################################
-            # Create Gametypes
-            ################################
-
-            if db_server == 'mysql':
-                self.query['createGametypesTable'] = """CREATE TABLE Gametypes (
-                            id SMALLINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
-                            siteId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (siteId) REFERENCES Sites(id),
-                            type char(4) NOT NULL,
-                            base char(4) NOT NULL,
-                            category varchar(9) NOT NULL,
-                            limitType char(2) NOT NULL,
-                            hiLo char(1) NOT NULL,
-                            smallBlind int,
-                            bigBlind int,
-                            smallBet int NOT NULL,
-                            bigBet int NOT NULL)
-                            ENGINE=INNODB"""
-            elif db_server == 'postgresql':
-                self.query['createGametypesTable'] = """CREATE TABLE Gametypes (
-                            id SERIAL, PRIMARY KEY (id),
-                            siteId INTEGER, FOREIGN KEY (siteId) REFERENCES Sites(id),
-                            type char(4),
-                            base char(4),
-                            category varchar(9),
-                            limitType char(2),
-                            hiLo char(1),
-                            smallBlind int,
-                            bigBlind int,
-                            smallBet int,
-                            bigBet int)"""
-            elif db_server == 'sqlite':
-                self.query['createGametypesTable'] = """CREATE TABLE GameTypes (
-                            id INTEGER PRIMARY KEY,
-                            siteId INTEGER,
-                            type TEXT,
-                            base TEXT,
-                            category TEXT,
-                            limitType TEXT,
-                            hiLo TEXT,
-                            smallBlind INTEGER,
-                            bigBlind INTEGER,
-                            smallBet INTEGER,
-                            bigBet INTEGER,
-                            FOREIGN KEY(siteId) REFERENCES Sites(id) ON DELETE CASCADE)"""
-
-
-            ################################
-            # Create Players
-            ################################
-
-            if db_server == 'mysql':
-                self.query['createPlayersTable'] = """CREATE TABLE Players (
-                                id INT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
-                                name VARCHAR(32) CHARACTER SET utf8 NOT NULL,
-                                siteId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (siteId) REFERENCES Sites(id),
-                                comment text,
-                                commentTs DATETIME)
-                            ENGINE=INNODB"""
-            elif db_server == 'postgresql':
-                self.query['createPlayersTable'] = """CREATE TABLE Players (
-                            id SERIAL, PRIMARY KEY (id),
-                            name VARCHAR(32),
-                            siteId INTEGER, FOREIGN KEY (siteId) REFERENCES Sites(id),
-                            comment text,
-                            commentTs timestamp without time zone)"""
-            elif db_server == 'sqlite':
-                self.query['createPlayersTable'] = """CREATE TABLE Players (
-                            id INTEGER PRIMARY KEY,
-                            name TEXT,
-                            siteId INTEGER,
-                            comment TEXT,
-                            commentTs REAL,
-                            FOREIGN KEY(siteId) REFERENCES Sites(id) ON DELETE CASCADE)"""
-
-
-            ################################
-            # Create Autorates
-            ################################
-
-            if db_server == 'mysql':
-                self.query['createAutoratesTable'] = """CREATE TABLE Autorates (
-                                id BIGINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
-                                playerId INT UNSIGNED NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
-                                gametypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
-                                description varchar(50) NOT NULL,
-                                shortDesc char(8) NOT NULL,
-                                ratingTime DATETIME NOT NULL,
-                                handCount int NOT NULL)
-                            ENGINE=INNODB"""
-            elif db_server == 'postgresql':
-                self.query['createAutoratesTable'] = """CREATE TABLE Autorates (
-                                id BIGSERIAL, PRIMARY KEY (id),
-                                playerId INT, FOREIGN KEY (playerId) REFERENCES Players(id),
-                                gametypeId INT, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
-                                description varchar(50),
-                                shortDesc char(8),
-                                ratingTime timestamp without time zone,
-                                handCount int)"""
-            elif db_server == 'sqlite':
-                self.query['createAutoratesTable'] = """CREATE TABLE Autorates (
-                                id INTEGER PRIMARY KEY,
-                                playerId INT,
-                                gametypeId INT,
-                                description TEXT,
-                                shortDesc TEXT,
-                                ratingTime REAL,
-                                handCount int)"""
-
-
-            ################################
-            # Create Hands
-            ################################
-
-            if db_server == 'mysql':
-                self.query['createHandsTable'] = """CREATE TABLE Hands (
-                                id BIGINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
-                                tableName VARCHAR(20) NOT NULL,
-                                siteHandNo BIGINT NOT NULL,
-                                gametypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
-                                handStart DATETIME NOT NULL,
-                                importTime DATETIME NOT NULL,
-                                seats TINYINT NOT NULL,
-                                maxSeats TINYINT NOT NULL,
-                                boardcard1 smallint,  /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */
-                                boardcard2 smallint,
-                                boardcard3 smallint,
-                                boardcard4 smallint,
-                                boardcard5 smallint,
-                                texture smallint,
-                                playersVpi SMALLINT NOT NULL,         /* num of players vpi */
-                                playersAtStreet1 SMALLINT NOT NULL,   /* num of players seeing flop/street4 */
-                                playersAtStreet2 SMALLINT NOT NULL,
-                                playersAtStreet3 SMALLINT NOT NULL,
-                                playersAtStreet4 SMALLINT NOT NULL,
-                                playersAtShowdown SMALLINT NOT NULL,
-                                street0Raises TINYINT NOT NULL, /* num small bets paid to see flop/street4, including blind */
-                                street1Raises TINYINT NOT NULL, /* num small bets paid to see turn/street5 */
-                                street2Raises TINYINT NOT NULL, /* num big bets paid to see river/street6 */
-                                street3Raises TINYINT NOT NULL, /* num big bets paid to see sd/street7 */
-                                street4Raises TINYINT NOT NULL, /* num big bets paid to see showdown */
-                                street1Pot INT,                  /* pot size at flop/street4 */
-                                street2Pot INT,                  /* pot size at turn/street5 */
-                                street3Pot INT,                  /* pot size at river/street6 */
-                                street4Pot INT,                  /* pot size at sd/street7 */
-                                showdownPot INT,                 /* pot size at sd/street7 */
-                                comment TEXT,
-                                commentTs DATETIME)
-                            ENGINE=INNODB"""
-            elif db_server == 'postgresql':
-                self.query['createHandsTable'] = """CREATE TABLE Hands (
-                                id BIGSERIAL, PRIMARY KEY (id),
-                                tableName VARCHAR(20) NOT NULL,
-                                siteHandNo BIGINT NOT NULL,
-                                gametypeId INT NOT NULL, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
-                                handStart timestamp without time zone NOT NULL,
-                                importTime timestamp without time zone NOT NULL,
-                                seats SMALLINT NOT NULL,
-                                maxSeats SMALLINT NOT NULL,
-                                boardcard1 smallint,  /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */
-                                boardcard2 smallint,
-                                boardcard3 smallint,
-                                boardcard4 smallint,
-                                boardcard5 smallint,
-                                texture smallint,
-                                playersVpi SMALLINT NOT NULL,         /* num of players vpi */
-                                playersAtStreet1 SMALLINT NOT NULL,   /* num of players seeing flop/street4 */
-                                playersAtStreet2 SMALLINT NOT NULL,
-                                playersAtStreet3 SMALLINT NOT NULL,
-                                playersAtStreet4 SMALLINT NOT NULL,
-                                playersAtShowdown SMALLINT NOT NULL,
-                                street0Raises SMALLINT NOT NULL, /* num small bets paid to see flop/street4, including blind */
-                                street1Raises SMALLINT NOT NULL, /* num small bets paid to see turn/street5 */
-                                street2Raises SMALLINT NOT NULL, /* num big bets paid to see river/street6 */
-                                street3Raises SMALLINT NOT NULL, /* num big bets paid to see sd/street7 */
-                                street4Raises SMALLINT NOT NULL, /* num big bets paid to see showdown */
-                                street1Pot INT,                 /* pot size at flop/street4 */
-                                street2Pot INT,                 /* pot size at turn/street5 */
-                                street3Pot INT,                 /* pot size at river/street6 */
-                                street4Pot INT,                 /* pot size at sd/street7 */
-                                showdownPot INT,                /* pot size at sd/street7 */
-                                comment TEXT,
-                                commentTs timestamp without time zone)"""
-            elif db_server == 'sqlite':
-                self.query['createHandsTable'] = """CREATE TABLE Hands (
-                                id INTEGER PRIMARY KEY,
-                                tableName TEXT(20) NOT NULL,
-                                siteHandNo INT NOT NULL,
-                                gametypeId INT NOT NULL,
-                                handStart REAL NOT NULL,
-                                importTime REAL NOT NULL,
-                                seats INT NOT NULL,
-                                maxSeats INT NOT NULL,
-                                boardcard1 INT,  /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */
-                                boardcard2 INT,
-                                boardcard3 INT,
-                                boardcard4 INT,
-                                boardcard5 INT,
-                                texture INT,
-                                playersVpi INT NOT NULL,         /* num of players vpi */
-                                playersAtStreet1 INT NOT NULL,   /* num of players seeing flop/street4 */
-                                playersAtStreet2 INT NOT NULL,
-                                playersAtStreet3 INT NOT NULL,
-                                playersAtStreet4 INT NOT NULL,
-                                playersAtShowdown INT NOT NULL,
-                                street0Raises INT NOT NULL, /* num small bets paid to see flop/street4, including blind */
-                                street1Raises INT NOT NULL, /* num small bets paid to see turn/street5 */
-                                street2Raises INT NOT NULL, /* num big bets paid to see river/street6 */
-                                street3Raises INT NOT NULL, /* num big bets paid to see sd/street7 */
-                                street4Raises INT NOT NULL, /* num big bets paid to see showdown */
-                                street1Pot INT,                 /* pot size at flop/street4 */
-                                street2Pot INT,                 /* pot size at turn/street5 */
-                                street3Pot INT,                 /* pot size at river/street6 */
-                                street4Pot INT,                 /* pot size at sd/street7 */
-                                showdownPot INT,                /* pot size at sd/street7 */
-                                comment TEXT,
-                                commentTs REAL)"""
-
-
-            ################################
-            # Create TourneyTypes
-            ################################
-
-            if db_server == 'mysql':
-                self.query['createTourneyTypesTable'] = """CREATE TABLE TourneyTypes (
-                                id SMALLINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
-                                siteId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (siteId) REFERENCES Sites(id),
-                                buyin INT NOT NULL,
-                                fee INT NOT NULL,
-                                knockout INT NOT NULL,
-                                rebuyOrAddon BOOLEAN NOT NULL)
-                            ENGINE=INNODB"""
-            elif db_server == 'postgresql':
-                self.query['createTourneyTypesTable'] = """CREATE TABLE TourneyTypes (
-                            id SERIAL, PRIMARY KEY (id),
-                            siteId INT NOT NULL, FOREIGN KEY (siteId) REFERENCES Sites(id),
-                            buyin INT NOT NULL,
-                            fee INT NOT NULL,
-                            knockout INT NOT NULL,
-                            rebuyOrAddon BOOLEAN NOT NULL)"""
-            elif db_server == 'sqlite':
-                self.query['createTourneyTypesTable'] = """CREATE TABLE TourneyTypes (
-                            id INTEGER PRIMARY KEY,
-                            siteId INT NOT NULL,
-                            buyin INT NOT NULL,
-                            fee INT NOT NULL,
-                            knockout INT NOT NULL,
-                            rebuyOrAddon BOOLEAN NOT NULL)"""
-
-            ################################
-            # Create Tourneys
-            ################################
-
-            if db_server == 'mysql':
-                self.query['createTourneysTable'] = """CREATE TABLE Tourneys (
-                            id INT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
-                            tourneyTypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
-                            siteTourneyNo BIGINT NOT NULL,
-                            entries INT NOT NULL,
-                            prizepool INT NOT NULL,
-                            startTime DATETIME NOT NULL,
-                            comment TEXT,
-                            commentTs DATETIME)
-                            ENGINE=INNODB"""
-            elif db_server == 'postgresql':
-                self.query['createTourneysTable'] = """CREATE TABLE Tourneys (
-                            id SERIAL, PRIMARY KEY (id),
-                            tourneyTypeId INT, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
-                            siteTourneyNo BIGINT,
-                            entries INT,
-                            prizepool INT,
-                            startTime timestamp without time zone,
-                            comment TEXT,
-                            commentTs timestamp without time zone)"""
-            elif db_server == 'sqlite':
-                self.query['createTourneysTable'] = """CREATE TABLE Tourneys (
-                            id INTEGER PRIMARY KEY,
-                            tourneyTypeId INT,
-                            siteTourneyNo INT,
-                            entries INT,
-                            prizepool INT,
-                            startTime REAL,
-                            comment TEXT,
-                            commentTs REAL)"""
-            ################################
-            # Create HandsPlayers
-            ################################
-
-            if db_server == 'mysql':
-                self.query['createHandsPlayersTable'] = """CREATE TABLE HandsPlayers (
-                            id BIGINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
-                            handId BIGINT UNSIGNED NOT NULL, FOREIGN KEY (handId) REFERENCES Hands(id),
-                            playerId INT UNSIGNED NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
-                            startCash INT NOT NULL,
-                            position CHAR(1),
-                            seatNo SMALLINT NOT NULL,
-                        
-                            card1 smallint NOT NULL,  /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */
-                            card2 smallint NOT NULL,
-                            card3 smallint,
-                            card4 smallint,
-                            card5 smallint,
-                            card6 smallint,
-                            card7 smallint,
-                            startCards smallint,
-                        
-                            ante INT,
-                            winnings int NOT NULL,
-                            rake int NOT NULL,
-                            totalProfit INT,
-                            comment text,
-                            commentTs DATETIME,
-                            tourneysPlayersId BIGINT UNSIGNED,
-                            tourneyTypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
-
-                            wonWhenSeenStreet1 FLOAT,
-                            wonWhenSeenStreet2 FLOAT,
-                            wonWhenSeenStreet3 FLOAT,
-                            wonWhenSeenStreet4 FLOAT,
-                            wonAtSD FLOAT,
-
-                            street0VPI BOOLEAN,
-                            street0Aggr BOOLEAN,
-                            street0_3BChance BOOLEAN,
-                            street0_3BDone BOOLEAN,
-                            street0_4BChance BOOLEAN,
-                            street0_4BDone BOOLEAN,
-                            other3BStreet0 BOOLEAN,
-                            other4BStreet0 BOOLEAN,
-
-                            street1Seen BOOLEAN,
-                            street2Seen BOOLEAN,
-                            street3Seen BOOLEAN,
-                            street4Seen BOOLEAN,
-                            sawShowdown BOOLEAN,
-
-                            street1Aggr BOOLEAN,
-                            street2Aggr BOOLEAN,
-                            street3Aggr BOOLEAN,
-                            street4Aggr BOOLEAN,
-
-                            otherRaisedStreet0 BOOLEAN,
-                            otherRaisedStreet1 BOOLEAN,
-                            otherRaisedStreet2 BOOLEAN,
-                            otherRaisedStreet3 BOOLEAN,
-                            otherRaisedStreet4 BOOLEAN,
-                            foldToOtherRaisedStreet0 BOOLEAN,
-                            foldToOtherRaisedStreet1 BOOLEAN,
-                            foldToOtherRaisedStreet2 BOOLEAN,
-                            foldToOtherRaisedStreet3 BOOLEAN,
-                            foldToOtherRaisedStreet4 BOOLEAN,
-
-                            stealAttemptChance BOOLEAN,
-                            stealAttempted BOOLEAN,
-                            foldBbToStealChance BOOLEAN,
-                            foldedBbToSteal BOOLEAN,
-                            foldSbToStealChance BOOLEAN,
-                            foldedSbToSteal BOOLEAN,
-
-                            street1CBChance BOOLEAN,
-                            street1CBDone BOOLEAN,
-                            street2CBChance BOOLEAN,
-                            street2CBDone BOOLEAN,
-                            street3CBChance BOOLEAN,
-                            street3CBDone BOOLEAN,
-                            street4CBChance BOOLEAN,
-                            street4CBDone BOOLEAN,
-
-                            foldToStreet1CBChance BOOLEAN,
-                            foldToStreet1CBDone BOOLEAN,
-                            foldToStreet2CBChance BOOLEAN,
-                            foldToStreet2CBDone BOOLEAN,
-                            foldToStreet3CBChance BOOLEAN,
-                            foldToStreet3CBDone BOOLEAN,
-                            foldToStreet4CBChance BOOLEAN,
-                            foldToStreet4CBDone BOOLEAN,
-
-                            street1CheckCallRaiseChance BOOLEAN,
-                            street1CheckCallRaiseDone BOOLEAN,
-                            street2CheckCallRaiseChance BOOLEAN,
-                            street2CheckCallRaiseDone BOOLEAN,
-                            street3CheckCallRaiseChance BOOLEAN,
-                            street3CheckCallRaiseDone BOOLEAN,
-                            street4CheckCallRaiseChance BOOLEAN,
-                            street4CheckCallRaiseDone BOOLEAN,
-
-                            street0Calls TINYINT,
-                            street1Calls TINYINT,
-                            street2Calls TINYINT,
-                            street3Calls TINYINT,
-                            street4Calls TINYINT,
-                            street0Bets TINYINT,
-                            street1Bets TINYINT,
-                            street2Bets TINYINT,
-                            street3Bets TINYINT,
-                            street4Bets TINYINT,
-                            street0Raises TINYINT,
-                            street1Raises TINYINT,
-                            street2Raises TINYINT,
-                            street3Raises TINYINT,
-                            street4Raises TINYINT,
-
-                            actionString VARCHAR(15),
-
-                            FOREIGN KEY (tourneysPlayersId) REFERENCES TourneysPlayers(id))
-                            ENGINE=INNODB"""
-            elif db_server == 'postgresql':
-                self.query['createHandsPlayersTable'] = """CREATE TABLE HandsPlayers (
-                            id BIGSERIAL, PRIMARY KEY (id),
-                            handId BIGINT NOT NULL, FOREIGN KEY (handId) REFERENCES Hands(id),
-                            playerId INT NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
-                            startCash INT NOT NULL,
-                            position CHAR(1),
-                            seatNo SMALLINT NOT NULL,
-
-                            card1 smallint NOT NULL,  /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */
-                            card2 smallint NOT NULL,
-                            card3 smallint,
-                            card4 smallint,
-                            card5 smallint,
-                            card6 smallint,
-                            card7 smallint,
-                            startCards smallint,
-
-                            ante INT,
-                            winnings int NOT NULL,
-                            rake int NOT NULL,
-                            totalProfit INT,
-                            comment text,
-                            commentTs timestamp without time zone,
-                            tourneysPlayersId BIGINT,
-                            tourneyTypeId INT NOT NULL, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
-
-                            wonWhenSeenStreet1 FLOAT,
-                            wonWhenSeenStreet2 FLOAT,
-                            wonWhenSeenStreet3 FLOAT,
-                            wonWhenSeenStreet4 FLOAT,
-                            wonAtSD FLOAT,
-
-                            street0VPI BOOLEAN,
-                            street0Aggr BOOLEAN,
-                            street0_3BChance BOOLEAN,
-                            street0_3BDone BOOLEAN,
-                            street0_4BChance BOOLEAN,
-                            street0_4BDone BOOLEAN,
-                            other3BStreet0 BOOLEAN,
-                            other4BStreet0 BOOLEAN,
-
-                            street1Seen BOOLEAN,
-                            street2Seen BOOLEAN,
-                            street3Seen BOOLEAN,
-                            street4Seen BOOLEAN,
-                            sawShowdown BOOLEAN,
-
-                            street1Aggr BOOLEAN,
-                            street2Aggr BOOLEAN,
-                            street3Aggr BOOLEAN,
-                            street4Aggr BOOLEAN,
-
-                            otherRaisedStreet0 BOOLEAN,
-                            otherRaisedStreet1 BOOLEAN,
-                            otherRaisedStreet2 BOOLEAN,
-                            otherRaisedStreet3 BOOLEAN,
-                            otherRaisedStreet4 BOOLEAN,
-                            foldToOtherRaisedStreet0 BOOLEAN,
-                            foldToOtherRaisedStreet1 BOOLEAN,
-                            foldToOtherRaisedStreet2 BOOLEAN,
-                            foldToOtherRaisedStreet3 BOOLEAN,
-                            foldToOtherRaisedStreet4 BOOLEAN,
-
-                            stealAttemptChance BOOLEAN,
-                            stealAttempted BOOLEAN,
-                            foldBbToStealChance BOOLEAN,
-                            foldedBbToSteal BOOLEAN,
-                            foldSbToStealChance BOOLEAN,
-                            foldedSbToSteal BOOLEAN,
-
-                            street1CBChance BOOLEAN,
-                            street1CBDone BOOLEAN,
-                            street2CBChance BOOLEAN,
-                            street2CBDone BOOLEAN,
-                            street3CBChance BOOLEAN,
-                            street3CBDone BOOLEAN,
-                            street4CBChance BOOLEAN,
-                            street4CBDone BOOLEAN,
-
-                            foldToStreet1CBChance BOOLEAN,
-                            foldToStreet1CBDone BOOLEAN,
-                            foldToStreet2CBChance BOOLEAN,
-                            foldToStreet2CBDone BOOLEAN,
-                            foldToStreet3CBChance BOOLEAN,
-                            foldToStreet3CBDone BOOLEAN,
-                            foldToStreet4CBChance BOOLEAN,
-                            foldToStreet4CBDone BOOLEAN,
-
-                            street1CheckCallRaiseChance BOOLEAN,
-                            street1CheckCallRaiseDone BOOLEAN,
-                            street2CheckCallRaiseChance BOOLEAN,
-                            street2CheckCallRaiseDone BOOLEAN,
-                            street3CheckCallRaiseChance BOOLEAN,
-                            street3CheckCallRaiseDone BOOLEAN,
-                            street4CheckCallRaiseChance BOOLEAN,
-                            street4CheckCallRaiseDone BOOLEAN,
-
-                            street0Calls SMALLINT,
-                            street1Calls SMALLINT,
-                            street2Calls SMALLINT,
-                            street3Calls SMALLINT,
-                            street4Calls SMALLINT,
-                            street0Bets SMALLINT,
-                            street1Bets SMALLINT,
-                            street2Bets SMALLINT,
-                            street3Bets SMALLINT,
-                            street4Bets SMALLINT,
-                            street0Raises SMALLINT,
-                            street1Raises SMALLINT,
-                            street2Raises SMALLINT,
-                            street3Raises SMALLINT,
-                            street4Raises SMALLINT,
-
-                            actionString VARCHAR(15),
-
-                            FOREIGN KEY (tourneysPlayersId) REFERENCES TourneysPlayers(id))"""
-            elif db_server == 'sqlite':
-                self.query['createHandsPlayersTable'] = """CREATE TABLE HandsPlayers (
-                            id INTEGER PRIMARY KEY,
-                            handId INT NOT NULL,
-                            playerId INT NOT NULL,
-                            startCash INT NOT NULL,
-                            position TEXT,
-                            seatNo INT NOT NULL,
-                        
-                            card1 INT NOT NULL,  /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */
-                            card2 INT NOT NULL,
-                            card3 INT,
-                            card4 INT,
-                            card5 INT,
-                            card6 INT,
-                            card7 INT,
-                            startCards INT,
-                        
-                            ante INT,
-                            winnings INT NOT NULL,
-                            rake INT NOT NULL,
-                            totalProfit INT,
-                            comment TEXT,
-                            commentTs REAL,
-                            tourneysPlayersId INT,
-                            tourneyTypeId INT NOT NULL,
-
-                            wonWhenSeenStreet1 REAL,
-                            wonWhenSeenStreet2 REAL,
-                            wonWhenSeenStreet3 REAL,
-                            wonWhenSeenStreet4 REAL,
-                            wonAtSD REAL,
-
-                            street0VPI INT,
-                            street0Aggr INT,
-                            street0_3BChance INT,
-                            street0_3BDone INT,
-                            street0_4BChance INT,
-                            street0_4BDone INT,
-                            other3BStreet0 INT,
-                            other4BStreet0 INT,
-
-                            street1Seen INT,
-                            street2Seen INT,
-                            street3Seen INT,
-                            street4Seen INT,
-                            sawShowdown INT,
-
-                            street1Aggr INT,
-                            street2Aggr INT,
-                            street3Aggr INT,
-                            street4Aggr INT,
-
-                            otherRaisedStreet0 INT,
-                            otherRaisedStreet1 INT,
-                            otherRaisedStreet2 INT,
-                            otherRaisedStreet3 INT,
-                            otherRaisedStreet4 INT,
-                            foldToOtherRaisedStreet0 INT,
-                            foldToOtherRaisedStreet1 INT,
-                            foldToOtherRaisedStreet2 INT,
-                            foldToOtherRaisedStreet3 INT,
-                            foldToOtherRaisedStreet4 INT,
-
-                            stealAttemptChance INT,
-                            stealAttempted INT,
-                            foldBbToStealChance INT,
-                            foldedBbToSteal INT,
-                            foldSbToStealChance INT,
-                            foldedSbToSteal INT,
-
-                            street1CBChance INT,
-                            street1CBDone INT,
-                            street2CBChance INT,
-                            street2CBDone INT,
-                            street3CBChance INT,
-                            street3CBDone INT,
-                            street4CBChance INT,
-                            street4CBDone INT,
-
-                            foldToStreet1CBChance INT,
-                            foldToStreet1CBDone INT,
-                            foldToStreet2CBChance INT,
-                            foldToStreet2CBDone INT,
-                            foldToStreet3CBChance INT,
-                            foldToStreet3CBDone INT,
-                            foldToStreet4CBChance INT,
-                            foldToStreet4CBDone INT,
-
-                            street1CheckCallRaiseChance INT,
-                            street1CheckCallRaiseDone INT,
-                            street2CheckCallRaiseChance INT,
-                            street2CheckCallRaiseDone INT,
-                            street3CheckCallRaiseChance INT,
-                            street3CheckCallRaiseDone INT,
-                            street4CheckCallRaiseChance INT,
-                            street4CheckCallRaiseDone INT,
-
-                            street0Calls INT,
-                            street1Calls INT,
-                            street2Calls INT,
-                            street3Calls INT,
-                            street4Calls INT,
-                            street0Bets INT,
-                            street1Bets INT,
-                            street2Bets INT,
-                            street3Bets INT,
-                            street4Bets INT,
-                            street0Raises INT,
-                            street1Raises INT,
-                            street2Raises INT,
-                            street3Raises INT,
-                            street4Raises INT,
-
-                            actionString REAL)
-                            """
-
-
-            ################################
-            # Create TourneysPlayers
-            ################################
-
-            if db_server == 'mysql':
-                self.query['createTourneysPlayersTable'] = """CREATE TABLE TourneysPlayers (
-                            id BIGINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
-                            tourneyId INT UNSIGNED NOT NULL, FOREIGN KEY (tourneyId) REFERENCES Tourneys(id),
-                            playerId INT UNSIGNED NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
-                            payinAmount INT NOT NULL,
-                            rank INT NOT NULL,
-                            winnings INT NOT NULL,
-                            comment TEXT,
-                            commentTs DATETIME)
-                            ENGINE=INNODB"""
-            elif db_server == 'postgresql':
-                self.query['createTourneysPlayersTable'] = """CREATE TABLE TourneysPlayers (
-                            id BIGSERIAL, PRIMARY KEY (id),
-                            tourneyId INT, FOREIGN KEY (tourneyId) REFERENCES Tourneys(id),
-                            playerId INT, FOREIGN KEY (playerId) REFERENCES Players(id),
-                            payinAmount INT,
-                            rank INT,
-                            winnings INT,
-                            comment TEXT,
-                            commentTs timestamp without time zone)"""
-            elif db_server == 'sqlite':
-                self.query['createTourneysPlayersTable'] = """ """
-
-
-            ################################
-            # Create HandsActions
-            ################################
-
-            if db_server == 'mysql':
-                self.query['createHandsActionsTable'] = """CREATE TABLE HandsActions (
-                            id BIGINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
-                            handsPlayerId BIGINT UNSIGNED NOT NULL, FOREIGN KEY (handsPlayerId) REFERENCES HandsPlayers(id),
-                            street SMALLINT NOT NULL,
-                            actionNo SMALLINT NOT NULL,
-                            action CHAR(5) NOT NULL,
-                            allIn BOOLEAN NOT NULL,
-                            amount INT NOT NULL,
-                            comment TEXT,
-                            commentTs DATETIME)
-                            ENGINE=INNODB"""
-            elif db_server == 'postgresql':
-                self.query['createHandsActionsTable'] = """CREATE TABLE HandsActions (
-                            id BIGSERIAL, PRIMARY KEY (id),
-                            handsPlayerId BIGINT, FOREIGN KEY (handsPlayerId) REFERENCES HandsPlayers(id),
-                            street SMALLINT,
-                            actionNo SMALLINT,
-                            action CHAR(5),
-                            allIn BOOLEAN,
-                            amount INT,
-                            comment TEXT,
-                            commentTs timestamp without time zone)"""
-            elif db_server == 'sqlite':
-                self.query['createHandsActionsTable'] = """ """
-
-
-            ################################
-            # Create HudCache
-            ################################
-
-            if db_server == 'mysql':
-                self.query['createHudCacheTable'] = """CREATE TABLE HudCache (
-                            id BIGINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
-                            gametypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
-                            playerId INT UNSIGNED NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
-                            activeSeats SMALLINT NOT NULL,
-                            position CHAR(1),
-                            tourneyTypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
-                            styleKey CHAR(7) NOT NULL,  /* 1st char is style (A/T/H/S), other 6 are the key */
-                            HDs INT NOT NULL,
-
-                            wonWhenSeenStreet1 FLOAT,
-                            wonWhenSeenStreet2 FLOAT,
-                            wonWhenSeenStreet3 FLOAT,
-                            wonWhenSeenStreet4 FLOAT,
-                            wonAtSD FLOAT,
-
-                            street0VPI INT,
-                            street0Aggr INT,
-                            street0_3BChance INT,
-                            street0_3BDone INT,
-                            street0_4BChance INT,
-                            street0_4BDone INT,
-                            other3BStreet0 INT,
-                            other4BStreet0 INT,
-
-                            street1Seen INT,
-                            street2Seen INT,
-                            street3Seen INT,
-                            street4Seen INT,
-                            sawShowdown INT,
-                            
-                            street1Aggr INT,
-                            street2Aggr INT,
-                            street3Aggr INT,
-                            street4Aggr INT,
-
-                            otherRaisedStreet0 INT,
-                            otherRaisedStreet1 INT,
-                            otherRaisedStreet2 INT,
-                            otherRaisedStreet3 INT,
-                            otherRaisedStreet4 INT,
-                            foldToOtherRaisedStreet0 INT,
-                            foldToOtherRaisedStreet1 INT,
-                            foldToOtherRaisedStreet2 INT,
-                            foldToOtherRaisedStreet3 INT,
-                            foldToOtherRaisedStreet4 INT,
-                            
-                            stealAttemptChance INT,
-                            stealAttempted INT,
-                            foldBbToStealChance INT,
-                            foldedBbToSteal INT,
-                            foldSbToStealChance INT,
-                            foldedSbToSteal INT,
-
-                            street1CBChance INT,
-                            street1CBDone INT,
-                            street2CBChance INT,
-                            street2CBDone INT,
-                            street3CBChance INT,
-                            street3CBDone INT,
-                            street4CBChance INT,
-                            street4CBDone INT,
-                            
-                            foldToStreet1CBChance INT,
-                            foldToStreet1CBDone INT,
-                            foldToStreet2CBChance INT,
-                            foldToStreet2CBDone INT,
-                            foldToStreet3CBChance INT,
-                            foldToStreet3CBDone INT,
-                            foldToStreet4CBChance INT,
-                            foldToStreet4CBDone INT,
-                            
-                            totalProfit INT,
-                            
-                            street1CheckCallRaiseChance INT,
-                            street1CheckCallRaiseDone INT,
-                            street2CheckCallRaiseChance INT,
-                            street2CheckCallRaiseDone INT,
-                            street3CheckCallRaiseChance INT,
-                            street3CheckCallRaiseDone INT,
-                            street4CheckCallRaiseChance INT,
-                            street4CheckCallRaiseDone INT,
-
-                            street0Calls INT,
-                            street1Calls INT,
-                            street2Calls INT,
-                            street3Calls INT,
-                            street4Calls INT,
-                            street0Bets INT,
-                            street1Bets INT,
-                            street2Bets INT,
-                            street3Bets INT,
-                            street4Bets INT,
-                            street0Raises INT,
-                            street1Raises INT,
-                            street2Raises INT,
-                            street3Raises INT,
-                            street4Raises INT)
-
-                            ENGINE=INNODB"""
-            elif db_server == 'postgresql':
-                self.query['createHudCacheTable'] = """CREATE TABLE HudCache (
-                            id BIGSERIAL, PRIMARY KEY (id),
-                            gametypeId INT, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
-                            playerId INT, FOREIGN KEY (playerId) REFERENCES Players(id),
-                            activeSeats SMALLINT,
-                            position CHAR(1),
-                            tourneyTypeId INT, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
-                            styleKey CHAR(7) NOT NULL,  /* 1st char is style (A/T/H/S), other 6 are the key */
-                            HDs INT,
-
-                            wonWhenSeenStreet1 FLOAT,
-                            wonWhenSeenStreet2 FLOAT,
-                            wonWhenSeenStreet3 FLOAT,
-                            wonWhenSeenStreet4 FLOAT,
-                            wonAtSD FLOAT,
-
-                            street0VPI INT,
-                            street0Aggr INT,
-                            street0_3BChance INT,
-                            street0_3BDone INT,
-                            street0_4BChance INT,
-                            street0_4BDone INT,
-                            other3BStreet0 INT,
-                            other4BStreet0 INT,
-
-                            street1Seen INT,
-                            street2Seen INT,
-                            street3Seen INT,
-                            street4Seen INT,
-                            sawShowdown INT,
-                            street1Aggr INT,
-                            street2Aggr INT,
-                            street3Aggr INT,
-                            street4Aggr INT,
-
-                            otherRaisedStreet0 INT,
-                            otherRaisedStreet1 INT,
-                            otherRaisedStreet2 INT,
-                            otherRaisedStreet3 INT,
-                            otherRaisedStreet4 INT,
-                            foldToOtherRaisedStreet0 INT,
-                            foldToOtherRaisedStreet1 INT,
-                            foldToOtherRaisedStreet2 INT,
-                            foldToOtherRaisedStreet3 INT,
-                            foldToOtherRaisedStreet4 INT,
-
-                            stealAttemptChance INT,
-                            stealAttempted INT,
-                            foldBbToStealChance INT,
-                            foldedBbToSteal INT,
-                            foldSbToStealChance INT,
-                            foldedSbToSteal INT,
-
-                            street1CBChance INT,
-                            street1CBDone INT,
-                            street2CBChance INT,
-                            street2CBDone INT,
-                            street3CBChance INT,
-                            street3CBDone INT,
-                            street4CBChance INT,
-                            street4CBDone INT,
-
-                            foldToStreet1CBChance INT,
-                            foldToStreet1CBDone INT,
-                            foldToStreet2CBChance INT,
-                            foldToStreet2CBDone INT,
-                            foldToStreet3CBChance INT,
-                            foldToStreet3CBDone INT,
-                            foldToStreet4CBChance INT,
-                            foldToStreet4CBDone INT,
-
-                            totalProfit INT,
-
-                            street1CheckCallRaiseChance INT,
-                            street1CheckCallRaiseDone INT,
-                            street2CheckCallRaiseChance INT,
-                            street2CheckCallRaiseDone INT,
-                            street3CheckCallRaiseChance INT,
-                            street3CheckCallRaiseDone INT,
-                            street4CheckCallRaiseChance INT,
-                            street4CheckCallRaiseDone INT,
-
-                            street0Calls INT,
-                            street1Calls INT,
-                            street2Calls INT,
-                            street3Calls INT,
-                            street4Calls INT,
-                            street0Bets INT,
-                            street1Bets INT,
-                            street2Bets INT,
-                            street3Bets INT,
-                            street4Bets INT,
-                            street0Raises INT,
-                            street1Raises INT,
-                            street2Raises INT,
-                            street3Raises INT,
-                            street4Raises INT)
-                            """
-            elif db_server == 'sqlite':
-                self.query['createHudCacheTable'] = """CREATE TABLE HudCache (
-                            id INTEGER PRIMARY KEY,
-                            gametypeId INT,
-                            playerId INT,
-                            activeSeats INT,
-                            position TEXT,
-                            tourneyTypeId INT,
-                            styleKey TEXT NOT NULL,  /* 1st char is style (A/T/H/S), other 6 are the key */
-                            HDs INT,
-
-                            wonWhenSeenStreet1 REAL,
-                            wonWhenSeenStreet2 REAL,
-                            wonWhenSeenStreet3 REAL,
-                            wonWhenSeenStreet4 REAL,
-                            wonAtSD REAL,
-
-                            street0VPI INT,
-                            street0Aggr INT,
-                            street0_3BChance INT,
-                            street0_3BDone INT,
-                            street0_4BChance INT,
-                            street0_4BDone INT,
-                            other3BStreet0 INT,
-                            other4BStreet0 INT,
-
-                            street1Seen INT,
-                            street2Seen INT,
-                            street3Seen INT,
-                            street4Seen INT,
-                            sawShowdown INT,
-                            street1Aggr INT,
-                            street2Aggr INT,
-                            street3Aggr INT,
-                            street4Aggr INT,
-
-                            otherRaisedStreet0 INT,
-                            otherRaisedStreet1 INT,
-                            otherRaisedStreet2 INT,
-                            otherRaisedStreet3 INT,
-                            otherRaisedStreet4 INT,
-                            foldToOtherRaisedStreet0 INT,
-                            foldToOtherRaisedStreet1 INT,
-                            foldToOtherRaisedStreet2 INT,
-                            foldToOtherRaisedStreet3 INT,
-                            foldToOtherRaisedStreet4 INT,
-
-                            stealAttemptChance INT,
-                            stealAttempted INT,
-                            foldBbToStealChance INT,
-                            foldedBbToSteal INT,
-                            foldSbToStealChance INT,
-                            foldedSbToSteal INT,
-
-                            street1CBChance INT,
-                            street1CBDone INT,
-                            street2CBChance INT,
-                            street2CBDone INT,
-                            street3CBChance INT,
-                            street3CBDone INT,
-                            street4CBChance INT,
-                            street4CBDone INT,
-
-                            foldToStreet1CBChance INT,
-                            foldToStreet1CBDone INT,
-                            foldToStreet2CBChance INT,
-                            foldToStreet2CBDone INT,
-                            foldToStreet3CBChance INT,
-                            foldToStreet3CBDone INT,
-                            foldToStreet4CBChance INT,
-                            foldToStreet4CBDone INT,
-
-                            totalProfit INT,
-
-                            street1CheckCallRaiseChance INT,
-                            street1CheckCallRaiseDone INT,
-                            street2CheckCallRaiseChance INT,
-                            street2CheckCallRaiseDone INT,
-                            street3CheckCallRaiseChance INT,
-                            street3CheckCallRaiseDone INT,
-                            street4CheckCallRaiseChance INT,
-                            street4CheckCallRaiseDone INT,
-
-                            street0Calls INT,
-                            street1Calls INT,
-                            street2Calls INT,
-                            street3Calls INT,
-                            street4Calls INT,
-                            street0Bets INT,
-                            street1Bets INT,
-                            street2Bets INT,
-                            street3Bets INT,
-                            street4Bets INT,
-                            street0Raises INT,
-                            street1Raises INT,
-                            street2Raises INT,
-                            street3Raises INT,
-                            street4Raises INT)
-                            """
-
-
-            if db_server == 'mysql':
-                self.query['addTourneyIndex'] = """ALTER TABLE Tourneys ADD INDEX siteTourneyNo(siteTourneyNo)"""
-            elif db_server == 'postgresql':
-                self.query['addTourneyIndex'] = """CREATE INDEX siteTourneyNo ON Tourneys (siteTourneyNo)"""
-            elif db_server == 'sqlite':
-                self.query['addHandsIndex'] = """ """
-
-            if db_server == 'mysql':
-                self.query['addHandsIndex'] = """ALTER TABLE Hands ADD INDEX siteHandNo(siteHandNo)"""
-            elif db_server == 'postgresql':
-                self.query['addHandsIndex'] = """CREATE INDEX siteHandNo ON Hands (siteHandNo)"""
-            elif db_server == 'sqlite':
-                self.query['addHandsIndex'] = """ """
-
-            if db_server == 'mysql':
-                self.query['addPlayersIndex'] = """ALTER TABLE Players ADD INDEX name(name)"""
-            elif db_server == 'postgresql':
-                self.query['addPlayersIndex'] = """CREATE INDEX name ON Players (name)"""
-            elif db_server == 'sqlite':
-                self.query['addPlayersIndex'] = """ """
-
-
-            self.query['get_last_hand'] = "select max(id) from Hands"
-
-            self.query['get_player_id'] = """
-                    select Players.id AS player_id 
-                    from Players, Sites
-                    where Players.name = %s
-                    and Sites.name = %s
-                    and Players.SiteId = Sites.id
-                """
-
-            self.query['getSiteId'] = """SELECT id from Sites where name = %s"""
-
-            self.query['get_stats_from_hand'] = """
-                    SELECT hc.playerId                      AS player_id,
-                        hp.seatNo                           AS seat,
-                        p.name                              AS screen_name,
-                        sum(hc.HDs)                         AS n,
-                        sum(hc.street0VPI)                  AS vpip,
-                        sum(hc.street0Aggr)                 AS pfr,
-                        sum(hc.street0_3BChance)            AS TB_opp_0,
-                        sum(hc.street0_3BDone)              AS TB_0,
-                        sum(hc.street1Seen)                 AS saw_f,
-                        sum(hc.street1Seen)                 AS saw_1,
-                        sum(hc.street2Seen)                 AS saw_2,
-                        sum(hc.street3Seen)                 AS saw_3,
-                        sum(hc.street4Seen)                 AS saw_4,
-                        sum(hc.sawShowdown)                 AS sd,
-                        sum(hc.street1Aggr)                 AS aggr_1,
-                        sum(hc.street2Aggr)                 AS aggr_2,
-                        sum(hc.street3Aggr)                 AS aggr_3,
-                        sum(hc.street4Aggr)                 AS aggr_4,
-                        sum(hc.otherRaisedStreet1)          AS was_raised_1,
-                        sum(hc.otherRaisedStreet2)          AS was_raised_2,
-                        sum(hc.otherRaisedStreet3)          AS was_raised_3,
-                        sum(hc.otherRaisedStreet4)          AS was_raised_4,
-                        sum(hc.foldToOtherRaisedStreet1)    AS f_freq_1,
-                        sum(hc.foldToOtherRaisedStreet2)    AS f_freq_2,
-                        sum(hc.foldToOtherRaisedStreet3)    AS f_freq_3,
-                        sum(hc.foldToOtherRaisedStreet4)    AS f_freq_4,
-                        sum(hc.wonWhenSeenStreet1)          AS w_w_s_1,
-                        sum(hc.wonAtSD)                     AS wmsd,
-                        sum(hc.stealAttemptChance)          AS steal_opp,
-                        sum(hc.stealAttempted)              AS steal,
-                        sum(hc.foldSbToStealChance)         AS SBstolen,
-                        sum(hc.foldedSbToSteal)             AS SBnotDef,
-                        sum(hc.foldBbToStealChance)         AS BBstolen,
-                        sum(hc.foldedBbToSteal)             AS BBnotDef,
-                        sum(hc.street1CBChance)             AS CB_opp_1,
-                        sum(hc.street1CBDone)               AS CB_1,
-                        sum(hc.street2CBChance)             AS CB_opp_2,
-                        sum(hc.street2CBDone)               AS CB_2,
-                        sum(hc.street3CBChance)             AS CB_opp_3,
-                        sum(hc.street3CBDone)               AS CB_3,
-                        sum(hc.street4CBChance)             AS CB_opp_4,
-                        sum(hc.street4CBDone)               AS CB_4,
-                        sum(hc.foldToStreet1CBChance)       AS f_cb_opp_1,
-                        sum(hc.foldToStreet1CBDone)         AS f_cb_1,
-                        sum(hc.foldToStreet2CBChance)       AS f_cb_opp_2,
-                        sum(hc.foldToStreet2CBDone)         AS f_cb_2,
-                        sum(hc.foldToStreet3CBChance)       AS f_cb_opp_3,
-                        sum(hc.foldToStreet3CBDone)         AS f_cb_3,
-                        sum(hc.foldToStreet4CBChance)       AS f_cb_opp_4,
-                        sum(hc.foldToStreet4CBDone)         AS f_cb_4,
-                        sum(hc.totalProfit)                 AS net,
-                        sum(hc.street1CheckCallRaiseChance) AS ccr_opp_1,
-                        sum(hc.street1CheckCallRaiseDone)   AS ccr_1,
-                        sum(hc.street2CheckCallRaiseChance) AS ccr_opp_2,
-                        sum(hc.street2CheckCallRaiseDone)   AS ccr_2,
-                        sum(hc.street3CheckCallRaiseChance) AS ccr_opp_3,
-                        sum(hc.street3CheckCallRaiseDone)   AS ccr_3,
-                        sum(hc.street4CheckCallRaiseChance) AS ccr_opp_4,
-                        sum(hc.street4CheckCallRaiseDone)   AS ccr_4
-                    FROM Hands h
-                         INNER JOIN HandsPlayers hp ON (hp.handId = h.id)
-                         INNER JOIN HudCache hc ON (    hc.PlayerId = hp.PlayerId+0
-                                                    AND hc.gametypeId+0 = h.gametypeId+0)
-                         INNER JOIN Players p ON (p.id = hp.PlayerId+0)
-                    WHERE h.id = %s
-                    AND   hc.styleKey > %s
-                          /* styleKey is currently 'd' (for date) followed by a yyyymmdd
-                             date key. Set it to 0000000 or similar to get all records  */
-                    /* also check activeseats here even if only 3 groups eg 2-3/4-6/7+ 
-                       e.g. could use a multiplier:
-                       AND   h.seats > X / 1.25  and  hp.seats < X * 1.25
-                       where X is the number of active players at the current table (and
-                       1.25 would be a config value so user could change it)
-                    */
-                    GROUP BY hc.PlayerId, hp.seatNo, p.name
-                """
-
-#    same as above except stats are aggregated for all blind/limit levels
-            self.query['get_stats_from_hand_aggregated'] = """
-                    SELECT hc.playerId                         AS player_id,
-                           max(case when hc.gametypeId = h.gametypeId
-                                    then hp.seatNo
-                                    else -1
-                               end)                            AS seat,
-                           p.name                              AS screen_name,
-                           sum(hc.HDs)                         AS n,
-                           sum(hc.street0VPI)                  AS vpip,
-                           sum(hc.street0Aggr)                 AS pfr,
-                           sum(hc.street0_3BChance)            AS TB_opp_0,
-                           sum(hc.street0_3BDone)              AS TB_0,
-                           sum(hc.street1Seen)                 AS saw_f,
-                           sum(hc.street1Seen)                 AS saw_1,
-                           sum(hc.street2Seen)                 AS saw_2,
-                           sum(hc.street3Seen)                 AS saw_3,
-                           sum(hc.street4Seen)                 AS saw_4,
-                           sum(hc.sawShowdown)                 AS sd,
-                           sum(hc.street1Aggr)                 AS aggr_1,
-                           sum(hc.street2Aggr)                 AS aggr_2,
-                           sum(hc.street3Aggr)                 AS aggr_3,
-                           sum(hc.street4Aggr)                 AS aggr_4,
-                           sum(hc.otherRaisedStreet1)          AS was_raised_1,
-                           sum(hc.otherRaisedStreet2)          AS was_raised_2,
-                           sum(hc.otherRaisedStreet3)          AS was_raised_3,
-                           sum(hc.otherRaisedStreet4)          AS was_raised_4,
-                           sum(hc.foldToOtherRaisedStreet1)    AS f_freq_1,
-                           sum(hc.foldToOtherRaisedStreet2)    AS f_freq_2,
-                           sum(hc.foldToOtherRaisedStreet3)    AS f_freq_3,
-                           sum(hc.foldToOtherRaisedStreet4)    AS f_freq_4,
-                           sum(hc.wonWhenSeenStreet1)          AS w_w_s_1,
-                           sum(hc.wonAtSD)                     AS wmsd,
-                           sum(hc.stealAttemptChance)          AS steal_opp,
-                           sum(hc.stealAttempted)              AS steal,
-                           sum(hc.foldSbToStealChance)         AS SBstolen,
-                           sum(hc.foldedSbToSteal)             AS SBnotDef,
-                           sum(hc.foldBbToStealChance)         AS BBstolen,
-                           sum(hc.foldedBbToSteal)             AS BBnotDef,
-                           sum(hc.street1CBChance)             AS CB_opp_1,
-                           sum(hc.street1CBDone)               AS CB_1,
-                           sum(hc.street2CBChance)             AS CB_opp_2,
-                           sum(hc.street2CBDone)               AS CB_2,
-                           sum(hc.street3CBChance)             AS CB_opp_3,
-                           sum(hc.street3CBDone)               AS CB_3,
-                           sum(hc.street4CBChance)             AS CB_opp_4,
-                           sum(hc.street4CBDone)               AS CB_4,
-                           sum(hc.foldToStreet1CBChance)       AS f_cb_opp_1,
-                           sum(hc.foldToStreet1CBDone)         AS f_cb_1,
-                           sum(hc.foldToStreet2CBChance)       AS f_cb_opp_2,
-                           sum(hc.foldToStreet2CBDone)         AS f_cb_2,
-                           sum(hc.foldToStreet3CBChance)       AS f_cb_opp_3,
-                           sum(hc.foldToStreet3CBDone)         AS f_cb_3,
-                           sum(hc.foldToStreet4CBChance)       AS f_cb_opp_4,
-                           sum(hc.foldToStreet4CBDone)         AS f_cb_4,
-                           sum(hc.totalProfit)                 AS net,
-                           sum(hc.street1CheckCallRaiseChance) AS ccr_opp_1,
-                           sum(hc.street1CheckCallRaiseDone)   AS ccr_1,
-                           sum(hc.street2CheckCallRaiseChance) AS ccr_opp_2,
-                           sum(hc.street2CheckCallRaiseDone)   AS ccr_2,
-                           sum(hc.street3CheckCallRaiseChance) AS ccr_opp_3,
-                           sum(hc.street3CheckCallRaiseDone)   AS ccr_3,
-                           sum(hc.street4CheckCallRaiseChance) AS ccr_opp_4,
-                           sum(hc.street4CheckCallRaiseDone)   AS ccr_4
-                    FROM Hands h
-                         INNER JOIN HandsPlayers hp ON (hp.handId = h.id)
-                         INNER JOIN HudCache hc     ON (hc.playerId = hp.playerId)
-                         INNER JOIN Players p       ON (p.id = hc.playerId)
-                    WHERE h.id = %s
-                    AND   hc.styleKey > %s
-                          /* styleKey is currently 'd' (for date) followed by a yyyymmdd
-                             date key. Set it to 0000000 or similar to get all records  */
-                    /* Note: s means the placeholder 'percent's but we can't include that
-                       in comments. (db api thinks they are actual arguments)
-                       Could also check activeseats here even if only 3 groups eg 2-3/4-6/7+ 
-                       e.g. could use a multiplier:
-                       AND   h.seats > s / 1.25  and  hp.seats < s * 1.25
-                       where s is the number of active players at the current table (and
-                       1.25 would be a config value so user could change it)
-                    */
-                    AND   hc.gametypeId+0 in
-                          (SELECT gt1.id from Gametypes gt1, Gametypes gt2
-                           WHERE  gt1.siteid = gt2.siteid  /* find gametypes where these match: */
-                           AND    gt1.type = gt2.type               /* ring/tourney */
-                           AND    gt1.category = gt2.category       /* holdem/stud*/
-                           AND    gt1.limittype = gt2.limittype     /* fl/nl */
-                           AND    gt1.bigblind < gt2.bigblind * %s  /* bigblind similar size */
-                           AND    gt1.bigblind > gt2.bigblind / %s
-                           AND    gt2.id = h.gametypeId)
-                    GROUP BY hc.PlayerId, p.name
-                """
-
-            if db_server == 'mysql':
-                self.query['get_stats_from_hand_session'] = """
-                        SELECT hp.playerId                                              AS player_id,
-                               hp.handId                                                AS hand_id,
-                               hp.seatNo                                                AS seat,
-                               p.name                                                   AS screen_name,
-                               h.seats                                                  AS seats,
-                               1                                                        AS n,
-                               cast(hp2.street0VPI as <signed>integer)                  AS vpip,
-                               cast(hp2.street0Aggr as <signed>integer)                 AS pfr,
-                               cast(hp2.street0_3BChance as <signed>integer)            AS TB_opp_0,
-                               cast(hp2.street0_3BDone as <signed>integer)              AS TB_0,
-                               cast(hp2.street1Seen as <signed>integer)                 AS saw_f,
-                               cast(hp2.street1Seen as <signed>integer)                 AS saw_1,
-                               cast(hp2.street2Seen as <signed>integer)                 AS saw_2,
-                               cast(hp2.street3Seen as <signed>integer)                 AS saw_3,
-                               cast(hp2.street4Seen as <signed>integer)                 AS saw_4,
-                               cast(hp2.sawShowdown as <signed>integer)                 AS sd,
-                               cast(hp2.street1Aggr as <signed>integer)                 AS aggr_1,
-                               cast(hp2.street2Aggr as <signed>integer)                 AS aggr_2,
-                               cast(hp2.street3Aggr as <signed>integer)                 AS aggr_3,
-                               cast(hp2.street4Aggr as <signed>integer)                 AS aggr_4,
-                               cast(hp2.otherRaisedStreet1 as <signed>integer)          AS was_raised_1,
-                               cast(hp2.otherRaisedStreet2 as <signed>integer)          AS was_raised_2,
-                               cast(hp2.otherRaisedStreet3 as <signed>integer)          AS was_raised_3,
-                               cast(hp2.otherRaisedStreet4 as <signed>integer)          AS was_raised_4,
-                               cast(hp2.foldToOtherRaisedStreet1 as <signed>integer)    AS f_freq_1,
-                               cast(hp2.foldToOtherRaisedStreet2 as <signed>integer)    AS f_freq_2,
-                               cast(hp2.foldToOtherRaisedStreet3 as <signed>integer)    AS f_freq_3,
-                               cast(hp2.foldToOtherRaisedStreet4 as <signed>integer)    AS f_freq_4,
-                               cast(hp2.wonWhenSeenStreet1 as <signed>integer)          AS w_w_s_1,
-                               cast(hp2.wonAtSD as <signed>integer)                     AS wmsd,
-                               cast(hp2.stealAttemptChance as <signed>integer)          AS steal_opp,
-                               cast(hp2.stealAttempted as <signed>integer)              AS steal,
-                               cast(hp2.foldSbToStealChance as <signed>integer)         AS SBstolen,
-                               cast(hp2.foldedSbToSteal as <signed>integer)             AS SBnotDef,
-                               cast(hp2.foldBbToStealChance as <signed>integer)         AS BBstolen,
-                               cast(hp2.foldedBbToSteal as <signed>integer)             AS BBnotDef,
-                               cast(hp2.street1CBChance as <signed>integer)             AS CB_opp_1,
-                               cast(hp2.street1CBDone as <signed>integer)               AS CB_1,
-                               cast(hp2.street2CBChance as <signed>integer)             AS CB_opp_2,
-                               cast(hp2.street2CBDone as <signed>integer)               AS CB_2,
-                               cast(hp2.street3CBChance as <signed>integer)             AS CB_opp_3,
-                               cast(hp2.street3CBDone as <signed>integer)               AS CB_3,
-                               cast(hp2.street4CBChance as <signed>integer)             AS CB_opp_4,
-                               cast(hp2.street4CBDone as <signed>integer)               AS CB_4,
-                               cast(hp2.foldToStreet1CBChance as <signed>integer)       AS f_cb_opp_1,
-                               cast(hp2.foldToStreet1CBDone as <signed>integer)         AS f_cb_1,
-                               cast(hp2.foldToStreet2CBChance as <signed>integer)       AS f_cb_opp_2,
-                               cast(hp2.foldToStreet2CBDone as <signed>integer)         AS f_cb_2,
-                               cast(hp2.foldToStreet3CBChance as <signed>integer)       AS f_cb_opp_3,
-                               cast(hp2.foldToStreet3CBDone as <signed>integer)         AS f_cb_3,
-                               cast(hp2.foldToStreet4CBChance as <signed>integer)       AS f_cb_opp_4,
-                               cast(hp2.foldToStreet4CBDone as <signed>integer)         AS f_cb_4,
-                               cast(hp2.totalProfit as <signed>integer)                 AS net,
-                               cast(hp2.street1CheckCallRaiseChance as <signed>integer) AS ccr_opp_1,
-                               cast(hp2.street1CheckCallRaiseDone as <signed>integer)   AS ccr_1,
-                               cast(hp2.street2CheckCallRaiseChance as <signed>integer) AS ccr_opp_2,
-                               cast(hp2.street2CheckCallRaiseDone as <signed>integer)   AS ccr_2,
-                               cast(hp2.street3CheckCallRaiseChance as <signed>integer) AS ccr_opp_3,
-                               cast(hp2.street3CheckCallRaiseDone as <signed>integer)   AS ccr_3,
-                               cast(hp2.street4CheckCallRaiseChance as <signed>integer) AS ccr_opp_4,
-                               cast(hp2.street4CheckCallRaiseDone as <signed>integer)   AS ccr_4
-                        FROM
-                             Hands h         /* players in this hand */
-                             INNER JOIN Hands h2         ON (h2.id > %s AND   h2.tableName = h.tableName)
-                             INNER JOIN HandsPlayers hp  ON (h.id = hp.handId)
-                             INNER JOIN HandsPlayers hp2 ON (hp2.playerId+0 = hp.playerId+0 AND (hp2.handId = h2.id+0))  /* other hands by these players */
-                             INNER JOIN Players p        ON (p.id = hp2.PlayerId+0)
-                        WHERE hp.handId = %s
-                        /* check activeseats once this data returned (don't want to do that here as it might
-                           assume a session ended just because the number of seats dipped for a few hands)
-                        */
-                        ORDER BY h.handStart desc, hp2.PlayerId
-                        /* order rows by handstart descending so that we can stop reading rows when
-                           there's a gap over X minutes between hands (ie. when we get back to start of
-                           the session */
-                    """
-            else:  # assume postgresql
-                self.query['get_stats_from_hand_session'] = """
-                        SELECT hp.playerId                                              AS player_id,
-                               hp.handId                                                AS hand_id,
-                               hp.seatNo                                                AS seat,
-                               p.name                                                   AS screen_name,
-                               h.seats                                                  AS seats,
-                               1                                                        AS n,
-                               cast(hp2.street0VPI as <signed>integer)                  AS vpip,
-                               cast(hp2.street0Aggr as <signed>integer)                 AS pfr,
-                               cast(hp2.street0_3BChance as <signed>integer)            AS TB_opp_0,
-                               cast(hp2.street0_3BDone as <signed>integer)              AS TB_0,
-                               cast(hp2.street1Seen as <signed>integer)                 AS saw_f,
-                               cast(hp2.street1Seen as <signed>integer)                 AS saw_1,
-                               cast(hp2.street2Seen as <signed>integer)                 AS saw_2,
-                               cast(hp2.street3Seen as <signed>integer)                 AS saw_3,
-                               cast(hp2.street4Seen as <signed>integer)                 AS saw_4,
-                               cast(hp2.sawShowdown as <signed>integer)                 AS sd,
-                               cast(hp2.street1Aggr as <signed>integer)                 AS aggr_1,
-                               cast(hp2.street2Aggr as <signed>integer)                 AS aggr_2,
-                               cast(hp2.street3Aggr as <signed>integer)                 AS aggr_3,
-                               cast(hp2.street4Aggr as <signed>integer)                 AS aggr_4,
-                               cast(hp2.otherRaisedStreet1 as <signed>integer)          AS was_raised_1,
-                               cast(hp2.otherRaisedStreet2 as <signed>integer)          AS was_raised_2,
-                               cast(hp2.otherRaisedStreet3 as <signed>integer)          AS was_raised_3,
-                               cast(hp2.otherRaisedStreet4 as <signed>integer)          AS was_raised_4,
-                               cast(hp2.foldToOtherRaisedStreet1 as <signed>integer)    AS f_freq_1,
-                               cast(hp2.foldToOtherRaisedStreet2 as <signed>integer)    AS f_freq_2,
-                               cast(hp2.foldToOtherRaisedStreet3 as <signed>integer)    AS f_freq_3,
-                               cast(hp2.foldToOtherRaisedStreet4 as <signed>integer)    AS f_freq_4,
-                               cast(hp2.wonWhenSeenStreet1 as <signed>integer)          AS w_w_s_1,
-                               cast(hp2.wonAtSD as <signed>integer)                     AS wmsd,
-                               cast(hp2.stealAttemptChance as <signed>integer)          AS steal_opp,
-                               cast(hp2.stealAttempted as <signed>integer)              AS steal,
-                               cast(hp2.foldSbToStealChance as <signed>integer)         AS SBstolen,
-                               cast(hp2.foldedSbToSteal as <signed>integer)             AS SBnotDef,
-                               cast(hp2.foldBbToStealChance as <signed>integer)         AS BBstolen,
-                               cast(hp2.foldedBbToSteal as <signed>integer)             AS BBnotDef,
-                               cast(hp2.street1CBChance as <signed>integer)             AS CB_opp_1,
-                               cast(hp2.street1CBDone as <signed>integer)               AS CB_1,
-                               cast(hp2.street2CBChance as <signed>integer)             AS CB_opp_2,
-                               cast(hp2.street2CBDone as <signed>integer)               AS CB_2,
-                               cast(hp2.street3CBChance as <signed>integer)             AS CB_opp_3,
-                               cast(hp2.street3CBDone as <signed>integer)               AS CB_3,
-                               cast(hp2.street4CBChance as <signed>integer)             AS CB_opp_4,
-                               cast(hp2.street4CBDone as <signed>integer)               AS CB_4,
-                               cast(hp2.foldToStreet1CBChance as <signed>integer)       AS f_cb_opp_1,
-                               cast(hp2.foldToStreet1CBDone as <signed>integer)         AS f_cb_1,
-                               cast(hp2.foldToStreet2CBChance as <signed>integer)       AS f_cb_opp_2,
-                               cast(hp2.foldToStreet2CBDone as <signed>integer)         AS f_cb_2,
-                               cast(hp2.foldToStreet3CBChance as <signed>integer)       AS f_cb_opp_3,
-                               cast(hp2.foldToStreet3CBDone as <signed>integer)         AS f_cb_3,
-                               cast(hp2.foldToStreet4CBChance as <signed>integer)       AS f_cb_opp_4,
-                               cast(hp2.foldToStreet4CBDone as <signed>integer)         AS f_cb_4,
-                               cast(hp2.totalProfit as <signed>integer)                 AS net,
-                               cast(hp2.street1CheckCallRaiseChance as <signed>integer) AS ccr_opp_1,
-                               cast(hp2.street1CheckCallRaiseDone as <signed>integer)   AS ccr_1,
-                               cast(hp2.street2CheckCallRaiseChance as <signed>integer) AS ccr_opp_2,
-                               cast(hp2.street2CheckCallRaiseDone as <signed>integer)   AS ccr_2,
-                               cast(hp2.street3CheckCallRaiseChance as <signed>integer) AS ccr_opp_3,
-                               cast(hp2.street3CheckCallRaiseDone as <signed>integer)   AS ccr_3,
-                               cast(hp2.street4CheckCallRaiseChance as <signed>integer) AS ccr_opp_4,
-                               cast(hp2.street4CheckCallRaiseDone as <signed>integer)   AS ccr_4
-                        FROM Hands h                                                  /* this hand */
-                             INNER JOIN Hands h2         ON (    h2.id > %s           /* other hands */
-                                                             AND h2.tableName = h.tableName)
-                             INNER JOIN HandsPlayers hp  ON (h.id = hp.handId)        /* players in this hand */
-                             INNER JOIN HandsPlayers hp2 ON (    hp2.playerId+0 = hp.playerId+0
-                                                             AND hp2.handId = h2.id)  /* other hands by these players */
-                             INNER JOIN Players p        ON (p.id = hp2.PlayerId+0)
-                        WHERE h.id = %s
-                        /* check activeseats once this data returned (don't want to do that here as it might
-                           assume a session ended just because the number of seats dipped for a few hands)
-                        */
-                        ORDER BY h.handStart desc, hp2.PlayerId
-                        /* order rows by handstart descending so that we can stop reading rows when
-                           there's a gap over X minutes between hands (ie. when we get back to start of
-                           the session */
-                    """
-         
-            self.query['get_players_from_hand'] = """
-                    SELECT HandsPlayers.playerId, seatNo, name
-                    FROM  HandsPlayers INNER JOIN Players ON (HandsPlayers.playerId = Players.id)
-                    WHERE handId = %s
-                """
-#                    WHERE handId = %s AND Players.id LIKE %s
-
-            self.query['get_winners_from_hand'] = """
-                    SELECT name, winnings
-                    FROM HandsPlayers, Players
-                    WHERE winnings > 0
-                        AND Players.id = HandsPlayers.playerId
-                        AND handId = %s;
-                """
-
-            self.query['get_table_name'] = """
-                    select tableName, maxSeats, category, type
-                    from Hands,Gametypes
-                    where Hands.id = %s
-                    and Gametypes.id = Hands.gametypeId
-                """
-
-            self.query['get_actual_seat'] = """
-                    select seatNo
-                    from HandsPlayers
-                    where HandsPlayers.handId = %s
-                    and   HandsPlayers.playerId  = (select Players.id from Players
-                                                    where Players.name = %s)
-                """
-
-            self.query['get_cards'] = """
-                    select
-                        seatNo     AS seat_number,
-                        card1, /*card1Value, card1Suit, */
-                        card2, /*card2Value, card2Suit, */
-                        card3, /*card3Value, card3Suit, */
-                        card4, /*card4Value, card4Suit, */
-                        card5, /*card5Value, card5Suit, */
-                        card6, /*card6Value, card6Suit, */
-                        card7  /*card7Value, card7Suit */
-                    from HandsPlayers, Players
-                    where handID = %s and HandsPlayers.playerId = Players.id
-                    order by seatNo
-                """
-
-            self.query['get_common_cards'] = """
-                    select
-                    boardcard1,
-                    boardcard2,
-                    boardcard3,
-                    boardcard4,
-                    boardcard5
-                    from Hands
-                    where Id = %s
-                """
-
-            self.query['get_action_from_hand'] = """
-                SELECT street, Players.name, HandsActions.action, HandsActions.amount, actionno
-                FROM Players, HandsActions, HandsPlayers
-                WHERE HandsPlayers.handid = %s
-                AND HandsPlayers.playerid = Players.id
-                AND HandsActions.handsPlayerId = HandsPlayers.id
-                ORDER BY street, actionno
-            """
-
-            if db_server == 'mysql':
-                self.query['get_hand_1day_ago'] = """
-                    select coalesce(max(id),0)
-                    from Hands
-                    where handStart < date_sub(utc_timestamp(), interval '1' day)"""
-            elif db_server == 'postgresql':
-                self.query['get_hand_1day_ago'] = """
-                    select coalesce(max(id),0)
-                    from Hands
-                    where handStart < now() at time zone 'UTC' - interval '1 day'"""
-            elif db_server == 'sqlite':
-                self.query['get_hand_1day_ago'] = """
-                    select coalesce(max(id),0)
-                    from Hands
-                    where handStart < strftime('%J', 'now') - 1"""
-
-            # not used yet ...
-            # gets a date, would need to use handsplayers (not hudcache) to get exact hand Id
-            if db_server == 'mysql':
-                self.query['get_date_nhands_ago'] = """
-                    select concat( 'd', date_format(max(h.handStart), '%Y%m%d') )
-                    from (select hp.playerId
-                                ,coalesce(greatest(max(hp.handId)-%s,1),1) as maxminusx
-                          from HandsPlayers hp
-                          where hp.playerId = %s
-                          group by hp.playerId) hp2
-                    inner join HandsPlayers hp3 on (    hp3.handId <= hp2.maxminusx
-                                                    and hp3.playerId = hp2.playerId)
-                    inner join Hands h          on (h.id = hp3.handId)
-                    """
-            elif db_server == 'postgresql':
-                self.query['get_date_nhands_ago'] = """
-                    select 'd' || to_char(max(h3.handStart), 'YYMMDD')
-                    from (select hp.playerId
-                                ,coalesce(greatest(max(hp.handId)-%s,1),1) as maxminusx
-                          from HandsPlayers hp
-                          where hp.playerId = %s
-                          group by hp.playerId) hp2
-                    inner join HandsPlayers hp3 on (    hp3.handId <= hp2.maxminusx
-                                                    and hp3.playerId = hp2.playerId)
-                    inner join Hands h          on (h.id = hp3.handId)
-                    """
-            elif db_server == 'sqlite': # untested guess at query:
-                self.query['get_date_nhands_ago'] = """
-                    select 'd' || strftime(max(h3.handStart), 'YYMMDD')
-                    from (select hp.playerId
-                                ,coalesce(greatest(max(hp.handId)-%s,1),1) as maxminusx
-                          from HandsPlayers hp
-                          where hp.playerId = %s
-                          group by hp.playerId) hp2
-                    inner join HandsPlayers hp3 on (    hp3.handId <= hp2.maxminusx
-                                                    and hp3.playerId = hp2.playerId)
-                    inner join Hands h          on (h.id = hp3.handId)
-                    """
-
-            # used in GuiPlayerStats:
-            self.query['getPlayerId'] = """SELECT id from Players where name = %s"""
-
-            # used in Filters:
-            self.query['getSiteId'] = """SELECT id from Sites where name = %s"""
-            self.query['getGames'] = """SELECT DISTINCT category from Gametypes"""
-            self.query['getLimits'] = """SELECT DISTINCT bigBlind from Gametypes ORDER by bigBlind DESC"""
-
-            if db_server == 'mysql':
-                self.query['playerDetailedStats'] = """
-                         select  <hgameTypeId>                                                          AS hgametypeid
-                                ,gt.base
-                                ,gt.category
-                                ,upper(gt.limitType)                                                    AS limittype
-                                ,s.name
-                                ,min(gt.bigBlind)                                                       AS minbigblind
-                                ,max(gt.bigBlind)                                                       AS maxbigblind
-                                /*,<hcgametypeId>                                                         AS gtid*/
-                                ,<position>                                                             AS plposition
-                                ,count(1)                                                               AS n
-                                ,100.0*sum(cast(hp.street0VPI as <signed>integer))/count(1)             AS vpip
-                                ,100.0*sum(cast(hp.street0Aggr as <signed>integer))/count(1)            AS pfr
-                                ,case when sum(cast(hp.street0_3Bchance as <signed>integer)) = 0 then -999
-                                      else 100.0*sum(cast(hp.street0_3Bdone as <signed>integer))/sum(cast(hp.street0_3Bchance as <signed>integer))
-                                 end                                                                    AS pf3
-                                ,case when sum(cast(hp.stealattemptchance as <signed>integer)) = 0 then -999
-                                      else 100.0*sum(cast(hp.stealattempted as <signed>integer))/sum(cast(hp.stealattemptchance as <signed>integer))
-                                 end                                                                    AS steals
-                                ,100.0*sum(cast(hp.street1Seen as <signed>integer))/count(1)           AS saw_f
-                                ,100.0*sum(cast(hp.sawShowdown as <signed>integer))/count(1)           AS sawsd
-                                ,case when sum(cast(hp.street1Seen as <signed>integer)) = 0 then -999
-                                      else 100.0*sum(cast(hp.sawShowdown as <signed>integer))/sum(cast(hp.street1Seen as <signed>integer))
-                                 end                                                                    AS wtsdwsf
-                                ,case when sum(cast(hp.sawShowdown as <signed>integer)) = 0 then -999
-                                      else 100.0*sum(cast(hp.wonAtSD as <signed>integer))/sum(cast(hp.sawShowdown as <signed>integer))
-                                 end                                                                    AS wmsd
-                                ,case when sum(cast(hp.street1Seen as <signed>integer)) = 0 then -999
-                                      else 100.0*sum(cast(hp.street1Aggr as <signed>integer))/sum(cast(hp.street1Seen as <signed>integer))
-                                 end                                                                    AS flafq
-                                ,case when sum(cast(hp.street2Seen as <signed>integer)) = 0 then -999
-                                      else 100.0*sum(cast(hp.street2Aggr as <signed>integer))/sum(cast(hp.street2Seen as <signed>integer))
-                                 end                                                                    AS tuafq
-                                ,case when sum(cast(hp.street3Seen as <signed>integer)) = 0 then -999
-                                     else 100.0*sum(cast(hp.street3Aggr as <signed>integer))/sum(cast(hp.street3Seen as <signed>integer))
-                                 end                                                                    AS rvafq
-                                ,case when sum(cast(hp.street1Seen as <signed>integer))+sum(cast(hp.street2Seen as <signed>integer))+sum(cast(hp.street3Seen as <signed>integer)) = 0 then -999
-                                     else 100.0*(sum(cast(hp.street1Aggr as <signed>integer))+sum(cast(hp.street2Aggr as <signed>integer))+sum(cast(hp.street3Aggr as <signed>integer)))
-                                              /(sum(cast(hp.street1Seen as <signed>integer))+sum(cast(hp.street2Seen as <signed>integer))+sum(cast(hp.street3Seen as <signed>integer)))
-                                 end                                                                    AS pofafq
-                                ,sum(hp.totalProfit)/100.0                                              AS net
-                                ,sum(hp.rake)/100.0                                                     AS rake
-                                ,100.0*avg(hp.totalProfit/(gt.bigBlind+0.0))                            AS bbper100
-                                ,avg(hp.totalProfit)/100.0                                              AS profitperhand
-                                ,100.0*avg((hp.totalProfit+hp.rake)/(gt.bigBlind+0.0))                  AS bb100xr
-                                ,avg((hp.totalProfit+hp.rake)/100.0)                                    AS profhndxr
-                                ,avg(h.seats+0.0)                                                       AS avgseats
-                                ,variance(hp.totalProfit/100.0)                                         AS variance
-                          from HandsPlayers hp
-                               inner join Hands h       on  (h.id = hp.handId)
-                               inner join Gametypes gt  on  (gt.Id = h.gameTypeId)
-                               inner join Sites s       on  (s.Id = gt.siteId)
-                          where hp.playerId in <player_test>
-                          and   hp.tourneysPlayersId IS NULL
-                          and   h.seats <seats_test>
-                          <flagtest>
-                          <gtbigBlind_test>
-                          and   date_format(h.handStart, '%Y-%m-%d') <datestest>
-                          group by hgameTypeId
-                                  ,hp.playerId
-                                  ,gt.base
-                                  ,gt.category
-                                  <groupbyseats>
-                                  ,plposition
-                                  ,upper(gt.limitType)
-                                  ,s.name
-                          order by hp.playerId
-                                  ,gt.base
-                                  ,gt.category
-                                  <orderbyseats>
-                                  ,case <position> when 'B' then 'B'
-                                                   when 'S' then 'S'
-                                                   else concat('Z', <position>)
-                                   end
-                                  <orderbyhgameTypeId>
-                                  ,maxbigblind desc
-                                  ,upper(gt.limitType)
-                                  ,s.name
-                          """
-            else:   # assume postgresql
-                self.query['playerDetailedStats'] = """
-                         select  <hgameTypeId>                                                          AS hgametypeid
-                                ,gt.base
-                                ,gt.category
-                                ,upper(gt.limitType)                                                    AS limittype
-                                ,s.name
-                                ,min(gt.bigBlind)                                                       AS minbigblind
-                                ,max(gt.bigBlind)                                                       AS maxbigblind
-                                /*,<hcgametypeId>                                                       AS gtid*/
-                                ,<position>                                                             AS plposition
-                                ,count(1)                                                               AS n
-                                ,100.0*sum(cast(hp.street0VPI as <signed>integer))/count(1)             AS vpip
-                                ,100.0*sum(cast(hp.street0Aggr as <signed>integer))/count(1)            AS pfr
-                                ,case when sum(cast(hp.street0_3Bchance as <signed>integer)) = 0 then -999
-                                      else 100.0*sum(cast(hp.street0_3Bdone as <signed>integer))/sum(cast(hp.street0_3Bchance as <signed>integer))
-                                 end                                                                    AS pf3
-                                ,case when sum(cast(hp.stealattemptchance as <signed>integer)) = 0 then -999
-                                      else 100.0*sum(cast(hp.stealattempted as <signed>integer))/sum(cast(hp.stealattemptchance as <signed>integer))
-                                 end                                                                    AS steals
-                                ,100.0*sum(cast(hp.street1Seen as <signed>integer))/count(1)            AS saw_f
-                                ,100.0*sum(cast(hp.sawShowdown as <signed>integer))/count(1)            AS sawsd
-                                ,case when sum(cast(hp.street1Seen as <signed>integer)) = 0 then -999
-                                      else 100.0*sum(cast(hp.sawShowdown as <signed>integer))/sum(cast(hp.street1Seen as <signed>integer))
-                                 end                                                                    AS wtsdwsf
-                                ,case when sum(cast(hp.sawShowdown as <signed>integer)) = 0 then -999
-                                      else 100.0*sum(cast(hp.wonAtSD as <signed>integer))/sum(cast(hp.sawShowdown as <signed>integer))
-                                 end                                                                    AS wmsd
-                                ,case when sum(cast(hp.street1Seen as <signed>integer)) = 0 then -999
-                                      else 100.0*sum(cast(hp.street1Aggr as <signed>integer))/sum(cast(hp.street1Seen as <signed>integer))
-                                 end                                                                    AS flafq
-                                ,case when sum(cast(hp.street2Seen as <signed>integer)) = 0 then -999
-                                      else 100.0*sum(cast(hp.street2Aggr as <signed>integer))/sum(cast(hp.street2Seen as <signed>integer))
-                                 end                                                                    AS tuafq
-                                ,case when sum(cast(hp.street3Seen as <signed>integer)) = 0 then -999
-                                     else 100.0*sum(cast(hp.street3Aggr as <signed>integer))/sum(cast(hp.street3Seen as <signed>integer))
-                                 end                                                                    AS rvafq
-                                ,case when sum(cast(hp.street1Seen as <signed>integer))+sum(cast(hp.street2Seen as <signed>integer))+sum(cast(hp.street3Seen as <signed>integer)) = 0 then -999
-                                     else 100.0*(sum(cast(hp.street1Aggr as <signed>integer))+sum(cast(hp.street2Aggr as <signed>integer))+sum(cast(hp.street3Aggr as <signed>integer)))
-                                              /(sum(cast(hp.street1Seen as <signed>integer))+sum(cast(hp.street2Seen as <signed>integer))+sum(cast(hp.street3Seen as <signed>integer)))
-                                 end                                                                    AS pofafq
-                                ,sum(hp.totalProfit)/100.0                                              AS net
-                                ,sum(hp.rake)/100.0                                                     AS rake
-                                ,100.0*avg(hp.totalProfit/(gt.bigBlind+0.0))                            AS bbper100
-                                ,avg(hp.totalProfit)/100.0                                              AS profitperhand
-                                ,100.0*avg((hp.totalProfit+hp.rake)/(gt.bigBlind+0.0))                  AS bb100xr
-                                ,avg((hp.totalProfit+hp.rake)/100.0)                                    AS profhndxr
-                                ,avg(h.seats+0.0)                                                       AS avgseats
-                                ,variance(hp.totalProfit/100.0)                                         AS variance
-                          from HandsPlayers hp
-                               inner join Hands h       on  (h.id = hp.handId)
-                               inner join Gametypes gt  on  (gt.Id = h.gameTypeId)
-                               inner join Sites s       on  (s.Id = gt.siteId)
-                          where hp.playerId in <player_test>
-                          and   hp.tourneysPlayersId IS NULL
-                          and   h.seats <seats_test>
-                          <flagtest>
-                          <gtbigBlind_test>
-                          and   to_char(h.handStart, 'YYYY-MM-DD') <datestest>
-                          group by hgameTypeId
-                                  ,hp.playerId
-                                  ,gt.base
-                                  ,gt.category
-                                  <groupbyseats>
-                                  ,plposition
-                                  ,upper(gt.limitType)
-                                  ,s.name
-                          order by hp.playerId
-                                  ,gt.base
-                                  ,gt.category
-                                  <orderbyseats>
-                                  ,case <position> when 'B' then 'B'
-                                                   when 'S' then 'S'
-                                                   when '0' then 'Y'
-                                                   else 'Z'||<position>
-                                   end
-                                  <orderbyhgameTypeId>
-                                  ,maxbigblind desc
-                                  ,upper(gt.limitType)
-                                  ,s.name
-                          """
-            #elif db_server == 'sqlite':
-            #    self.query['playerDetailedStats'] = """ """
-
-            if db_server == 'mysql':
-                self.query['playerStats'] = """
-                    SELECT
-                          concat(upper(stats.limitType), ' '
-                                ,concat(upper(substring(stats.category,1,1)),substring(stats.category,2) ), ' '
-                                ,stats.name, ' '
-                                ,cast(stats.bigBlindDesc as char)
-                                )                                                      AS Game
-                         ,stats.n
-                         ,stats.vpip
-                         ,stats.pfr
-                         ,stats.pf3
-                         ,stats.steals
-                         ,stats.saw_f
-                         ,stats.sawsd
-                         ,stats.wtsdwsf
-                         ,stats.wmsd
-                         ,stats.FlAFq
-                         ,stats.TuAFq
-                         ,stats.RvAFq
-                         ,stats.PoFAFq
-                         ,stats.Net
-                         ,stats.BBper100
-                         ,stats.Profitperhand
-                         ,case when hprof2.variance = -999 then '-'
-                               else format(hprof2.variance, 2)
-                          end                                                          AS Variance
-                         ,stats.AvgSeats
-                    FROM
-                        (select /* stats from hudcache */
-                                gt.base
-                               ,gt.category
-                               ,upper(gt.limitType) as limitType
-                               ,s.name
-                               ,<selectgt.bigBlind>                                             AS bigBlindDesc
-                               ,<hcgametypeId>                                                  AS gtId
-                               ,sum(HDs)                                                        AS n
-                               ,format(100.0*sum(street0VPI)/sum(HDs),1)                        AS vpip
-                               ,format(100.0*sum(street0Aggr)/sum(HDs),1)                       AS pfr
-                               ,case when sum(street0_3Bchance) = 0 then '0'
-                                     else format(100.0*sum(street0_3Bdone)/sum(street0_3Bchance),1)
-                                end                                                             AS pf3
-                               ,case when sum(stealattemptchance) = 0 then '-'
-                                     else format(100.0*sum(stealattempted)/sum(stealattemptchance),1)
-                                end                                                             AS steals
-                               ,format(100.0*sum(street1Seen)/sum(HDs),1)                       AS saw_f
-                               ,format(100.0*sum(sawShowdown)/sum(HDs),1)                       AS sawsd
-                               ,case when sum(street1Seen) = 0 then '-'
-                                     else format(100.0*sum(sawShowdown)/sum(street1Seen),1)
-                                end                                                             AS wtsdwsf
-                               ,case when sum(sawShowdown) = 0 then '-'
-                                     else format(100.0*sum(wonAtSD)/sum(sawShowdown),1)
-                                end                                                             AS wmsd
-                               ,case when sum(street1Seen) = 0 then '-'
-                                     else format(100.0*sum(street1Aggr)/sum(street1Seen),1)
-                                end                                                             AS FlAFq
-                               ,case when sum(street2Seen) = 0 then '-'
-                                     else format(100.0*sum(street2Aggr)/sum(street2Seen),1)
-                                end                                                             AS TuAFq
-                               ,case when sum(street3Seen) = 0 then '-'
-                                    else format(100.0*sum(street3Aggr)/sum(street3Seen),1)
-                                end                                                             AS RvAFq
-                               ,case when sum(street1Seen)+sum(street2Seen)+sum(street3Seen) = 0 then '-'
-                                    else format(100.0*(sum(street1Aggr)+sum(street2Aggr)+sum(street3Aggr))
-                                             /(sum(street1Seen)+sum(street2Seen)+sum(street3Seen)),1)
-                                end                                                             AS PoFAFq
-                               ,format(sum(totalProfit)/100.0,2)                                AS Net
-                               ,format((sum(totalProfit/(gt.bigBlind+0.0))) / (sum(HDs)/100.0),2)
-                                                                                                AS BBper100
-                               ,format( (sum(totalProfit)/100.0) / sum(HDs), 4)                 AS Profitperhand
-                               ,format( sum(activeSeats*HDs)/(sum(HDs)+0.0), 2)                 AS AvgSeats
-                         from Gametypes gt
-                              inner join Sites s on s.Id = gt.siteId
-                              inner join HudCache hc on hc.gameTypeId = gt.Id
-                         where hc.playerId in <player_test>
-                         and   <gtbigBlind_test>
-                         and   hc.activeSeats <seats_test>
-                         and   concat( '20', substring(hc.styleKey,2,2), '-', substring(hc.styleKey,4,2), '-'
-                                     , substring(hc.styleKey,6,2) ) <datestest>
-                         group by gt.base
-                              ,gt.category
-                              ,upper(gt.limitType)
-                              ,s.name
-                              <groupbygt.bigBlind>
-                              ,gtId
-                        ) stats
-                    inner join
-                        ( select # profit from handsplayers/handsactions
-                                 hprof.gtId, sum(hprof.profit) sum_profit,
-                                 avg(hprof.profit/100.0) profitperhand,
-                                 case when hprof.gtId = -1 then -999
-                                      else variance(hprof.profit/100.0)
-                                 end as variance
-                          from
-                              (select hp.handId, <hgameTypeId> as gtId, hp.totalProfit as profit
-                               from HandsPlayers hp
-                               inner join Hands h        ON h.id            = hp.handId
-                               where hp.playerId in <player_test>
-                               and   hp.tourneysPlayersId IS NULL
-                               and   date_format(h.handStart, '%Y-%m-%d') <datestest>
-                               group by hp.handId, gtId, hp.totalProfit
-                              ) hprof
-                          group by hprof.gtId
-                         ) hprof2
-                        on hprof2.gtId = stats.gtId
-                    order by stats.category, stats.limittype, stats.bigBlindDesc desc <orderbyseats>"""
-            else:  # assume postgres
-                self.query['playerStats'] = """
-                    SELECT upper(stats.limitType) || ' '
-                           || initcap(stats.category) || ' '
-                           || stats.name || ' '
-                           || stats.bigBlindDesc                                          AS Game
-                          ,stats.n
-                          ,stats.vpip
-                          ,stats.pfr
-                          ,stats.pf3
-                          ,stats.steals
-                          ,stats.saw_f
-                          ,stats.sawsd
-                          ,stats.wtsdwsf
-                          ,stats.wmsd
-                          ,stats.FlAFq
-                          ,stats.TuAFq
-                          ,stats.RvAFq
-                          ,stats.PoFAFq
-                          ,stats.Net
-                          ,stats.BBper100
-                          ,stats.Profitperhand
-                          ,case when hprof2.variance = -999 then '-'
-                                else to_char(hprof2.variance, '0D00')
-                           end                                                          AS Variance
-                          ,AvgSeats
-                    FROM
-                        (select gt.base
-                               ,gt.category
-                               ,upper(gt.limitType)                                             AS limitType
-                               ,s.name
-                               ,<selectgt.bigBlind>                                             AS bigBlindDesc
-                               ,<hcgametypeId>                                                  AS gtId
-                               ,sum(HDs) as n
-                               ,to_char(100.0*sum(street0VPI)/sum(HDs),'990D0')                 AS vpip
-                               ,to_char(100.0*sum(street0Aggr)/sum(HDs),'90D0')                 AS pfr
-                               ,case when sum(street0_3Bchance) = 0 then '0'
-                                     else to_char(100.0*sum(street0_3Bdone)/sum(street0_3Bchance),'90D0')
-                                end                                                             AS pf3
-                               ,case when sum(stealattemptchance) = 0 then '-'
-                                     else to_char(100.0*sum(stealattempted)/sum(stealattemptchance),'90D0')
-                                end                                                             AS steals
-                               ,to_char(100.0*sum(street1Seen)/sum(HDs),'90D0')                 AS saw_f
-                               ,to_char(100.0*sum(sawShowdown)/sum(HDs),'90D0')                 AS sawsd
-                               ,case when sum(street1Seen) = 0 then '-'
-                                     else to_char(100.0*sum(sawShowdown)/sum(street1Seen),'90D0')
-                                end                                                             AS wtsdwsf
-                               ,case when sum(sawShowdown) = 0 then '-'
-                                     else to_char(100.0*sum(wonAtSD)/sum(sawShowdown),'90D0')
-                                end                                                             AS wmsd
-                               ,case when sum(street1Seen) = 0 then '-'
-                                     else to_char(100.0*sum(street1Aggr)/sum(street1Seen),'90D0')
-                                end                                                             AS FlAFq
-                               ,case when sum(street2Seen) = 0 then '-'
-                                     else to_char(100.0*sum(street2Aggr)/sum(street2Seen),'90D0')
-                                end                                                             AS TuAFq
-                               ,case when sum(street3Seen) = 0 then '-'
-                                    else to_char(100.0*sum(street3Aggr)/sum(street3Seen),'90D0')
-                                end                                                             AS RvAFq
-                               ,case when sum(street1Seen)+sum(street2Seen)+sum(street3Seen) = 0 then '-'
-                                    else to_char(100.0*(sum(street1Aggr)+sum(street2Aggr)+sum(street3Aggr))
-                                             /(sum(street1Seen)+sum(street2Seen)+sum(street3Seen)),'90D0')
-                                end                                                             AS PoFAFq
-                               ,round(sum(totalProfit)/100.0,2)                                 AS Net
-                               ,to_char((sum(totalProfit/(gt.bigBlind+0.0))) / (sum(HDs)/100.0), '990D00')
-                                                                                                AS BBper100
-                               ,to_char(sum(totalProfit/100.0) / (sum(HDs)+0.0), '990D0000')    AS Profitperhand
-                               ,to_char(sum(activeSeats*HDs)/(sum(HDs)+0.0),'90D00')            AS AvgSeats
-                         from Gametypes gt
-                              inner join Sites s on s.Id = gt.siteId
-                              inner join HudCache hc on hc.gameTypeId = gt.Id
-                         where hc.playerId in <player_test>
-                         and   <gtbigBlind_test>
-                         and   hc.activeSeats <seats_test>
-                         and   '20' || SUBSTR(hc.styleKey,2,2) || '-' || SUBSTR(hc.styleKey,4,2) || '-'
-                               || SUBSTR(hc.styleKey,6,2) <datestest>
-                         group by gt.base
-                              ,gt.category
-                              ,upper(gt.limitType)
-                              ,s.name
-                              <groupbygt.bigBlind>
-                              ,gtId
-                        ) stats
-                    inner join
-                        ( select
-                                 hprof.gtId, sum(hprof.profit) AS sum_profit,
-                                 avg(hprof.profit/100.0) AS profitperhand,
-                                 case when hprof.gtId = -1 then -999
-                                      else variance(hprof.profit/100.0)
-                                 end as variance
-                          from
-                              (select hp.handId, <hgameTypeId> as gtId, hp.totalProfit as profit
-                               from HandsPlayers hp
-                               inner join Hands h   ON (h.id = hp.handId)
-                               where hp.playerId in <player_test>
-                               and   hp.tourneysPlayersId IS NULL
-                               and   to_char(h.handStart, 'YYYY-MM-DD') <datestest>
-                               group by hp.handId, gtId, hp.totalProfit
-                              ) hprof
-                          group by hprof.gtId
-                         ) hprof2
-                        on hprof2.gtId = stats.gtId
-                    order by stats.base, stats.limittype, stats.bigBlindDesc desc <orderbyseats>"""
-            #elif db_server == 'sqlite':
-            #    self.query['playerStats'] = """ """
-
-            if db_server == 'mysql':
-                self.query['playerStatsByPosition'] = """
-                    SELECT
-                          concat(upper(stats.limitType), ' '
-                                ,concat(upper(substring(stats.category,1,1)),substring(stats.category,2) ), ' '
-                                ,stats.name, ' '
-                                ,cast(stats.bigBlindDesc as char)
-                                )                                                      AS Game
-                         ,case when stats.PlPosition = -2 then 'BB'
-                               when stats.PlPosition = -1 then 'SB'
-                               when stats.PlPosition =  0 then 'Btn'
-                               when stats.PlPosition =  1 then 'CO'
-                               when stats.PlPosition =  2 then 'MP'
-                               when stats.PlPosition =  5 then 'EP'
-                               else 'xx'
-                          end                                                          AS PlPosition
-                         ,stats.n
-                         ,stats.vpip
-                         ,stats.pfr
-                         ,stats.pf3
-                         ,stats.steals
-                         ,stats.saw_f
-                         ,stats.sawsd
-                         ,stats.wtsdwsf
-                         ,stats.wmsd
-                         ,stats.FlAFq
-                         ,stats.TuAFq
-                         ,stats.RvAFq
-                         ,stats.PoFAFq
-                         ,stats.Net
-                         ,stats.BBper100
-                         ,stats.Profitperhand
-                         ,case when hprof2.variance = -999 then '-'
-                               else format(hprof2.variance, 2)
-                          end                                                          AS Variance
-                         ,stats.AvgSeats
-                    FROM
-                        (select /* stats from hudcache */
-                                gt.base
-                               ,gt.category
-                               ,upper(gt.limitType)                                             AS limitType
-                               ,s.name
-                               ,<selectgt.bigBlind>                                             AS bigBlindDesc
-                               ,<hcgametypeId>                                                  AS gtId
-                               ,case when hc.position = 'B' then -2
-                                     when hc.position = 'S' then -1
-                                     when hc.position = 'D' then  0
-                                     when hc.position = 'C' then  1
-                                     when hc.position = 'M' then  2
-                                     when hc.position = 'E' then  5
-                                     else 9
-                                end                                                             as PlPosition
-                               ,sum(HDs)                                                        AS n
-                               ,format(100.0*sum(street0VPI)/sum(HDs),1)                        AS vpip
-                               ,format(100.0*sum(street0Aggr)/sum(HDs),1)                       AS pfr
-                               ,case when sum(street0_3Bchance) = 0 then '0'
-                                     else format(100.0*sum(street0_3Bdone)/sum(street0_3Bchance),1)
-                                end                                                             AS pf3
-                               ,case when sum(stealattemptchance) = 0 then '-'
-                                     else format(100.0*sum(stealattempted)/sum(stealattemptchance),1)
-                                end                                                             AS steals
-                               ,format(100.0*sum(street1Seen)/sum(HDs),1)                       AS saw_f
-                               ,format(100.0*sum(sawShowdown)/sum(HDs),1)                       AS sawsd
-                               ,case when sum(street1Seen) = 0 then '-'
-                                     else format(100.0*sum(sawShowdown)/sum(street1Seen),1)
-                                end                                                             AS wtsdwsf
-                               ,case when sum(sawShowdown) = 0 then '-'
-                                     else format(100.0*sum(wonAtSD)/sum(sawShowdown),1)
-                                end                                                             AS wmsd
-                               ,case when sum(street1Seen) = 0 then '-'
-                                     else format(100.0*sum(street1Aggr)/sum(street1Seen),1)
-                                end                                                             AS FlAFq
-                               ,case when sum(street2Seen) = 0 then '-'
-                                     else format(100.0*sum(street2Aggr)/sum(street2Seen),1)
-                                end                                                             AS TuAFq
-                               ,case when sum(street3Seen) = 0 then '-'
-                                    else format(100.0*sum(street3Aggr)/sum(street3Seen),1)
-                                end                                                             AS RvAFq
-                               ,case when sum(street1Seen)+sum(street2Seen)+sum(street3Seen) = 0 then '-'
-                                    else format(100.0*(sum(street1Aggr)+sum(street2Aggr)+sum(street3Aggr))
-                                             /(sum(street1Seen)+sum(street2Seen)+sum(street3Seen)),1)
-                                end                                                             AS PoFAFq
-                               ,format(sum(totalProfit)/100.0,2)                                AS Net
-                               ,format((sum(totalProfit/(gt.bigBlind+0.0))) / (sum(HDs)/100.0),2)
-                                                                                                AS BBper100
-                               ,format( (sum(totalProfit)/100.0) / sum(HDs), 4)                 AS Profitperhand
-                               ,format( sum(activeSeats*HDs)/(sum(HDs)+0.0), 2)                 AS AvgSeats
-                         from Gametypes gt
-                              inner join Sites s on s.Id = gt.siteId
-                              inner join HudCache hc on hc.gameTypeId = gt.Id
-                         where hc.playerId in <player_test>
-                         and   <gtbigBlind_test>
-                         and   hc.activeSeats <seats_test>
-                         and   concat( '20', substring(hc.styleKey,2,2), '-', substring(hc.styleKey,4,2), '-'
-                                     , substring(hc.styleKey,6,2) ) <datestest>
-                         group by gt.base
-                              ,gt.category
-                              ,upper(gt.limitType)
-                              ,s.name
-                              <groupbygt.bigBlind>
-                              ,gtId
-                              <groupbyseats>
-                              ,PlPosition
-                        ) stats
-                    inner join
-                        ( select # profit from handsplayers/handsactions
-                                 hprof.gtId,
-                                 case when hprof.position = 'B' then -2
-                                      when hprof.position = 'S' then -1
-                                      when hprof.position in ('3','4') then 2
-                                      when hprof.position in ('6','7') then 5
-                                      else hprof.position
-                                 end                                      as PlPosition,
-                                 sum(hprof.profit) as sum_profit,
-                                 avg(hprof.profit/100.0) as profitperhand,
-                                 case when hprof.gtId = -1 then -999
-                                      else variance(hprof.profit/100.0)
-                                 end as variance
-                          from
-                              (select hp.handId, <hgameTypeId> as gtId, hp.position
-                                    , hp.totalProfit as profit
-                               from HandsPlayers hp
-                               inner join Hands h  ON  (h.id = hp.handId)
-                               where hp.playerId in <player_test>
-                               and   hp.tourneysPlayersId IS NULL
-                               and   date_format(h.handStart, '%Y-%m-%d') <datestest>
-                               group by hp.handId, gtId, hp.position, hp.totalProfit
-                              ) hprof
-                          group by hprof.gtId, PlPosition
-                         ) hprof2
-                        on (    hprof2.gtId = stats.gtId
-                            and hprof2.PlPosition = stats.PlPosition)
-                    order by stats.category, stats.limitType, stats.bigBlindDesc desc
-                             <orderbyseats>, cast(stats.PlPosition as signed)
-                    """
-            else:  # assume postgresql
-                self.query['playerStatsByPosition'] = """
-                    select /* stats from hudcache */
-                           upper(stats.limitType) || ' '
-                           || upper(substr(stats.category,1,1)) || substr(stats.category,2) || ' '
-                           || stats.name || ' '
-                           || stats.bigBlindDesc                                        AS Game
-                          ,case when stats.PlPosition = -2 then 'BB'
-                                when stats.PlPosition = -1 then 'SB'
-                                when stats.PlPosition =  0 then 'Btn'
-                                when stats.PlPosition =  1 then 'CO'
-                                when stats.PlPosition =  2 then 'MP'
-                                when stats.PlPosition =  5 then 'EP'
-                                else 'xx'
-                           end                                                          AS PlPosition
-                          ,stats.n
-                          ,stats.vpip
-                          ,stats.pfr
-                          ,stats.pf3
-                          ,stats.steals
-                          ,stats.saw_f
-                          ,stats.sawsd
-                          ,stats.wtsdwsf
-                          ,stats.wmsd
-                          ,stats.FlAFq
-                          ,stats.TuAFq
-                          ,stats.RvAFq
-                          ,stats.PoFAFq
-                          ,stats.Net
-                          ,stats.BBper100
-                          ,stats.Profitperhand
-                          ,case when hprof2.variance = -999 then '-'
-                                else to_char(hprof2.variance, '0D00')
-                           end                                                          AS Variance
-                          ,stats.AvgSeats
-                    FROM
-                        (select /* stats from hudcache */
-                                gt.base
-                               ,gt.category
-                               ,upper(gt.limitType)                                             AS limitType
-                               ,s.name
-                               ,<selectgt.bigBlind>                                             AS bigBlindDesc
-                               ,<hcgametypeId>                                                  AS gtId
-                               ,case when hc.position = 'B' then -2
-                                     when hc.position = 'S' then -1
-                                     when hc.position = 'D' then  0
-                                     when hc.position = 'C' then  1
-                                     when hc.position = 'M' then  2
-                                     when hc.position = 'E' then  5
-                                     else 9
-                                end                                                             AS PlPosition
-                               ,sum(HDs)                                                        AS n
-                               ,to_char(round(100.0*sum(street0VPI)/sum(HDs)),'990D0')          AS vpip
-                               ,to_char(round(100.0*sum(street0Aggr)/sum(HDs)),'90D0')          AS pfr
-                               ,case when sum(street0_3Bchance) = 0 then '0'
-                                     else to_char(100.0*sum(street0_3Bdone)/sum(street0_3Bchance),'90D0')
-                                end                                                             AS pf3
-                               ,case when sum(stealattemptchance) = 0 then '-'
-                                     else to_char(100.0*sum(stealattempted)/sum(stealattemptchance),'90D0')
-                                end                                                             AS steals
-                               ,to_char(round(100.0*sum(street1Seen)/sum(HDs)),'90D0')          AS saw_f
-                               ,to_char(round(100.0*sum(sawShowdown)/sum(HDs)),'90D0')          AS sawsd
-                               ,case when sum(street1Seen) = 0 then '-'
-                                     else to_char(round(100.0*sum(sawShowdown)/sum(street1Seen)),'90D0')
-                                end                                                             AS wtsdwsf
-                               ,case when sum(sawShowdown) = 0 then '-'
-                                     else to_char(round(100.0*sum(wonAtSD)/sum(sawShowdown)),'90D0')
-                                end                                                             AS wmsd
-                               ,case when sum(street1Seen) = 0 then '-'
-                                     else to_char(round(100.0*sum(street1Aggr)/sum(street1Seen)),'90D0')
-                                end                                                             AS FlAFq
-                               ,case when sum(street2Seen) = 0 then '-'
-                                     else to_char(round(100.0*sum(street2Aggr)/sum(street2Seen)),'90D0')
-                                end                                                             AS TuAFq
-                               ,case when sum(street3Seen) = 0 then '-'
-                                    else to_char(round(100.0*sum(street3Aggr)/sum(street3Seen)),'90D0')
-                                end                                                             AS RvAFq
-                               ,case when sum(street1Seen)+sum(street2Seen)+sum(street3Seen) = 0 then '-'
-                                    else to_char(round(100.0*(sum(street1Aggr)+sum(street2Aggr)+sum(street3Aggr))
-                                             /(sum(street1Seen)+sum(street2Seen)+sum(street3Seen))),'90D0')
-                                end                                                             AS PoFAFq
-                               ,to_char(sum(totalProfit)/100.0,'9G999G990D00')                  AS Net
-                               ,case when sum(HDs) = 0 then '0'
-                                     else to_char(sum(totalProfit/(gt.bigBlind+0.0)) / (sum(HDs)/100.0), '990D00')
-                                end                                                             AS BBper100
-                               ,case when sum(HDs) = 0 then '0'
-                                     else to_char( (sum(totalProfit)/100.0) / sum(HDs), '90D0000')
-                                end                                                             AS Profitperhand
-                               ,to_char(sum(activeSeats*HDs)/(sum(HDs)+0.0),'90D00')            AS AvgSeats
-                         from Gametypes gt
-                              inner join Sites s     on (s.Id = gt.siteId)
-                              inner join HudCache hc on (hc.gameTypeId = gt.Id)
-                         where hc.playerId in <player_test>
-                         and   <gtbigBlind_test>
-                         and   hc.activeSeats <seats_test>
-                         and   '20' || SUBSTR(hc.styleKey,2,2) || '-' || SUBSTR(hc.styleKey,4,2) || '-'
-                               || SUBSTR(hc.styleKey,6,2) <datestest>
-                         group by gt.base
-                              ,gt.category
-                              ,upper(gt.limitType)
-                              ,s.name
-                              <groupbygt.bigBlind>
-                              ,gtId
-                              <groupbyseats>
-                              ,PlPosition
-                        ) stats
-                    inner join
-                        ( select /* profit from handsplayers/handsactions */
-                                 hprof.gtId,
-                                 case when hprof.position = 'B' then -2
-                                      when hprof.position = 'S' then -1
-                                      when hprof.position in ('3','4') then 2
-                                      when hprof.position in ('6','7') then 5
-                                      else cast(hprof.position as smallint)
-                                 end                                      as PlPosition,
-                                 sum(hprof.profit) as sum_profit,
-                                 avg(hprof.profit/100.0) as profitperhand,
-                                 case when hprof.gtId = -1 then -999
-                                      else variance(hprof.profit/100.0)
-                                 end as variance
-                          from
-                              (select hp.handId, <hgameTypeId> as gtId, hp.position
-                                    , hp.totalProfit as profit
-                               from HandsPlayers hp
-                               inner join Hands h  ON  (h.id = hp.handId)
-                               where hp.playerId in <player_test>
-                               and   hp.tourneysPlayersId IS NULL
-                               and   to_char(h.handStart, 'YYYY-MM-DD') <datestest>
-                               group by hp.handId, gameTypeId, hp.position, hp.totalProfit
-                              ) hprof
-                          group by hprof.gtId, PlPosition
-                        ) hprof2
-                        on (    hprof2.gtId = stats.gtId
-                            and hprof2.PlPosition = stats.PlPosition)
-                    order by stats.category, stats.limitType, stats.bigBlindDesc desc
-                             <orderbyseats>, cast(stats.PlPosition as smallint)
-                    """
-            #elif db_server == 'sqlite':
-            #    self.query['playerStatsByPosition'] = """ """
-
-            self.query['getRingProfitAllHandsPlayerIdSite'] = """
-                SELECT hp.handId, hp.totalProfit, hp.totalProfit, hp.totalProfit
-                FROM HandsPlayers hp
-                INNER JOIN Players pl      ON  (hp.playerId  = pl.id)
-                INNER JOIN Hands h         ON  (h.id         = hp.handId)
-                INNER JOIN Gametypes g     ON  (h.gametypeId = g.id)
-                where pl.id in <player_test>
-                AND   pl.siteId in <site_test>
-                AND   h.handStart > '<startdate_test>'
-                AND   h.handStart < '<enddate_test>'
-                AND   g.bigBlind in <limit_test>
-                AND   hp.tourneysPlayersId IS NULL
-                GROUP BY h.handStart, hp.handId, hp.totalProfit
-                ORDER BY h.handStart"""
-
-
-            ####################################
-            # Queries to rebuild/modify hudcache
-            ####################################
-          
-            self.query['clearHudCache'] = """DELETE FROM HudCache"""
-           
-            if db_server == 'mysql':
-                self.query['rebuildHudCache'] = """
-                    INSERT INTO HudCache
-                    (gametypeId
-                    ,playerId
-                    ,activeSeats
-                    ,position
-                    ,tourneyTypeId
-                    ,styleKey
-                    ,HDs
-                    ,wonWhenSeenStreet1
-                    ,wonAtSD
-                    ,street0VPI
-                    ,street0Aggr
-                    ,street0_3BChance
-                    ,street0_3BDone
-                    ,street1Seen
-                    ,street2Seen
-                    ,street3Seen
-                    ,street4Seen
-                    ,sawShowdown
-                    ,street1Aggr
-                    ,street2Aggr
-                    ,street3Aggr
-                    ,street4Aggr
-                    ,otherRaisedStreet1
-                    ,otherRaisedStreet2
-                    ,otherRaisedStreet3
-                    ,otherRaisedStreet4
-                    ,foldToOtherRaisedStreet1
-                    ,foldToOtherRaisedStreet2
-                    ,foldToOtherRaisedStreet3
-                    ,foldToOtherRaisedStreet4
-                    ,stealAttemptChance
-                    ,stealAttempted
-                    ,foldBbToStealChance
-                    ,foldedBbToSteal
-                    ,foldSbToStealChance
-                    ,foldedSbToSteal
-                    ,street1CBChance
-                    ,street1CBDone
-                    ,street2CBChance
-                    ,street2CBDone
-                    ,street3CBChance
-                    ,street3CBDone
-                    ,street4CBChance
-                    ,street4CBDone
-                    ,foldToStreet1CBChance
-                    ,foldToStreet1CBDone
-                    ,foldToStreet2CBChance
-                    ,foldToStreet2CBDone
-                    ,foldToStreet3CBChance
-                    ,foldToStreet3CBDone
-                    ,foldToStreet4CBChance
-                    ,foldToStreet4CBDone
-                    ,totalProfit
-                    ,street1CheckCallRaiseChance
-                    ,street1CheckCallRaiseDone
-                    ,street2CheckCallRaiseChance
-                    ,street2CheckCallRaiseDone
-                    ,street3CheckCallRaiseChance
-                    ,street3CheckCallRaiseDone
-                    ,street4CheckCallRaiseChance
-                    ,street4CheckCallRaiseDone
-                    )
-                    SELECT h.gametypeId
-                          ,hp.playerId
-                          ,h.seats
-                          ,case when hp.position = 'B' then 'B'
-                                when hp.position = 'S' then 'S'
-                                when hp.position = '0' then 'D'
-                                when hp.position = '1' then 'C'
-                                when hp.position = '2' then 'M'
-                                when hp.position = '3' then 'M'
-                                when hp.position = '4' then 'M'
-                                when hp.position = '5' then 'E'
-                                when hp.position = '6' then 'E'
-                                when hp.position = '7' then 'E'
-                                when hp.position = '8' then 'E'
-                                when hp.position = '9' then 'E'
-                                else 'E'
-                           end                                            AS hc_position
-                          ,hp.tourneyTypeId
-                          ,date_format(h.handStart, 'd%y%m%d')
-                          ,count(1)
-                          ,sum(wonWhenSeenStreet1)
-                          ,sum(wonAtSD)
-                          ,sum(street0VPI)
-                          ,sum(street0Aggr)
-                          ,sum(street0_3BChance)
-                          ,sum(street0_3BDone)
-                          ,sum(street1Seen)
-                          ,sum(street2Seen)
-                          ,sum(street3Seen)
-                          ,sum(street4Seen)
-                          ,sum(sawShowdown)
-                          ,sum(street1Aggr)
-                          ,sum(street2Aggr)
-                          ,sum(street3Aggr)
-                          ,sum(street4Aggr)
-                          ,sum(otherRaisedStreet1)
-                          ,sum(otherRaisedStreet2)
-                          ,sum(otherRaisedStreet3)
-                          ,sum(otherRaisedStreet4)
-                          ,sum(foldToOtherRaisedStreet1)
-                          ,sum(foldToOtherRaisedStreet2)
-                          ,sum(foldToOtherRaisedStreet3)
-                          ,sum(foldToOtherRaisedStreet4)
-                          ,sum(stealAttemptChance)
-                          ,sum(stealAttempted)
-                          ,sum(foldBbToStealChance)
-                          ,sum(foldedBbToSteal)
-                          ,sum(foldSbToStealChance)
-                          ,sum(foldedSbToSteal)
-                          ,sum(street1CBChance)
-                          ,sum(street1CBDone)
-                          ,sum(street2CBChance)
-                          ,sum(street2CBDone)
-                          ,sum(street3CBChance)
-                          ,sum(street3CBDone)
-                          ,sum(street4CBChance)
-                          ,sum(street4CBDone)
-                          ,sum(foldToStreet1CBChance)
-                          ,sum(foldToStreet1CBDone)
-                          ,sum(foldToStreet2CBChance)
-                          ,sum(foldToStreet2CBDone)
-                          ,sum(foldToStreet3CBChance)
-                          ,sum(foldToStreet3CBDone)
-                          ,sum(foldToStreet4CBChance)
-                          ,sum(foldToStreet4CBDone)
-                          ,sum(totalProfit)
-                          ,sum(street1CheckCallRaiseChance)
-                          ,sum(street1CheckCallRaiseDone)
-                          ,sum(street2CheckCallRaiseChance)
-                          ,sum(street2CheckCallRaiseDone)
-                          ,sum(street3CheckCallRaiseChance)
-                          ,sum(street3CheckCallRaiseDone)
-                          ,sum(street4CheckCallRaiseChance)
-                          ,sum(street4CheckCallRaiseDone)
-                    FROM HandsPlayers hp
-                    INNER JOIN Hands h ON (h.id = hp.handId)
-                    GROUP BY h.gametypeId
-                            ,hp.playerId
-                            ,h.seats
-                            ,hc_position
-                            ,hp.tourneyTypeId
-                            ,date_format(h.handStart, 'd%y%m%d')
-"""
-            elif db_server == 'postgresql':
-                self.query['rebuildHudCache'] = """
-                    INSERT INTO HudCache
-                    (gametypeId
-                    ,playerId
-                    ,activeSeats
-                    ,position
-                    ,tourneyTypeId
-                    ,styleKey
-                    ,HDs
-                    ,wonWhenSeenStreet1
-                    ,wonAtSD
-                    ,street0VPI
-                    ,street0Aggr
-                    ,street0_3BChance
-                    ,street0_3BDone
-                    ,street1Seen
-                    ,street2Seen
-                    ,street3Seen
-                    ,street4Seen
-                    ,sawShowdown
-                    ,street1Aggr
-                    ,street2Aggr
-                    ,street3Aggr
-                    ,street4Aggr
-                    ,otherRaisedStreet1
-                    ,otherRaisedStreet2
-                    ,otherRaisedStreet3
-                    ,otherRaisedStreet4
-                    ,foldToOtherRaisedStreet1
-                    ,foldToOtherRaisedStreet2
-                    ,foldToOtherRaisedStreet3
-                    ,foldToOtherRaisedStreet4
-                    ,stealAttemptChance
-                    ,stealAttempted
-                    ,foldBbToStealChance
-                    ,foldedBbToSteal
-                    ,foldSbToStealChance
-                    ,foldedSbToSteal
-                    ,street1CBChance
-                    ,street1CBDone
-                    ,street2CBChance
-                    ,street2CBDone
-                    ,street3CBChance
-                    ,street3CBDone
-                    ,street4CBChance
-                    ,street4CBDone
-                    ,foldToStreet1CBChance
-                    ,foldToStreet1CBDone
-                    ,foldToStreet2CBChance
-                    ,foldToStreet2CBDone
-                    ,foldToStreet3CBChance
-                    ,foldToStreet3CBDone
-                    ,foldToStreet4CBChance
-                    ,foldToStreet4CBDone
-                    ,totalProfit
-                    ,street1CheckCallRaiseChance
-                    ,street1CheckCallRaiseDone
-                    ,street2CheckCallRaiseChance
-                    ,street2CheckCallRaiseDone
-                    ,street3CheckCallRaiseChance
-                    ,street3CheckCallRaiseDone
-                    ,street4CheckCallRaiseChance
-                    ,street4CheckCallRaiseDone
-                    )
-                    SELECT h.gametypeId
-                          ,hp.playerId
-                          ,h.seats
-                          ,case when hp.position = 'B' then 'B'
-                                when hp.position = 'S' then 'S'
-                                when hp.position = '0' then 'D'
-                                when hp.position = '1' then 'C'
-                                when hp.position = '2' then 'M'
-                                when hp.position = '3' then 'M'
-                                when hp.position = '4' then 'M'
-                                when hp.position = '5' then 'E'
-                                when hp.position = '6' then 'E'
-                                when hp.position = '7' then 'E'
-                                when hp.position = '8' then 'E'
-                                when hp.position = '9' then 'E'
-                                else 'E'
-                           end                                            AS hc_position
-                          ,hp.tourneyTypeId
-                          ,'d' || to_char(h.handStart, 'YYMMDD')
-                          ,count(1)
-                          ,sum(wonWhenSeenStreet1)
-                          ,sum(wonAtSD)
-                          ,sum(CAST(street0VPI as integer))
-                          ,sum(CAST(street0Aggr as integer))
-                          ,sum(CAST(street0_3BChance as integer))
-                          ,sum(CAST(street0_3BDone as integer))
-                          ,sum(CAST(street1Seen as integer))
-                          ,sum(CAST(street2Seen as integer))
-                          ,sum(CAST(street3Seen as integer))
-                          ,sum(CAST(street4Seen as integer))
-                          ,sum(CAST(sawShowdown as integer))
-                          ,sum(CAST(street1Aggr as integer))
-                          ,sum(CAST(street2Aggr as integer))
-                          ,sum(CAST(street3Aggr as integer))
-                          ,sum(CAST(street4Aggr as integer))
-                          ,sum(CAST(otherRaisedStreet1 as integer))
-                          ,sum(CAST(otherRaisedStreet2 as integer))
-                          ,sum(CAST(otherRaisedStreet3 as integer))
-                          ,sum(CAST(otherRaisedStreet4 as integer))
-                          ,sum(CAST(foldToOtherRaisedStreet1 as integer))
-                          ,sum(CAST(foldToOtherRaisedStreet2 as integer))
-                          ,sum(CAST(foldToOtherRaisedStreet3 as integer))
-                          ,sum(CAST(foldToOtherRaisedStreet4 as integer))
-                          ,sum(CAST(stealAttemptChance as integer))
-                          ,sum(CAST(stealAttempted as integer))
-                          ,sum(CAST(foldBbToStealChance as integer))
-                          ,sum(CAST(foldedBbToSteal as integer))
-                          ,sum(CAST(foldSbToStealChance as integer))
-                          ,sum(CAST(foldedSbToSteal as integer))
-                          ,sum(CAST(street1CBChance as integer))
-                          ,sum(CAST(street1CBDone as integer))
-                          ,sum(CAST(street2CBChance as integer))
-                          ,sum(CAST(street2CBDone as integer))
-                          ,sum(CAST(street3CBChance as integer))
-                          ,sum(CAST(street3CBDone as integer))
-                          ,sum(CAST(street4CBChance as integer))
-                          ,sum(CAST(street4CBDone as integer))
-                          ,sum(CAST(foldToStreet1CBChance as integer))
-                          ,sum(CAST(foldToStreet1CBDone as integer))
-                          ,sum(CAST(foldToStreet2CBChance as integer))
-                          ,sum(CAST(foldToStreet2CBDone as integer))
-                          ,sum(CAST(foldToStreet3CBChance as integer))
-                          ,sum(CAST(foldToStreet3CBDone as integer))
-                          ,sum(CAST(foldToStreet4CBChance as integer))
-                          ,sum(CAST(foldToStreet4CBDone as integer))
-                          ,sum(CAST(totalProfit as integer))
-                          ,sum(CAST(street1CheckCallRaiseChance as integer))
-                          ,sum(CAST(street1CheckCallRaiseDone as integer))
-                          ,sum(CAST(street2CheckCallRaiseChance as integer))
-                          ,sum(CAST(street2CheckCallRaiseDone as integer))
-                          ,sum(CAST(street3CheckCallRaiseChance as integer))
-                          ,sum(CAST(street3CheckCallRaiseDone as integer))
-                          ,sum(CAST(street4CheckCallRaiseChance as integer))
-                          ,sum(CAST(street4CheckCallRaiseDone as integer))
-                    FROM HandsPlayers hp
-                    INNER JOIN Hands h ON (h.id = hp.handId)
-                    GROUP BY h.gametypeId
-                            ,hp.playerId
-                            ,h.seats
-                            ,hc_position
-                            ,hp.tourneyTypeId
-                            ,to_char(h.handStart, 'YYMMDD')
-"""
-            else:   # assume sqlite
-                self.query['rebuildHudCache'] = """
-                    INSERT INTO HudCache
-                    (gametypeId
-                    ,playerId
-                    ,activeSeats
-                    ,position
-                    ,tourneyTypeId
-                    ,styleKey
-                    ,HDs
-                    ,wonWhenSeenStreet1
-                    ,wonAtSD
-                    ,street0VPI
-                    ,street0Aggr
-                    ,street0_3BChance
-                    ,street0_3BDone
-                    ,street1Seen
-                    ,street2Seen
-                    ,street3Seen
-                    ,street4Seen
-                    ,sawShowdown
-                    ,street1Aggr
-                    ,street2Aggr
-                    ,street3Aggr
-                    ,street4Aggr
-                    ,otherRaisedStreet1
-                    ,otherRaisedStreet2
-                    ,otherRaisedStreet3
-                    ,otherRaisedStreet4
-                    ,foldToOtherRaisedStreet1
-                    ,foldToOtherRaisedStreet2
-                    ,foldToOtherRaisedStreet3
-                    ,foldToOtherRaisedStreet4
-                    ,stealAttemptChance
-                    ,stealAttempted
-                    ,foldBbToStealChance
-                    ,foldedBbToSteal
-                    ,foldSbToStealChance
-                    ,foldedSbToSteal
-                    ,street1CBChance
-                    ,street1CBDone
-                    ,street2CBChance
-                    ,street2CBDone
-                    ,street3CBChance
-                    ,street3CBDone
-                    ,street4CBChance
-                    ,street4CBDone
-                    ,foldToStreet1CBChance
-                    ,foldToStreet1CBDone
-                    ,foldToStreet2CBChance
-                    ,foldToStreet2CBDone
-                    ,foldToStreet3CBChance
-                    ,foldToStreet3CBDone
-                    ,foldToStreet4CBChance
-                    ,foldToStreet4CBDone
-                    ,totalProfit
-                    ,street1CheckCallRaiseChance
-                    ,street1CheckCallRaiseDone
-                    ,street2CheckCallRaiseChance
-                    ,street2CheckCallRaiseDone
-                    ,street3CheckCallRaiseChance
-                    ,street3CheckCallRaiseDone
-                    ,street4CheckCallRaiseChance
-                    ,street4CheckCallRaiseDone
-                    )
-                    SELECT h.gametypeId
-                          ,hp.playerId
-                          ,h.seats
-                          ,case when hp.position = 'B' then 'B'
-                                when hp.position = 'S' then 'S'
-                                when hp.position = '0' then 'D'
-                                when hp.position = '1' then 'C'
-                                when hp.position = '2' then 'M'
-                                when hp.position = '3' then 'M'
-                                when hp.position = '4' then 'M'
-                                when hp.position = '5' then 'E'
-                                when hp.position = '6' then 'E'
-                                when hp.position = '7' then 'E'
-                                when hp.position = '8' then 'E'
-                                when hp.position = '9' then 'E'
-                                else 'E'
-                           end                                            AS hc_position
-                          ,hp.tourneyTypeId
-                          ,'d' || substr(strftime('%Y%m%d', h.handStart),3,7)
-                          ,count(1)
-                          ,sum(wonWhenSeenStreet1)
-                          ,sum(wonAtSD)
-                          ,sum(CAST(street0VPI as integer))
-                          ,sum(CAST(street0Aggr as integer))
-                          ,sum(CAST(street0_3BChance as integer))
-                          ,sum(CAST(street0_3BDone as integer))
-                          ,sum(CAST(street1Seen as integer))
-                          ,sum(CAST(street2Seen as integer))
-                          ,sum(CAST(street3Seen as integer))
-                          ,sum(CAST(street4Seen as integer))
-                          ,sum(CAST(sawShowdown as integer))
-                          ,sum(CAST(street1Aggr as integer))
-                          ,sum(CAST(street2Aggr as integer))
-                          ,sum(CAST(street3Aggr as integer))
-                          ,sum(CAST(street4Aggr as integer))
-                          ,sum(CAST(otherRaisedStreet1 as integer))
-                          ,sum(CAST(otherRaisedStreet2 as integer))
-                          ,sum(CAST(otherRaisedStreet3 as integer))
-                          ,sum(CAST(otherRaisedStreet4 as integer))
-                          ,sum(CAST(foldToOtherRaisedStreet1 as integer))
-                          ,sum(CAST(foldToOtherRaisedStreet2 as integer))
-                          ,sum(CAST(foldToOtherRaisedStreet3 as integer))
-                          ,sum(CAST(foldToOtherRaisedStreet4 as integer))
-                          ,sum(CAST(stealAttemptChance as integer))
-                          ,sum(CAST(stealAttempted as integer))
-                          ,sum(CAST(foldBbToStealChance as integer))
-                          ,sum(CAST(foldedBbToSteal as integer))
-                          ,sum(CAST(foldSbToStealChance as integer))
-                          ,sum(CAST(foldedSbToSteal as integer))
-                          ,sum(CAST(street1CBChance as integer))
-                          ,sum(CAST(street1CBDone as integer))
-                          ,sum(CAST(street2CBChance as integer))
-                          ,sum(CAST(street2CBDone as integer))
-                          ,sum(CAST(street3CBChance as integer))
-                          ,sum(CAST(street3CBDone as integer))
-                          ,sum(CAST(street4CBChance as integer))
-                          ,sum(CAST(street4CBDone as integer))
-                          ,sum(CAST(foldToStreet1CBChance as integer))
-                          ,sum(CAST(foldToStreet1CBDone as integer))
-                          ,sum(CAST(foldToStreet2CBChance as integer))
-                          ,sum(CAST(foldToStreet2CBDone as integer))
-                          ,sum(CAST(foldToStreet3CBChance as integer))
-                          ,sum(CAST(foldToStreet3CBDone as integer))
-                          ,sum(CAST(foldToStreet4CBChance as integer))
-                          ,sum(CAST(foldToStreet4CBDone as integer))
-                          ,sum(CAST(totalProfit as integer))
-                          ,sum(CAST(street1CheckCallRaiseChance as integer))
-                          ,sum(CAST(street1CheckCallRaiseDone as integer))
-                          ,sum(CAST(street2CheckCallRaiseChance as integer))
-                          ,sum(CAST(street2CheckCallRaiseDone as integer))
-                          ,sum(CAST(street3CheckCallRaiseChance as integer))
-                          ,sum(CAST(street3CheckCallRaiseDone as integer))
-                          ,sum(CAST(street4CheckCallRaiseChance as integer))
-                          ,sum(CAST(street4CheckCallRaiseDone as integer))
-                    FROM HandsPlayers hp
-                    INNER JOIN Hands h ON (h.id = hp.handId)
-                    GROUP BY h.gametypeId
-                            ,hp.playerId
-                            ,h.seats
-                            ,hc_position
-                            ,hp.tourneyTypeId
-                            ,'d' || substr(strftime('%Y%m%d', h.handStart),3,7)
-"""
-
-            if db_server == 'mysql':
-                self.query['analyze'] = """
-                analyze table Autorates, GameTypes, Hands, HandsPlayers, Hudcache, Players
-                            , Settings, Sites, Tourneys, TourneysPlayers, TourneyTypes
-                """
-            else:  # assume postgres
-                self.query['analyze'] = "vacuum analyze"
-
-            if db_server == 'mysql':
-                self.query['lockForInsert'] = """
-                    lock tables Hands write, HandsPlayers write, HandsActions write, Players write
-                              , HudCache write, GameTypes write, Sites write, Tourneys write
-                              , TourneysPlayers write, TourneyTypes write, Autorates write
-                    """
-            else:  # assume postgres
-                self.query['lockForInsert'] = ""
-
-            self.query['getGametypeFL'] = """SELECT id
-                                               FROM Gametypes
-                                               WHERE siteId=%s
-                                               AND   type=%s
-                                               AND   category=%s
-                                               AND   limitType=%s
-                                               AND   smallBet=%s
-                                               AND   bigBet=%s
-            """
-
-            self.query['getGametypeNL'] = """SELECT id
-                                               FROM Gametypes
-                                               WHERE siteId=%s
-                                               AND   type=%s
-                                               AND   category=%s
-                                               AND   limitType=%s
-                                               AND   smallBlind=%s
-                                               AND   bigBlind=%s
-            """
-
-            self.query['insertGameTypes'] = """INSERT INTO Gametypes
-                                                  (siteId, type, base, category, limitType
-                                                  ,hiLo, smallBlind, bigBlind, smallBet, bigBet)
-                                               VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)"""
-
-            self.query['isAlreadyInDB'] = """SELECT id FROM Hands 
-                                             WHERE gametypeId=%s AND siteHandNo=%s
-            """
-
-            if db_server == 'mysql':
-                self.query['placeholder'] = u'%s'
-            elif db_server == 'postgresql':
-                self.query['placeholder'] = u'%s'
-            elif db_server == 'sqlite':
-                self.query['placeholder'] = u'?'
-
-
-            # If using sqlite, use the ? placeholder instead of %s
-            if db_server == 'sqlite':
-                for k,q in self.query.iteritems():
-                    self.query[k] = re.sub('%s','?',q)
-
-if __name__== "__main__":
-#    just print the default queries and exit
-    s = Sql(game = 'razz', type = 'ptracks')
-    for key in s.query:
-        print "For query " + key + ", sql ="
-        print s.query[key]
+#!/usr/bin/env python
+"""Returns a dict of SQL statements used in fpdb.
+"""
+#    Copyright 2008-2009, Ray E. Barker
+#   
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#   
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#    GNU General Public License for more details.
+#   
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+#    NOTES:  The sql statements use the placeholder %s for bind variables
+#            which is then replaced by ? for sqlite. Comments can be included 
+#            within sql statements using C style /* ... */ comments, BUT
+#            THE COMMENTS MUST NOT INCLUDE %s OR ?.
+
+########################################################################
+
+#    Standard Library modules
+import re
+
+#    pyGTK modules
+
+#    FreePokerTools modules
+
+class Sql:
+   
+    def __init__(self, game = 'holdem', type = 'fpdb', db_server = 'mysql'):
+        self.query = {}
+###############################################################################3
+#    Support for the Free Poker DataBase = fpdb   http://fpdb.sourceforge.net/
+#
+        if type == 'fpdb':
+
+            ################################
+            # List tables
+            ################################
+            if db_server == 'mysql':
+                self.query['list_tables'] = """SHOW TABLES"""
+            elif db_server == 'postgresql':
+                self.query['list_tables'] = """SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'"""
+            elif db_server == 'sqlite':
+                self.query['list_tables'] = """SELECT name FROM sqlite_master
+                WHERE type='table'
+                ORDER BY name;"""
+
+            ##################################################################
+            # Drop Tables - MySQL, PostgreSQL and SQLite all share same syntax
+            ##################################################################
+
+            self.query['drop_table'] = """DROP TABLE IF EXISTS """   
+
+
+            ################################
+            # Create Settings
+            ################################
+            if db_server == 'mysql':
+                self.query['createSettingsTable'] = """CREATE TABLE Settings (
+                                            version SMALLINT NOT NULL)
+                                    ENGINE=INNODB"""
+            elif db_server == 'postgresql':
+                self.query['createSettingsTable'] =  """CREATE TABLE Settings (version SMALLINT NOT NULL)"""
+
+            elif db_server == 'sqlite':
+                self.query['createSettingsTable'] = """CREATE TABLE Settings
+                (version INTEGER NOT NULL) """
+
+
+            ################################
+            # Create Sites
+            ################################
+
+            if db_server == 'mysql':
+                self.query['createSitesTable'] = """CREATE TABLE Sites (
+                            id SMALLINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
+                            name varchar(32) NOT NULL,
+                            currency char(3) NOT NULL)
+                            ENGINE=INNODB"""
+            elif db_server == 'postgresql':
+                self.query['createSitesTable'] = """CREATE TABLE Sites (
+                            id SERIAL, PRIMARY KEY (id),
+                            name varchar(32),
+                            currency char(3))"""
+            elif db_server == 'sqlite':
+                self.query['createSitesTable'] = """CREATE TABLE Sites (
+                            id INTEGER PRIMARY KEY,
+                            name TEXT NOT NULL,
+                            currency TEXT NOT NULL)"""
+
+
+            ################################
+            # Create Gametypes
+            ################################
+
+            if db_server == 'mysql':
+                self.query['createGametypesTable'] = """CREATE TABLE Gametypes (
+                            id SMALLINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
+                            siteId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (siteId) REFERENCES Sites(id),
+                            type char(4) NOT NULL,
+                            base char(4) NOT NULL,
+                            category varchar(9) NOT NULL,
+                            limitType char(2) NOT NULL,
+                            hiLo char(1) NOT NULL,
+                            smallBlind int,
+                            bigBlind int,
+                            smallBet int NOT NULL,
+                            bigBet int NOT NULL)
+                            ENGINE=INNODB"""
+            elif db_server == 'postgresql':
+                self.query['createGametypesTable'] = """CREATE TABLE Gametypes (
+                            id SERIAL, PRIMARY KEY (id),
+                            siteId INTEGER, FOREIGN KEY (siteId) REFERENCES Sites(id),
+                            type char(4),
+                            base char(4),
+                            category varchar(9),
+                            limitType char(2),
+                            hiLo char(1),
+                            smallBlind int,
+                            bigBlind int,
+                            smallBet int,
+                            bigBet int)"""
+            elif db_server == 'sqlite':
+                self.query['createGametypesTable'] = """CREATE TABLE GameTypes (
+                            id INTEGER PRIMARY KEY,
+                            siteId INTEGER,
+                            type TEXT,
+                            base TEXT,
+                            category TEXT,
+                            limitType TEXT,
+                            hiLo TEXT,
+                            smallBlind INTEGER,
+                            bigBlind INTEGER,
+                            smallBet INTEGER,
+                            bigBet INTEGER,
+                            FOREIGN KEY(siteId) REFERENCES Sites(id) ON DELETE CASCADE)"""
+
+
+            ################################
+            # Create Players
+            ################################
+
+            if db_server == 'mysql':
+                self.query['createPlayersTable'] = """CREATE TABLE Players (
+                                id INT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
+                                name VARCHAR(32) CHARACTER SET utf8 NOT NULL,
+                                siteId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (siteId) REFERENCES Sites(id),
+                                comment text,
+                                commentTs DATETIME)
+                            ENGINE=INNODB"""
+            elif db_server == 'postgresql':
+                self.query['createPlayersTable'] = """CREATE TABLE Players (
+                            id SERIAL, PRIMARY KEY (id),
+                            name VARCHAR(32),
+                            siteId INTEGER, FOREIGN KEY (siteId) REFERENCES Sites(id),
+                            comment text,
+                            commentTs timestamp without time zone)"""
+            elif db_server == 'sqlite':
+                self.query['createPlayersTable'] = """CREATE TABLE Players (
+                            id INTEGER PRIMARY KEY,
+                            name TEXT,
+                            siteId INTEGER,
+                            comment TEXT,
+                            commentTs REAL,
+                            FOREIGN KEY(siteId) REFERENCES Sites(id) ON DELETE CASCADE)"""
+
+
+            ################################
+            # Create Autorates
+            ################################
+
+            if db_server == 'mysql':
+                self.query['createAutoratesTable'] = """CREATE TABLE Autorates (
+                                id BIGINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
+                                playerId INT UNSIGNED NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
+                                gametypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
+                                description varchar(50) NOT NULL,
+                                shortDesc char(8) NOT NULL,
+                                ratingTime DATETIME NOT NULL,
+                                handCount int NOT NULL)
+                            ENGINE=INNODB"""
+            elif db_server == 'postgresql':
+                self.query['createAutoratesTable'] = """CREATE TABLE Autorates (
+                                id BIGSERIAL, PRIMARY KEY (id),
+                                playerId INT, FOREIGN KEY (playerId) REFERENCES Players(id),
+                                gametypeId INT, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
+                                description varchar(50),
+                                shortDesc char(8),
+                                ratingTime timestamp without time zone,
+                                handCount int)"""
+            elif db_server == 'sqlite':
+                self.query['createAutoratesTable'] = """CREATE TABLE Autorates (
+                                id INTEGER PRIMARY KEY,
+                                playerId INT,
+                                gametypeId INT,
+                                description TEXT,
+                                shortDesc TEXT,
+                                ratingTime REAL,
+                                handCount int)"""
+
+
+            ################################
+            # Create Hands
+            ################################
+
+            if db_server == 'mysql':
+                self.query['createHandsTable'] = """CREATE TABLE Hands (
+                                id BIGINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
+                                tableName VARCHAR(20) NOT NULL,
+                                siteHandNo BIGINT NOT NULL,
+                                gametypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
+                                handStart DATETIME NOT NULL,
+                                importTime DATETIME NOT NULL,
+                                seats TINYINT NOT NULL,
+                                maxSeats TINYINT NOT NULL,
+                                boardcard1 smallint,  /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */
+                                boardcard2 smallint,
+                                boardcard3 smallint,
+                                boardcard4 smallint,
+                                boardcard5 smallint,
+                                texture smallint,
+                                playersVpi SMALLINT NOT NULL,         /* num of players vpi */
+                                playersAtStreet1 SMALLINT NOT NULL,   /* num of players seeing flop/street4 */
+                                playersAtStreet2 SMALLINT NOT NULL,
+                                playersAtStreet3 SMALLINT NOT NULL,
+                                playersAtStreet4 SMALLINT NOT NULL,
+                                playersAtShowdown SMALLINT NOT NULL,
+                                street0Raises TINYINT NOT NULL, /* num small bets paid to see flop/street4, including blind */
+                                street1Raises TINYINT NOT NULL, /* num small bets paid to see turn/street5 */
+                                street2Raises TINYINT NOT NULL, /* num big bets paid to see river/street6 */
+                                street3Raises TINYINT NOT NULL, /* num big bets paid to see sd/street7 */
+                                street4Raises TINYINT NOT NULL, /* num big bets paid to see showdown */
+                                street1Pot INT,                  /* pot size at flop/street4 */
+                                street2Pot INT,                  /* pot size at turn/street5 */
+                                street3Pot INT,                  /* pot size at river/street6 */
+                                street4Pot INT,                  /* pot size at sd/street7 */
+                                showdownPot INT,                 /* pot size at sd/street7 */
+                                comment TEXT,
+                                commentTs DATETIME)
+                            ENGINE=INNODB"""
+            elif db_server == 'postgresql':
+                self.query['createHandsTable'] = """CREATE TABLE Hands (
+                                id BIGSERIAL, PRIMARY KEY (id),
+                                tableName VARCHAR(20) NOT NULL,
+                                siteHandNo BIGINT NOT NULL,
+                                gametypeId INT NOT NULL, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
+                                handStart timestamp without time zone NOT NULL,
+                                importTime timestamp without time zone NOT NULL,
+                                seats SMALLINT NOT NULL,
+                                maxSeats SMALLINT NOT NULL,
+                                boardcard1 smallint,  /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */
+                                boardcard2 smallint,
+                                boardcard3 smallint,
+                                boardcard4 smallint,
+                                boardcard5 smallint,
+                                texture smallint,
+                                playersVpi SMALLINT NOT NULL,         /* num of players vpi */
+                                playersAtStreet1 SMALLINT NOT NULL,   /* num of players seeing flop/street4 */
+                                playersAtStreet2 SMALLINT NOT NULL,
+                                playersAtStreet3 SMALLINT NOT NULL,
+                                playersAtStreet4 SMALLINT NOT NULL,
+                                playersAtShowdown SMALLINT NOT NULL,
+                                street0Raises SMALLINT NOT NULL, /* num small bets paid to see flop/street4, including blind */
+                                street1Raises SMALLINT NOT NULL, /* num small bets paid to see turn/street5 */
+                                street2Raises SMALLINT NOT NULL, /* num big bets paid to see river/street6 */
+                                street3Raises SMALLINT NOT NULL, /* num big bets paid to see sd/street7 */
+                                street4Raises SMALLINT NOT NULL, /* num big bets paid to see showdown */
+                                street1Pot INT,                 /* pot size at flop/street4 */
+                                street2Pot INT,                 /* pot size at turn/street5 */
+                                street3Pot INT,                 /* pot size at river/street6 */
+                                street4Pot INT,                 /* pot size at sd/street7 */
+                                showdownPot INT,                /* pot size at sd/street7 */
+                                comment TEXT,
+                                commentTs timestamp without time zone)"""
+            elif db_server == 'sqlite':
+                self.query['createHandsTable'] = """CREATE TABLE Hands (
+                                id INTEGER PRIMARY KEY,
+                                tableName TEXT(20) NOT NULL,
+                                siteHandNo INT NOT NULL,
+                                gametypeId INT NOT NULL,
+                                handStart REAL NOT NULL,
+                                importTime REAL NOT NULL,
+                                seats INT NOT NULL,
+                                maxSeats INT NOT NULL,
+                                boardcard1 INT,  /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */
+                                boardcard2 INT,
+                                boardcard3 INT,
+                                boardcard4 INT,
+                                boardcard5 INT,
+                                texture INT,
+                                playersVpi INT NOT NULL,         /* num of players vpi */
+                                playersAtStreet1 INT NOT NULL,   /* num of players seeing flop/street4 */
+                                playersAtStreet2 INT NOT NULL,
+                                playersAtStreet3 INT NOT NULL,
+                                playersAtStreet4 INT NOT NULL,
+                                playersAtShowdown INT NOT NULL,
+                                street0Raises INT NOT NULL, /* num small bets paid to see flop/street4, including blind */
+                                street1Raises INT NOT NULL, /* num small bets paid to see turn/street5 */
+                                street2Raises INT NOT NULL, /* num big bets paid to see river/street6 */
+                                street3Raises INT NOT NULL, /* num big bets paid to see sd/street7 */
+                                street4Raises INT NOT NULL, /* num big bets paid to see showdown */
+                                street1Pot INT,                 /* pot size at flop/street4 */
+                                street2Pot INT,                 /* pot size at turn/street5 */
+                                street3Pot INT,                 /* pot size at river/street6 */
+                                street4Pot INT,                 /* pot size at sd/street7 */
+                                showdownPot INT,                /* pot size at sd/street7 */
+                                comment TEXT,
+                                commentTs REAL)"""
+
+
+            ################################
+            # Create TourneyTypes
+            ################################
+
+            if db_server == 'mysql':
+                self.query['createTourneyTypesTable'] = """CREATE TABLE TourneyTypes (
+                                id SMALLINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
+                                siteId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (siteId) REFERENCES Sites(id),
+                                buyin INT NOT NULL,
+                                fee INT NOT NULL,
+                                knockout INT NOT NULL,
+                                rebuyOrAddon BOOLEAN NOT NULL)
+                            ENGINE=INNODB"""
+            elif db_server == 'postgresql':
+                self.query['createTourneyTypesTable'] = """CREATE TABLE TourneyTypes (
+                            id SERIAL, PRIMARY KEY (id),
+                            siteId INT NOT NULL, FOREIGN KEY (siteId) REFERENCES Sites(id),
+                            buyin INT NOT NULL,
+                            fee INT NOT NULL,
+                            knockout INT NOT NULL,
+                            rebuyOrAddon BOOLEAN NOT NULL)"""
+            elif db_server == 'sqlite':
+                self.query['createTourneyTypesTable'] = """CREATE TABLE TourneyTypes (
+                            id INTEGER PRIMARY KEY,
+                            siteId INT NOT NULL,
+                            buyin INT NOT NULL,
+                            fee INT NOT NULL,
+                            knockout INT NOT NULL,
+                            rebuyOrAddon BOOLEAN NOT NULL)"""
+
+            ################################
+            # Create Tourneys
+            ################################
+
+            if db_server == 'mysql':
+                self.query['createTourneysTable'] = """CREATE TABLE Tourneys (
+                            id INT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
+                            tourneyTypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
+                            siteTourneyNo BIGINT NOT NULL,
+                            entries INT NOT NULL,
+                            prizepool INT NOT NULL,
+                            startTime DATETIME NOT NULL,
+                            comment TEXT,
+                            commentTs DATETIME)
+                            ENGINE=INNODB"""
+            elif db_server == 'postgresql':
+                self.query['createTourneysTable'] = """CREATE TABLE Tourneys (
+                            id SERIAL, PRIMARY KEY (id),
+                            tourneyTypeId INT, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
+                            siteTourneyNo BIGINT,
+                            entries INT,
+                            prizepool INT,
+                            startTime timestamp without time zone,
+                            comment TEXT,
+                            commentTs timestamp without time zone)"""
+            elif db_server == 'sqlite':
+                self.query['createTourneysTable'] = """CREATE TABLE Tourneys (
+                            id INTEGER PRIMARY KEY,
+                            tourneyTypeId INT,
+                            siteTourneyNo INT,
+                            entries INT,
+                            prizepool INT,
+                            startTime REAL,
+                            comment TEXT,
+                            commentTs REAL)"""
+            ################################
+            # Create HandsPlayers
+            ################################
+
+            if db_server == 'mysql':
+                self.query['createHandsPlayersTable'] = """CREATE TABLE HandsPlayers (
+                            id BIGINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
+                            handId BIGINT UNSIGNED NOT NULL, FOREIGN KEY (handId) REFERENCES Hands(id),
+                            playerId INT UNSIGNED NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
+                            startCash INT NOT NULL,
+                            position CHAR(1),
+                            seatNo SMALLINT NOT NULL,
+                        
+                            card1 smallint NOT NULL,  /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */
+                            card2 smallint NOT NULL,
+                            card3 smallint,
+                            card4 smallint,
+                            card5 smallint,
+                            card6 smallint,
+                            card7 smallint,
+                            startCards smallint,
+                        
+                            ante INT,
+                            winnings int NOT NULL,
+                            rake int NOT NULL,
+                            totalProfit INT,
+                            comment text,
+                            commentTs DATETIME,
+                            tourneysPlayersId BIGINT UNSIGNED,
+                            tourneyTypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
+
+                            wonWhenSeenStreet1 FLOAT,
+                            wonWhenSeenStreet2 FLOAT,
+                            wonWhenSeenStreet3 FLOAT,
+                            wonWhenSeenStreet4 FLOAT,
+                            wonAtSD FLOAT,
+
+                            street0VPI BOOLEAN,
+                            street0Aggr BOOLEAN,
+                            street0_3BChance BOOLEAN,
+                            street0_3BDone BOOLEAN,
+                            street0_4BChance BOOLEAN,
+                            street0_4BDone BOOLEAN,
+                            other3BStreet0 BOOLEAN,
+                            other4BStreet0 BOOLEAN,
+
+                            street1Seen BOOLEAN,
+                            street2Seen BOOLEAN,
+                            street3Seen BOOLEAN,
+                            street4Seen BOOLEAN,
+                            sawShowdown BOOLEAN,
+
+                            street1Aggr BOOLEAN,
+                            street2Aggr BOOLEAN,
+                            street3Aggr BOOLEAN,
+                            street4Aggr BOOLEAN,
+
+                            otherRaisedStreet0 BOOLEAN,
+                            otherRaisedStreet1 BOOLEAN,
+                            otherRaisedStreet2 BOOLEAN,
+                            otherRaisedStreet3 BOOLEAN,
+                            otherRaisedStreet4 BOOLEAN,
+                            foldToOtherRaisedStreet0 BOOLEAN,
+                            foldToOtherRaisedStreet1 BOOLEAN,
+                            foldToOtherRaisedStreet2 BOOLEAN,
+                            foldToOtherRaisedStreet3 BOOLEAN,
+                            foldToOtherRaisedStreet4 BOOLEAN,
+
+                            stealAttemptChance BOOLEAN,
+                            stealAttempted BOOLEAN,
+                            foldBbToStealChance BOOLEAN,
+                            foldedBbToSteal BOOLEAN,
+                            foldSbToStealChance BOOLEAN,
+                            foldedSbToSteal BOOLEAN,
+
+                            street1CBChance BOOLEAN,
+                            street1CBDone BOOLEAN,
+                            street2CBChance BOOLEAN,
+                            street2CBDone BOOLEAN,
+                            street3CBChance BOOLEAN,
+                            street3CBDone BOOLEAN,
+                            street4CBChance BOOLEAN,
+                            street4CBDone BOOLEAN,
+
+                            foldToStreet1CBChance BOOLEAN,
+                            foldToStreet1CBDone BOOLEAN,
+                            foldToStreet2CBChance BOOLEAN,
+                            foldToStreet2CBDone BOOLEAN,
+                            foldToStreet3CBChance BOOLEAN,
+                            foldToStreet3CBDone BOOLEAN,
+                            foldToStreet4CBChance BOOLEAN,
+                            foldToStreet4CBDone BOOLEAN,
+
+                            street1CheckCallRaiseChance BOOLEAN,
+                            street1CheckCallRaiseDone BOOLEAN,
+                            street2CheckCallRaiseChance BOOLEAN,
+                            street2CheckCallRaiseDone BOOLEAN,
+                            street3CheckCallRaiseChance BOOLEAN,
+                            street3CheckCallRaiseDone BOOLEAN,
+                            street4CheckCallRaiseChance BOOLEAN,
+                            street4CheckCallRaiseDone BOOLEAN,
+
+                            street0Calls TINYINT,
+                            street1Calls TINYINT,
+                            street2Calls TINYINT,
+                            street3Calls TINYINT,
+                            street4Calls TINYINT,
+                            street0Bets TINYINT,
+                            street1Bets TINYINT,
+                            street2Bets TINYINT,
+                            street3Bets TINYINT,
+                            street4Bets TINYINT,
+                            street0Raises TINYINT,
+                            street1Raises TINYINT,
+                            street2Raises TINYINT,
+                            street3Raises TINYINT,
+                            street4Raises TINYINT,
+
+                            actionString VARCHAR(15),
+
+                            FOREIGN KEY (tourneysPlayersId) REFERENCES TourneysPlayers(id))
+                            ENGINE=INNODB"""
+            elif db_server == 'postgresql':
+                self.query['createHandsPlayersTable'] = """CREATE TABLE HandsPlayers (
+                            id BIGSERIAL, PRIMARY KEY (id),
+                            handId BIGINT NOT NULL, FOREIGN KEY (handId) REFERENCES Hands(id),
+                            playerId INT NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
+                            startCash INT NOT NULL,
+                            position CHAR(1),
+                            seatNo SMALLINT NOT NULL,
+
+                            card1 smallint NOT NULL,  /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */
+                            card2 smallint NOT NULL,
+                            card3 smallint,
+                            card4 smallint,
+                            card5 smallint,
+                            card6 smallint,
+                            card7 smallint,
+                            startCards smallint,
+
+                            ante INT,
+                            winnings int NOT NULL,
+                            rake int NOT NULL,
+                            totalProfit INT,
+                            comment text,
+                            commentTs timestamp without time zone,
+                            tourneysPlayersId BIGINT,
+                            tourneyTypeId INT NOT NULL, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
+
+                            wonWhenSeenStreet1 FLOAT,
+                            wonWhenSeenStreet2 FLOAT,
+                            wonWhenSeenStreet3 FLOAT,
+                            wonWhenSeenStreet4 FLOAT,
+                            wonAtSD FLOAT,
+
+                            street0VPI BOOLEAN,
+                            street0Aggr BOOLEAN,
+                            street0_3BChance BOOLEAN,
+                            street0_3BDone BOOLEAN,
+                            street0_4BChance BOOLEAN,
+                            street0_4BDone BOOLEAN,
+                            other3BStreet0 BOOLEAN,
+                            other4BStreet0 BOOLEAN,
+
+                            street1Seen BOOLEAN,
+                            street2Seen BOOLEAN,
+                            street3Seen BOOLEAN,
+                            street4Seen BOOLEAN,
+                            sawShowdown BOOLEAN,
+
+                            street1Aggr BOOLEAN,
+                            street2Aggr BOOLEAN,
+                            street3Aggr BOOLEAN,
+                            street4Aggr BOOLEAN,
+
+                            otherRaisedStreet0 BOOLEAN,
+                            otherRaisedStreet1 BOOLEAN,
+                            otherRaisedStreet2 BOOLEAN,
+                            otherRaisedStreet3 BOOLEAN,
+                            otherRaisedStreet4 BOOLEAN,
+                            foldToOtherRaisedStreet0 BOOLEAN,
+                            foldToOtherRaisedStreet1 BOOLEAN,
+                            foldToOtherRaisedStreet2 BOOLEAN,
+                            foldToOtherRaisedStreet3 BOOLEAN,
+                            foldToOtherRaisedStreet4 BOOLEAN,
+
+                            stealAttemptChance BOOLEAN,
+                            stealAttempted BOOLEAN,
+                            foldBbToStealChance BOOLEAN,
+                            foldedBbToSteal BOOLEAN,
+                            foldSbToStealChance BOOLEAN,
+                            foldedSbToSteal BOOLEAN,
+
+                            street1CBChance BOOLEAN,
+                            street1CBDone BOOLEAN,
+                            street2CBChance BOOLEAN,
+                            street2CBDone BOOLEAN,
+                            street3CBChance BOOLEAN,
+                            street3CBDone BOOLEAN,
+                            street4CBChance BOOLEAN,
+                            street4CBDone BOOLEAN,
+
+                            foldToStreet1CBChance BOOLEAN,
+                            foldToStreet1CBDone BOOLEAN,
+                            foldToStreet2CBChance BOOLEAN,
+                            foldToStreet2CBDone BOOLEAN,
+                            foldToStreet3CBChance BOOLEAN,
+                            foldToStreet3CBDone BOOLEAN,
+                            foldToStreet4CBChance BOOLEAN,
+                            foldToStreet4CBDone BOOLEAN,
+
+                            street1CheckCallRaiseChance BOOLEAN,
+                            street1CheckCallRaiseDone BOOLEAN,
+                            street2CheckCallRaiseChance BOOLEAN,
+                            street2CheckCallRaiseDone BOOLEAN,
+                            street3CheckCallRaiseChance BOOLEAN,
+                            street3CheckCallRaiseDone BOOLEAN,
+                            street4CheckCallRaiseChance BOOLEAN,
+                            street4CheckCallRaiseDone BOOLEAN,
+
+                            street0Calls SMALLINT,
+                            street1Calls SMALLINT,
+                            street2Calls SMALLINT,
+                            street3Calls SMALLINT,
+                            street4Calls SMALLINT,
+                            street0Bets SMALLINT,
+                            street1Bets SMALLINT,
+                            street2Bets SMALLINT,
+                            street3Bets SMALLINT,
+                            street4Bets SMALLINT,
+                            street0Raises SMALLINT,
+                            street1Raises SMALLINT,
+                            street2Raises SMALLINT,
+                            street3Raises SMALLINT,
+                            street4Raises SMALLINT,
+
+                            actionString VARCHAR(15),
+
+                            FOREIGN KEY (tourneysPlayersId) REFERENCES TourneysPlayers(id))"""
+            elif db_server == 'sqlite':
+                self.query['createHandsPlayersTable'] = """CREATE TABLE HandsPlayers (
+                            id INTEGER PRIMARY KEY,
+                            handId INT NOT NULL,
+                            playerId INT NOT NULL,
+                            startCash INT NOT NULL,
+                            position TEXT,
+                            seatNo INT NOT NULL,
+                        
+                            card1 INT NOT NULL,  /* 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As */
+                            card2 INT NOT NULL,
+                            card3 INT,
+                            card4 INT,
+                            card5 INT,
+                            card6 INT,
+                            card7 INT,
+                            startCards INT,
+                        
+                            ante INT,
+                            winnings INT NOT NULL,
+                            rake INT NOT NULL,
+                            totalProfit INT,
+                            comment TEXT,
+                            commentTs REAL,
+                            tourneysPlayersId INT,
+                            tourneyTypeId INT NOT NULL,
+
+                            wonWhenSeenStreet1 REAL,
+                            wonWhenSeenStreet2 REAL,
+                            wonWhenSeenStreet3 REAL,
+                            wonWhenSeenStreet4 REAL,
+                            wonAtSD REAL,
+
+                            street0VPI INT,
+                            street0Aggr INT,
+                            street0_3BChance INT,
+                            street0_3BDone INT,
+                            street0_4BChance INT,
+                            street0_4BDone INT,
+                            other3BStreet0 INT,
+                            other4BStreet0 INT,
+
+                            street1Seen INT,
+                            street2Seen INT,
+                            street3Seen INT,
+                            street4Seen INT,
+                            sawShowdown INT,
+
+                            street1Aggr INT,
+                            street2Aggr INT,
+                            street3Aggr INT,
+                            street4Aggr INT,
+
+                            otherRaisedStreet0 INT,
+                            otherRaisedStreet1 INT,
+                            otherRaisedStreet2 INT,
+                            otherRaisedStreet3 INT,
+                            otherRaisedStreet4 INT,
+                            foldToOtherRaisedStreet0 INT,
+                            foldToOtherRaisedStreet1 INT,
+                            foldToOtherRaisedStreet2 INT,
+                            foldToOtherRaisedStreet3 INT,
+                            foldToOtherRaisedStreet4 INT,
+
+                            stealAttemptChance INT,
+                            stealAttempted INT,
+                            foldBbToStealChance INT,
+                            foldedBbToSteal INT,
+                            foldSbToStealChance INT,
+                            foldedSbToSteal INT,
+
+                            street1CBChance INT,
+                            street1CBDone INT,
+                            street2CBChance INT,
+                            street2CBDone INT,
+                            street3CBChance INT,
+                            street3CBDone INT,
+                            street4CBChance INT,
+                            street4CBDone INT,
+
+                            foldToStreet1CBChance INT,
+                            foldToStreet1CBDone INT,
+                            foldToStreet2CBChance INT,
+                            foldToStreet2CBDone INT,
+                            foldToStreet3CBChance INT,
+                            foldToStreet3CBDone INT,
+                            foldToStreet4CBChance INT,
+                            foldToStreet4CBDone INT,
+
+                            street1CheckCallRaiseChance INT,
+                            street1CheckCallRaiseDone INT,
+                            street2CheckCallRaiseChance INT,
+                            street2CheckCallRaiseDone INT,
+                            street3CheckCallRaiseChance INT,
+                            street3CheckCallRaiseDone INT,
+                            street4CheckCallRaiseChance INT,
+                            street4CheckCallRaiseDone INT,
+
+                            street0Calls INT,
+                            street1Calls INT,
+                            street2Calls INT,
+                            street3Calls INT,
+                            street4Calls INT,
+                            street0Bets INT,
+                            street1Bets INT,
+                            street2Bets INT,
+                            street3Bets INT,
+                            street4Bets INT,
+                            street0Raises INT,
+                            street1Raises INT,
+                            street2Raises INT,
+                            street3Raises INT,
+                            street4Raises INT,
+
+                            actionString REAL)
+                            """
+
+
+            ################################
+            # Create TourneysPlayers
+            ################################
+
+            if db_server == 'mysql':
+                self.query['createTourneysPlayersTable'] = """CREATE TABLE TourneysPlayers (
+                            id BIGINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
+                            tourneyId INT UNSIGNED NOT NULL, FOREIGN KEY (tourneyId) REFERENCES Tourneys(id),
+                            playerId INT UNSIGNED NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
+                            payinAmount INT NOT NULL,
+                            rank INT NOT NULL,
+                            winnings INT NOT NULL,
+                            comment TEXT,
+                            commentTs DATETIME)
+                            ENGINE=INNODB"""
+            elif db_server == 'postgresql':
+                self.query['createTourneysPlayersTable'] = """CREATE TABLE TourneysPlayers (
+                            id BIGSERIAL, PRIMARY KEY (id),
+                            tourneyId INT, FOREIGN KEY (tourneyId) REFERENCES Tourneys(id),
+                            playerId INT, FOREIGN KEY (playerId) REFERENCES Players(id),
+                            payinAmount INT,
+                            rank INT,
+                            winnings INT,
+                            comment TEXT,
+                            commentTs timestamp without time zone)"""
+            elif db_server == 'sqlite':
+                self.query['createTourneysPlayersTable'] = """ """
+
+
+            ################################
+            # Create HandsActions
+            ################################
+
+            if db_server == 'mysql':
+                self.query['createHandsActionsTable'] = """CREATE TABLE HandsActions (
+                            id BIGINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
+                            handsPlayerId BIGINT UNSIGNED NOT NULL, FOREIGN KEY (handsPlayerId) REFERENCES HandsPlayers(id),
+                            street SMALLINT NOT NULL,
+                            actionNo SMALLINT NOT NULL,
+                            action CHAR(5) NOT NULL,
+                            allIn BOOLEAN NOT NULL,
+                            amount INT NOT NULL,
+                            comment TEXT,
+                            commentTs DATETIME)
+                            ENGINE=INNODB"""
+            elif db_server == 'postgresql':
+                self.query['createHandsActionsTable'] = """CREATE TABLE HandsActions (
+                            id BIGSERIAL, PRIMARY KEY (id),
+                            handsPlayerId BIGINT, FOREIGN KEY (handsPlayerId) REFERENCES HandsPlayers(id),
+                            street SMALLINT,
+                            actionNo SMALLINT,
+                            action CHAR(5),
+                            allIn BOOLEAN,
+                            amount INT,
+                            comment TEXT,
+                            commentTs timestamp without time zone)"""
+            elif db_server == 'sqlite':
+                self.query['createHandsActionsTable'] = """ """
+
+
+            ################################
+            # Create HudCache
+            ################################
+
+            if db_server == 'mysql':
+                self.query['createHudCacheTable'] = """CREATE TABLE HudCache (
+                            id BIGINT UNSIGNED AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
+                            gametypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
+                            playerId INT UNSIGNED NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
+                            activeSeats SMALLINT NOT NULL,
+                            position CHAR(1),
+                            tourneyTypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
+                            styleKey CHAR(7) NOT NULL,  /* 1st char is style (A/T/H/S), other 6 are the key */
+                            HDs INT NOT NULL,
+
+                            wonWhenSeenStreet1 FLOAT,
+                            wonWhenSeenStreet2 FLOAT,
+                            wonWhenSeenStreet3 FLOAT,
+                            wonWhenSeenStreet4 FLOAT,
+                            wonAtSD FLOAT,
+
+                            street0VPI INT,
+                            street0Aggr INT,
+                            street0_3BChance INT,
+                            street0_3BDone INT,
+                            street0_4BChance INT,
+                            street0_4BDone INT,
+                            other3BStreet0 INT,
+                            other4BStreet0 INT,
+
+                            street1Seen INT,
+                            street2Seen INT,
+                            street3Seen INT,
+                            street4Seen INT,
+                            sawShowdown INT,
+                            
+                            street1Aggr INT,
+                            street2Aggr INT,
+                            street3Aggr INT,
+                            street4Aggr INT,
+
+                            otherRaisedStreet0 INT,
+                            otherRaisedStreet1 INT,
+                            otherRaisedStreet2 INT,
+                            otherRaisedStreet3 INT,
+                            otherRaisedStreet4 INT,
+                            foldToOtherRaisedStreet0 INT,
+                            foldToOtherRaisedStreet1 INT,
+                            foldToOtherRaisedStreet2 INT,
+                            foldToOtherRaisedStreet3 INT,
+                            foldToOtherRaisedStreet4 INT,
+                            
+                            stealAttemptChance INT,
+                            stealAttempted INT,
+                            foldBbToStealChance INT,
+                            foldedBbToSteal INT,
+                            foldSbToStealChance INT,
+                            foldedSbToSteal INT,
+
+                            street1CBChance INT,
+                            street1CBDone INT,
+                            street2CBChance INT,
+                            street2CBDone INT,
+                            street3CBChance INT,
+                            street3CBDone INT,
+                            street4CBChance INT,
+                            street4CBDone INT,
+                            
+                            foldToStreet1CBChance INT,
+                            foldToStreet1CBDone INT,
+                            foldToStreet2CBChance INT,
+                            foldToStreet2CBDone INT,
+                            foldToStreet3CBChance INT,
+                            foldToStreet3CBDone INT,
+                            foldToStreet4CBChance INT,
+                            foldToStreet4CBDone INT,
+                            
+                            totalProfit INT,
+                            
+                            street1CheckCallRaiseChance INT,
+                            street1CheckCallRaiseDone INT,
+                            street2CheckCallRaiseChance INT,
+                            street2CheckCallRaiseDone INT,
+                            street3CheckCallRaiseChance INT,
+                            street3CheckCallRaiseDone INT,
+                            street4CheckCallRaiseChance INT,
+                            street4CheckCallRaiseDone INT,
+
+                            street0Calls INT,
+                            street1Calls INT,
+                            street2Calls INT,
+                            street3Calls INT,
+                            street4Calls INT,
+                            street0Bets INT,
+                            street1Bets INT,
+                            street2Bets INT,
+                            street3Bets INT,
+                            street4Bets INT,
+                            street0Raises INT,
+                            street1Raises INT,
+                            street2Raises INT,
+                            street3Raises INT,
+                            street4Raises INT)
+
+                            ENGINE=INNODB"""
+            elif db_server == 'postgresql':
+                self.query['createHudCacheTable'] = """CREATE TABLE HudCache (
+                            id BIGSERIAL, PRIMARY KEY (id),
+                            gametypeId INT, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
+                            playerId INT, FOREIGN KEY (playerId) REFERENCES Players(id),
+                            activeSeats SMALLINT,
+                            position CHAR(1),
+                            tourneyTypeId INT, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
+                            styleKey CHAR(7) NOT NULL,  /* 1st char is style (A/T/H/S), other 6 are the key */
+                            HDs INT,
+
+                            wonWhenSeenStreet1 FLOAT,
+                            wonWhenSeenStreet2 FLOAT,
+                            wonWhenSeenStreet3 FLOAT,
+                            wonWhenSeenStreet4 FLOAT,
+                            wonAtSD FLOAT,
+
+                            street0VPI INT,
+                            street0Aggr INT,
+                            street0_3BChance INT,
+                            street0_3BDone INT,
+                            street0_4BChance INT,
+                            street0_4BDone INT,
+                            other3BStreet0 INT,
+                            other4BStreet0 INT,
+
+                            street1Seen INT,
+                            street2Seen INT,
+                            street3Seen INT,
+                            street4Seen INT,
+                            sawShowdown INT,
+                            street1Aggr INT,
+                            street2Aggr INT,
+                            street3Aggr INT,
+                            street4Aggr INT,
+
+                            otherRaisedStreet0 INT,
+                            otherRaisedStreet1 INT,
+                            otherRaisedStreet2 INT,
+                            otherRaisedStreet3 INT,
+                            otherRaisedStreet4 INT,
+                            foldToOtherRaisedStreet0 INT,
+                            foldToOtherRaisedStreet1 INT,
+                            foldToOtherRaisedStreet2 INT,
+                            foldToOtherRaisedStreet3 INT,
+                            foldToOtherRaisedStreet4 INT,
+
+                            stealAttemptChance INT,
+                            stealAttempted INT,
+                            foldBbToStealChance INT,
+                            foldedBbToSteal INT,
+                            foldSbToStealChance INT,
+                            foldedSbToSteal INT,
+
+                            street1CBChance INT,
+                            street1CBDone INT,
+                            street2CBChance INT,
+                            street2CBDone INT,
+                            street3CBChance INT,
+                            street3CBDone INT,
+                            street4CBChance INT,
+                            street4CBDone INT,
+
+                            foldToStreet1CBChance INT,
+                            foldToStreet1CBDone INT,
+                            foldToStreet2CBChance INT,
+                            foldToStreet2CBDone INT,
+                            foldToStreet3CBChance INT,
+                            foldToStreet3CBDone INT,
+                            foldToStreet4CBChance INT,
+                            foldToStreet4CBDone INT,
+
+                            totalProfit INT,
+
+                            street1CheckCallRaiseChance INT,
+                            street1CheckCallRaiseDone INT,
+                            street2CheckCallRaiseChance INT,
+                            street2CheckCallRaiseDone INT,
+                            street3CheckCallRaiseChance INT,
+                            street3CheckCallRaiseDone INT,
+                            street4CheckCallRaiseChance INT,
+                            street4CheckCallRaiseDone INT,
+
+                            street0Calls INT,
+                            street1Calls INT,
+                            street2Calls INT,
+                            street3Calls INT,
+                            street4Calls INT,
+                            street0Bets INT,
+                            street1Bets INT,
+                            street2Bets INT,
+                            street3Bets INT,
+                            street4Bets INT,
+                            street0Raises INT,
+                            street1Raises INT,
+                            street2Raises INT,
+                            street3Raises INT,
+                            street4Raises INT)
+                            """
+            elif db_server == 'sqlite':
+                self.query['createHudCacheTable'] = """CREATE TABLE HudCache (
+                            id INTEGER PRIMARY KEY,
+                            gametypeId INT,
+                            playerId INT,
+                            activeSeats INT,
+                            position TEXT,
+                            tourneyTypeId INT,
+                            styleKey TEXT NOT NULL,  /* 1st char is style (A/T/H/S), other 6 are the key */
+                            HDs INT,
+
+                            wonWhenSeenStreet1 REAL,
+                            wonWhenSeenStreet2 REAL,
+                            wonWhenSeenStreet3 REAL,
+                            wonWhenSeenStreet4 REAL,
+                            wonAtSD REAL,
+
+                            street0VPI INT,
+                            street0Aggr INT,
+                            street0_3BChance INT,
+                            street0_3BDone INT,
+                            street0_4BChance INT,
+                            street0_4BDone INT,
+                            other3BStreet0 INT,
+                            other4BStreet0 INT,
+
+                            street1Seen INT,
+                            street2Seen INT,
+                            street3Seen INT,
+                            street4Seen INT,
+                            sawShowdown INT,
+                            street1Aggr INT,
+                            street2Aggr INT,
+                            street3Aggr INT,
+                            street4Aggr INT,
+
+                            otherRaisedStreet0 INT,
+                            otherRaisedStreet1 INT,
+                            otherRaisedStreet2 INT,
+                            otherRaisedStreet3 INT,
+                            otherRaisedStreet4 INT,
+                            foldToOtherRaisedStreet0 INT,
+                            foldToOtherRaisedStreet1 INT,
+                            foldToOtherRaisedStreet2 INT,
+                            foldToOtherRaisedStreet3 INT,
+                            foldToOtherRaisedStreet4 INT,
+
+                            stealAttemptChance INT,
+                            stealAttempted INT,
+                            foldBbToStealChance INT,
+                            foldedBbToSteal INT,
+                            foldSbToStealChance INT,
+                            foldedSbToSteal INT,
+
+                            street1CBChance INT,
+                            street1CBDone INT,
+                            street2CBChance INT,
+                            street2CBDone INT,
+                            street3CBChance INT,
+                            street3CBDone INT,
+                            street4CBChance INT,
+                            street4CBDone INT,
+
+                            foldToStreet1CBChance INT,
+                            foldToStreet1CBDone INT,
+                            foldToStreet2CBChance INT,
+                            foldToStreet2CBDone INT,
+                            foldToStreet3CBChance INT,
+                            foldToStreet3CBDone INT,
+                            foldToStreet4CBChance INT,
+                            foldToStreet4CBDone INT,
+
+                            totalProfit INT,
+
+                            street1CheckCallRaiseChance INT,
+                            street1CheckCallRaiseDone INT,
+                            street2CheckCallRaiseChance INT,
+                            street2CheckCallRaiseDone INT,
+                            street3CheckCallRaiseChance INT,
+                            street3CheckCallRaiseDone INT,
+                            street4CheckCallRaiseChance INT,
+                            street4CheckCallRaiseDone INT,
+
+                            street0Calls INT,
+                            street1Calls INT,
+                            street2Calls INT,
+                            street3Calls INT,
+                            street4Calls INT,
+                            street0Bets INT,
+                            street1Bets INT,
+                            street2Bets INT,
+                            street3Bets INT,
+                            street4Bets INT,
+                            street0Raises INT,
+                            street1Raises INT,
+                            street2Raises INT,
+                            street3Raises INT,
+                            street4Raises INT)
+                            """
+
+
+            if db_server == 'mysql':
+                self.query['addTourneyIndex'] = """ALTER TABLE Tourneys ADD INDEX siteTourneyNo(siteTourneyNo)"""
+            elif db_server == 'postgresql':
+                self.query['addTourneyIndex'] = """CREATE INDEX siteTourneyNo ON Tourneys (siteTourneyNo)"""
+            elif db_server == 'sqlite':
+                self.query['addHandsIndex'] = """ """
+
+            if db_server == 'mysql':
+                self.query['addHandsIndex'] = """ALTER TABLE Hands ADD INDEX siteHandNo(siteHandNo)"""
+            elif db_server == 'postgresql':
+                self.query['addHandsIndex'] = """CREATE INDEX siteHandNo ON Hands (siteHandNo)"""
+            elif db_server == 'sqlite':
+                self.query['addHandsIndex'] = """ """
+
+            if db_server == 'mysql':
+                self.query['addPlayersIndex'] = """ALTER TABLE Players ADD INDEX name(name)"""
+            elif db_server == 'postgresql':
+                self.query['addPlayersIndex'] = """CREATE INDEX name ON Players (name)"""
+            elif db_server == 'sqlite':
+                self.query['addPlayersIndex'] = """ """
+
+
+            self.query['get_last_hand'] = "select max(id) from Hands"
+
+            self.query['get_player_id'] = """
+                    select Players.id AS player_id 
+                    from Players, Sites
+                    where Players.name = %s
+                    and Sites.name = %s
+                    and Players.SiteId = Sites.id
+                """
+
+            self.query['getSiteId'] = """SELECT id from Sites where name = %s"""
+
+            self.query['get_stats_from_hand'] = """
+                    SELECT hc.playerId                      AS player_id,
+                        hp.seatNo                           AS seat,
+                        p.name                              AS screen_name,
+                        sum(hc.HDs)                         AS n,
+                        sum(hc.street0VPI)                  AS vpip,
+                        sum(hc.street0Aggr)                 AS pfr,
+                        sum(hc.street0_3BChance)            AS TB_opp_0,
+                        sum(hc.street0_3BDone)              AS TB_0,
+                        sum(hc.street1Seen)                 AS saw_f,
+                        sum(hc.street1Seen)                 AS saw_1,
+                        sum(hc.street2Seen)                 AS saw_2,
+                        sum(hc.street3Seen)                 AS saw_3,
+                        sum(hc.street4Seen)                 AS saw_4,
+                        sum(hc.sawShowdown)                 AS sd,
+                        sum(hc.street1Aggr)                 AS aggr_1,
+                        sum(hc.street2Aggr)                 AS aggr_2,
+                        sum(hc.street3Aggr)                 AS aggr_3,
+                        sum(hc.street4Aggr)                 AS aggr_4,
+                        sum(hc.otherRaisedStreet1)          AS was_raised_1,
+                        sum(hc.otherRaisedStreet2)          AS was_raised_2,
+                        sum(hc.otherRaisedStreet3)          AS was_raised_3,
+                        sum(hc.otherRaisedStreet4)          AS was_raised_4,
+                        sum(hc.foldToOtherRaisedStreet1)    AS f_freq_1,
+                        sum(hc.foldToOtherRaisedStreet2)    AS f_freq_2,
+                        sum(hc.foldToOtherRaisedStreet3)    AS f_freq_3,
+                        sum(hc.foldToOtherRaisedStreet4)    AS f_freq_4,
+                        sum(hc.wonWhenSeenStreet1)          AS w_w_s_1,
+                        sum(hc.wonAtSD)                     AS wmsd,
+                        sum(hc.stealAttemptChance)          AS steal_opp,
+                        sum(hc.stealAttempted)              AS steal,
+                        sum(hc.foldSbToStealChance)         AS SBstolen,
+                        sum(hc.foldedSbToSteal)             AS SBnotDef,
+                        sum(hc.foldBbToStealChance)         AS BBstolen,
+                        sum(hc.foldedBbToSteal)             AS BBnotDef,
+                        sum(hc.street1CBChance)             AS CB_opp_1,
+                        sum(hc.street1CBDone)               AS CB_1,
+                        sum(hc.street2CBChance)             AS CB_opp_2,
+                        sum(hc.street2CBDone)               AS CB_2,
+                        sum(hc.street3CBChance)             AS CB_opp_3,
+                        sum(hc.street3CBDone)               AS CB_3,
+                        sum(hc.street4CBChance)             AS CB_opp_4,
+                        sum(hc.street4CBDone)               AS CB_4,
+                        sum(hc.foldToStreet1CBChance)       AS f_cb_opp_1,
+                        sum(hc.foldToStreet1CBDone)         AS f_cb_1,
+                        sum(hc.foldToStreet2CBChance)       AS f_cb_opp_2,
+                        sum(hc.foldToStreet2CBDone)         AS f_cb_2,
+                        sum(hc.foldToStreet3CBChance)       AS f_cb_opp_3,
+                        sum(hc.foldToStreet3CBDone)         AS f_cb_3,
+                        sum(hc.foldToStreet4CBChance)       AS f_cb_opp_4,
+                        sum(hc.foldToStreet4CBDone)         AS f_cb_4,
+                        sum(hc.totalProfit)                 AS net,
+                        sum(hc.street1CheckCallRaiseChance) AS ccr_opp_1,
+                        sum(hc.street1CheckCallRaiseDone)   AS ccr_1,
+                        sum(hc.street2CheckCallRaiseChance) AS ccr_opp_2,
+                        sum(hc.street2CheckCallRaiseDone)   AS ccr_2,
+                        sum(hc.street3CheckCallRaiseChance) AS ccr_opp_3,
+                        sum(hc.street3CheckCallRaiseDone)   AS ccr_3,
+                        sum(hc.street4CheckCallRaiseChance) AS ccr_opp_4,
+                        sum(hc.street4CheckCallRaiseDone)   AS ccr_4
+                    FROM Hands h
+                         INNER JOIN HandsPlayers hp ON (hp.handId = h.id)
+                         INNER JOIN HudCache hc ON (    hc.PlayerId = hp.PlayerId+0
+                                                    AND hc.gametypeId+0 = h.gametypeId+0)
+                         INNER JOIN Players p ON (p.id = hp.PlayerId+0)
+                    WHERE h.id = %s
+                    AND   hc.styleKey > %s
+                          /* styleKey is currently 'd' (for date) followed by a yyyymmdd
+                             date key. Set it to 0000000 or similar to get all records  */
+                    /* also check activeseats here even if only 3 groups eg 2-3/4-6/7+ 
+                       e.g. could use a multiplier:
+                       AND   h.seats > X / 1.25  and  hp.seats < X * 1.25
+                       where X is the number of active players at the current table (and
+                       1.25 would be a config value so user could change it)
+                    */
+                    GROUP BY hc.PlayerId, hp.seatNo, p.name
+                """
+
+#    same as above except stats are aggregated for all blind/limit levels
+            self.query['get_stats_from_hand_aggregated'] = """
+                    SELECT hc.playerId                         AS player_id,
+                           max(case when hc.gametypeId = h.gametypeId
+                                    then hp.seatNo
+                                    else -1
+                               end)                            AS seat,
+                           p.name                              AS screen_name,
+                           sum(hc.HDs)                         AS n,
+                           sum(hc.street0VPI)                  AS vpip,
+                           sum(hc.street0Aggr)                 AS pfr,
+                           sum(hc.street0_3BChance)            AS TB_opp_0,
+                           sum(hc.street0_3BDone)              AS TB_0,
+                           sum(hc.street1Seen)                 AS saw_f,
+                           sum(hc.street1Seen)                 AS saw_1,
+                           sum(hc.street2Seen)                 AS saw_2,
+                           sum(hc.street3Seen)                 AS saw_3,
+                           sum(hc.street4Seen)                 AS saw_4,
+                           sum(hc.sawShowdown)                 AS sd,
+                           sum(hc.street1Aggr)                 AS aggr_1,
+                           sum(hc.street2Aggr)                 AS aggr_2,
+                           sum(hc.street3Aggr)                 AS aggr_3,
+                           sum(hc.street4Aggr)                 AS aggr_4,
+                           sum(hc.otherRaisedStreet1)          AS was_raised_1,
+                           sum(hc.otherRaisedStreet2)          AS was_raised_2,
+                           sum(hc.otherRaisedStreet3)          AS was_raised_3,
+                           sum(hc.otherRaisedStreet4)          AS was_raised_4,
+                           sum(hc.foldToOtherRaisedStreet1)    AS f_freq_1,
+                           sum(hc.foldToOtherRaisedStreet2)    AS f_freq_2,
+                           sum(hc.foldToOtherRaisedStreet3)    AS f_freq_3,
+                           sum(hc.foldToOtherRaisedStreet4)    AS f_freq_4,
+                           sum(hc.wonWhenSeenStreet1)          AS w_w_s_1,
+                           sum(hc.wonAtSD)                     AS wmsd,
+                           sum(hc.stealAttemptChance)          AS steal_opp,
+                           sum(hc.stealAttempted)              AS steal,
+                           sum(hc.foldSbToStealChance)         AS SBstolen,
+                           sum(hc.foldedSbToSteal)             AS SBnotDef,
+                           sum(hc.foldBbToStealChance)         AS BBstolen,
+                           sum(hc.foldedBbToSteal)             AS BBnotDef,
+                           sum(hc.street1CBChance)             AS CB_opp_1,
+                           sum(hc.street1CBDone)               AS CB_1,
+                           sum(hc.street2CBChance)             AS CB_opp_2,
+                           sum(hc.street2CBDone)               AS CB_2,
+                           sum(hc.street3CBChance)             AS CB_opp_3,
+                           sum(hc.street3CBDone)               AS CB_3,
+                           sum(hc.street4CBChance)             AS CB_opp_4,
+                           sum(hc.street4CBDone)               AS CB_4,
+                           sum(hc.foldToStreet1CBChance)       AS f_cb_opp_1,
+                           sum(hc.foldToStreet1CBDone)         AS f_cb_1,
+                           sum(hc.foldToStreet2CBChance)       AS f_cb_opp_2,
+                           sum(hc.foldToStreet2CBDone)         AS f_cb_2,
+                           sum(hc.foldToStreet3CBChance)       AS f_cb_opp_3,
+                           sum(hc.foldToStreet3CBDone)         AS f_cb_3,
+                           sum(hc.foldToStreet4CBChance)       AS f_cb_opp_4,
+                           sum(hc.foldToStreet4CBDone)         AS f_cb_4,
+                           sum(hc.totalProfit)                 AS net,
+                           sum(hc.street1CheckCallRaiseChance) AS ccr_opp_1,
+                           sum(hc.street1CheckCallRaiseDone)   AS ccr_1,
+                           sum(hc.street2CheckCallRaiseChance) AS ccr_opp_2,
+                           sum(hc.street2CheckCallRaiseDone)   AS ccr_2,
+                           sum(hc.street3CheckCallRaiseChance) AS ccr_opp_3,
+                           sum(hc.street3CheckCallRaiseDone)   AS ccr_3,
+                           sum(hc.street4CheckCallRaiseChance) AS ccr_opp_4,
+                           sum(hc.street4CheckCallRaiseDone)   AS ccr_4
+                    FROM Hands h
+                         INNER JOIN HandsPlayers hp ON (hp.handId = h.id)
+                         INNER JOIN HudCache hc     ON (hc.playerId = hp.playerId)
+                         INNER JOIN Players p       ON (p.id = hc.playerId)
+                    WHERE h.id = %s
+                    AND   hc.styleKey > %s
+                          /* styleKey is currently 'd' (for date) followed by a yyyymmdd
+                             date key. Set it to 0000000 or similar to get all records  */
+                    /* Note: s means the placeholder 'percent's but we can't include that
+                       in comments. (db api thinks they are actual arguments)
+                       Could also check activeseats here even if only 3 groups eg 2-3/4-6/7+ 
+                       e.g. could use a multiplier:
+                       AND   h.seats > s / 1.25  and  hp.seats < s * 1.25
+                       where s is the number of active players at the current table (and
+                       1.25 would be a config value so user could change it)
+                    */
+                    AND   hc.gametypeId+0 in
+                          (SELECT gt1.id from Gametypes gt1, Gametypes gt2
+                           WHERE  gt1.siteid = gt2.siteid  /* find gametypes where these match: */
+                           AND    gt1.type = gt2.type               /* ring/tourney */
+                           AND    gt1.category = gt2.category       /* holdem/stud*/
+                           AND    gt1.limittype = gt2.limittype     /* fl/nl */
+                           AND    gt1.bigblind < gt2.bigblind * %s  /* bigblind similar size */
+                           AND    gt1.bigblind > gt2.bigblind / %s
+                           AND    gt2.id = h.gametypeId)
+                    GROUP BY hc.PlayerId, p.name
+                """
+
+            if db_server == 'mysql':
+                self.query['get_stats_from_hand_session'] = """
+                        SELECT hp.playerId                                              AS player_id,
+                               hp.handId                                                AS hand_id,
+                               hp.seatNo                                                AS seat,
+                               p.name                                                   AS screen_name,
+                               h.seats                                                  AS seats,
+                               1                                                        AS n,
+                               cast(hp2.street0VPI as <signed>integer)                  AS vpip,
+                               cast(hp2.street0Aggr as <signed>integer)                 AS pfr,
+                               cast(hp2.street0_3BChance as <signed>integer)            AS TB_opp_0,
+                               cast(hp2.street0_3BDone as <signed>integer)              AS TB_0,
+                               cast(hp2.street1Seen as <signed>integer)                 AS saw_f,
+                               cast(hp2.street1Seen as <signed>integer)                 AS saw_1,
+                               cast(hp2.street2Seen as <signed>integer)                 AS saw_2,
+                               cast(hp2.street3Seen as <signed>integer)                 AS saw_3,
+                               cast(hp2.street4Seen as <signed>integer)                 AS saw_4,
+                               cast(hp2.sawShowdown as <signed>integer)                 AS sd,
+                               cast(hp2.street1Aggr as <signed>integer)                 AS aggr_1,
+                               cast(hp2.street2Aggr as <signed>integer)                 AS aggr_2,
+                               cast(hp2.street3Aggr as <signed>integer)                 AS aggr_3,
+                               cast(hp2.street4Aggr as <signed>integer)                 AS aggr_4,
+                               cast(hp2.otherRaisedStreet1 as <signed>integer)          AS was_raised_1,
+                               cast(hp2.otherRaisedStreet2 as <signed>integer)          AS was_raised_2,
+                               cast(hp2.otherRaisedStreet3 as <signed>integer)          AS was_raised_3,
+                               cast(hp2.otherRaisedStreet4 as <signed>integer)          AS was_raised_4,
+                               cast(hp2.foldToOtherRaisedStreet1 as <signed>integer)    AS f_freq_1,
+                               cast(hp2.foldToOtherRaisedStreet2 as <signed>integer)    AS f_freq_2,
+                               cast(hp2.foldToOtherRaisedStreet3 as <signed>integer)    AS f_freq_3,
+                               cast(hp2.foldToOtherRaisedStreet4 as <signed>integer)    AS f_freq_4,
+                               cast(hp2.wonWhenSeenStreet1 as <signed>integer)          AS w_w_s_1,
+                               cast(hp2.wonAtSD as <signed>integer)                     AS wmsd,
+                               cast(hp2.stealAttemptChance as <signed>integer)          AS steal_opp,
+                               cast(hp2.stealAttempted as <signed>integer)              AS steal,
+                               cast(hp2.foldSbToStealChance as <signed>integer)         AS SBstolen,
+                               cast(hp2.foldedSbToSteal as <signed>integer)             AS SBnotDef,
+                               cast(hp2.foldBbToStealChance as <signed>integer)         AS BBstolen,
+                               cast(hp2.foldedBbToSteal as <signed>integer)             AS BBnotDef,
+                               cast(hp2.street1CBChance as <signed>integer)             AS CB_opp_1,
+                               cast(hp2.street1CBDone as <signed>integer)               AS CB_1,
+                               cast(hp2.street2CBChance as <signed>integer)             AS CB_opp_2,
+                               cast(hp2.street2CBDone as <signed>integer)               AS CB_2,
+                               cast(hp2.street3CBChance as <signed>integer)             AS CB_opp_3,
+                               cast(hp2.street3CBDone as <signed>integer)               AS CB_3,
+                               cast(hp2.street4CBChance as <signed>integer)             AS CB_opp_4,
+                               cast(hp2.street4CBDone as <signed>integer)               AS CB_4,
+                               cast(hp2.foldToStreet1CBChance as <signed>integer)       AS f_cb_opp_1,
+                               cast(hp2.foldToStreet1CBDone as <signed>integer)         AS f_cb_1,
+                               cast(hp2.foldToStreet2CBChance as <signed>integer)       AS f_cb_opp_2,
+                               cast(hp2.foldToStreet2CBDone as <signed>integer)         AS f_cb_2,
+                               cast(hp2.foldToStreet3CBChance as <signed>integer)       AS f_cb_opp_3,
+                               cast(hp2.foldToStreet3CBDone as <signed>integer)         AS f_cb_3,
+                               cast(hp2.foldToStreet4CBChance as <signed>integer)       AS f_cb_opp_4,
+                               cast(hp2.foldToStreet4CBDone as <signed>integer)         AS f_cb_4,
+                               cast(hp2.totalProfit as <signed>integer)                 AS net,
+                               cast(hp2.street1CheckCallRaiseChance as <signed>integer) AS ccr_opp_1,
+                               cast(hp2.street1CheckCallRaiseDone as <signed>integer)   AS ccr_1,
+                               cast(hp2.street2CheckCallRaiseChance as <signed>integer) AS ccr_opp_2,
+                               cast(hp2.street2CheckCallRaiseDone as <signed>integer)   AS ccr_2,
+                               cast(hp2.street3CheckCallRaiseChance as <signed>integer) AS ccr_opp_3,
+                               cast(hp2.street3CheckCallRaiseDone as <signed>integer)   AS ccr_3,
+                               cast(hp2.street4CheckCallRaiseChance as <signed>integer) AS ccr_opp_4,
+                               cast(hp2.street4CheckCallRaiseDone as <signed>integer)   AS ccr_4
+                        FROM
+                             Hands h         /* players in this hand */
+                             INNER JOIN Hands h2         ON (h2.id > %s AND   h2.tableName = h.tableName)
+                             INNER JOIN HandsPlayers hp  ON (h.id = hp.handId)
+                             INNER JOIN HandsPlayers hp2 ON (hp2.playerId+0 = hp.playerId+0 AND (hp2.handId = h2.id+0))  /* other hands by these players */
+                             INNER JOIN Players p        ON (p.id = hp2.PlayerId+0)
+                        WHERE hp.handId = %s
+                        /* check activeseats once this data returned (don't want to do that here as it might
+                           assume a session ended just because the number of seats dipped for a few hands)
+                        */
+                        ORDER BY h.handStart desc, hp2.PlayerId
+                        /* order rows by handstart descending so that we can stop reading rows when
+                           there's a gap over X minutes between hands (ie. when we get back to start of
+                           the session */
+                    """
+            else:  # assume postgresql
+                self.query['get_stats_from_hand_session'] = """
+                        SELECT hp.playerId                                              AS player_id,
+                               hp.handId                                                AS hand_id,
+                               hp.seatNo                                                AS seat,
+                               p.name                                                   AS screen_name,
+                               h.seats                                                  AS seats,
+                               1                                                        AS n,
+                               cast(hp2.street0VPI as <signed>integer)                  AS vpip,
+                               cast(hp2.street0Aggr as <signed>integer)                 AS pfr,
+                               cast(hp2.street0_3BChance as <signed>integer)            AS TB_opp_0,
+                               cast(hp2.street0_3BDone as <signed>integer)              AS TB_0,
+                               cast(hp2.street1Seen as <signed>integer)                 AS saw_f,
+                               cast(hp2.street1Seen as <signed>integer)                 AS saw_1,
+                               cast(hp2.street2Seen as <signed>integer)                 AS saw_2,
+                               cast(hp2.street3Seen as <signed>integer)                 AS saw_3,
+                               cast(hp2.street4Seen as <signed>integer)                 AS saw_4,
+                               cast(hp2.sawShowdown as <signed>integer)                 AS sd,
+                               cast(hp2.street1Aggr as <signed>integer)                 AS aggr_1,
+                               cast(hp2.street2Aggr as <signed>integer)                 AS aggr_2,
+                               cast(hp2.street3Aggr as <signed>integer)                 AS aggr_3,
+                               cast(hp2.street4Aggr as <signed>integer)                 AS aggr_4,
+                               cast(hp2.otherRaisedStreet1 as <signed>integer)          AS was_raised_1,
+                               cast(hp2.otherRaisedStreet2 as <signed>integer)          AS was_raised_2,
+                               cast(hp2.otherRaisedStreet3 as <signed>integer)          AS was_raised_3,
+                               cast(hp2.otherRaisedStreet4 as <signed>integer)          AS was_raised_4,
+                               cast(hp2.foldToOtherRaisedStreet1 as <signed>integer)    AS f_freq_1,
+                               cast(hp2.foldToOtherRaisedStreet2 as <signed>integer)    AS f_freq_2,
+                               cast(hp2.foldToOtherRaisedStreet3 as <signed>integer)    AS f_freq_3,
+                               cast(hp2.foldToOtherRaisedStreet4 as <signed>integer)    AS f_freq_4,
+                               cast(hp2.wonWhenSeenStreet1 as <signed>integer)          AS w_w_s_1,
+                               cast(hp2.wonAtSD as <signed>integer)                     AS wmsd,
+                               cast(hp2.stealAttemptChance as <signed>integer)          AS steal_opp,
+                               cast(hp2.stealAttempted as <signed>integer)              AS steal,
+                               cast(hp2.foldSbToStealChance as <signed>integer)         AS SBstolen,
+                               cast(hp2.foldedSbToSteal as <signed>integer)             AS SBnotDef,
+                               cast(hp2.foldBbToStealChance as <signed>integer)         AS BBstolen,
+                               cast(hp2.foldedBbToSteal as <signed>integer)             AS BBnotDef,
+                               cast(hp2.street1CBChance as <signed>integer)             AS CB_opp_1,
+                               cast(hp2.street1CBDone as <signed>integer)               AS CB_1,
+                               cast(hp2.street2CBChance as <signed>integer)             AS CB_opp_2,
+                               cast(hp2.street2CBDone as <signed>integer)               AS CB_2,
+                               cast(hp2.street3CBChance as <signed>integer)             AS CB_opp_3,
+                               cast(hp2.street3CBDone as <signed>integer)               AS CB_3,
+                               cast(hp2.street4CBChance as <signed>integer)             AS CB_opp_4,
+                               cast(hp2.street4CBDone as <signed>integer)               AS CB_4,
+                               cast(hp2.foldToStreet1CBChance as <signed>integer)       AS f_cb_opp_1,
+                               cast(hp2.foldToStreet1CBDone as <signed>integer)         AS f_cb_1,
+                               cast(hp2.foldToStreet2CBChance as <signed>integer)       AS f_cb_opp_2,
+                               cast(hp2.foldToStreet2CBDone as <signed>integer)         AS f_cb_2,
+                               cast(hp2.foldToStreet3CBChance as <signed>integer)       AS f_cb_opp_3,
+                               cast(hp2.foldToStreet3CBDone as <signed>integer)         AS f_cb_3,
+                               cast(hp2.foldToStreet4CBChance as <signed>integer)       AS f_cb_opp_4,
+                               cast(hp2.foldToStreet4CBDone as <signed>integer)         AS f_cb_4,
+                               cast(hp2.totalProfit as <signed>integer)                 AS net,
+                               cast(hp2.street1CheckCallRaiseChance as <signed>integer) AS ccr_opp_1,
+                               cast(hp2.street1CheckCallRaiseDone as <signed>integer)   AS ccr_1,
+                               cast(hp2.street2CheckCallRaiseChance as <signed>integer) AS ccr_opp_2,
+                               cast(hp2.street2CheckCallRaiseDone as <signed>integer)   AS ccr_2,
+                               cast(hp2.street3CheckCallRaiseChance as <signed>integer) AS ccr_opp_3,
+                               cast(hp2.street3CheckCallRaiseDone as <signed>integer)   AS ccr_3,
+                               cast(hp2.street4CheckCallRaiseChance as <signed>integer) AS ccr_opp_4,
+                               cast(hp2.street4CheckCallRaiseDone as <signed>integer)   AS ccr_4
+                        FROM Hands h                                                  /* this hand */
+                             INNER JOIN Hands h2         ON (    h2.id > %s           /* other hands */
+                                                             AND h2.tableName = h.tableName)
+                             INNER JOIN HandsPlayers hp  ON (h.id = hp.handId)        /* players in this hand */
+                             INNER JOIN HandsPlayers hp2 ON (    hp2.playerId+0 = hp.playerId+0
+                                                             AND hp2.handId = h2.id)  /* other hands by these players */
+                             INNER JOIN Players p        ON (p.id = hp2.PlayerId+0)
+                        WHERE h.id = %s
+                        /* check activeseats once this data returned (don't want to do that here as it might
+                           assume a session ended just because the number of seats dipped for a few hands)
+                        */
+                        ORDER BY h.handStart desc, hp2.PlayerId
+                        /* order rows by handstart descending so that we can stop reading rows when
+                           there's a gap over X minutes between hands (ie. when we get back to start of
+                           the session */
+                    """
+         
+            self.query['get_players_from_hand'] = """
+                    SELECT HandsPlayers.playerId, seatNo, name
+                    FROM  HandsPlayers INNER JOIN Players ON (HandsPlayers.playerId = Players.id)
+                    WHERE handId = %s
+                """
+#                    WHERE handId = %s AND Players.id LIKE %s
+
+            self.query['get_winners_from_hand'] = """
+                    SELECT name, winnings
+                    FROM HandsPlayers, Players
+                    WHERE winnings > 0
+                        AND Players.id = HandsPlayers.playerId
+                        AND handId = %s;
+                """
+
+            self.query['get_table_name'] = """
+                    select tableName, maxSeats, category, type
+                    from Hands,Gametypes
+                    where Hands.id = %s
+                    and Gametypes.id = Hands.gametypeId
+                """
+
+            self.query['get_actual_seat'] = """
+                    select seatNo
+                    from HandsPlayers
+                    where HandsPlayers.handId = %s
+                    and   HandsPlayers.playerId  = (select Players.id from Players
+                                                    where Players.name = %s)
+                """
+
+            self.query['get_cards'] = """
+                    select
+                        seatNo     AS seat_number,
+                        card1, /*card1Value, card1Suit, */
+                        card2, /*card2Value, card2Suit, */
+                        card3, /*card3Value, card3Suit, */
+                        card4, /*card4Value, card4Suit, */
+                        card5, /*card5Value, card5Suit, */
+                        card6, /*card6Value, card6Suit, */
+                        card7  /*card7Value, card7Suit */
+                    from HandsPlayers, Players
+                    where handID = %s and HandsPlayers.playerId = Players.id
+                    order by seatNo
+                """
+
+            self.query['get_common_cards'] = """
+                    select
+                    boardcard1,
+                    boardcard2,
+                    boardcard3,
+                    boardcard4,
+                    boardcard5
+                    from Hands
+                    where Id = %s
+                """
+
+            self.query['get_action_from_hand'] = """
+                SELECT street, Players.name, HandsActions.action, HandsActions.amount, actionno
+                FROM Players, HandsActions, HandsPlayers
+                WHERE HandsPlayers.handid = %s
+                AND HandsPlayers.playerid = Players.id
+                AND HandsActions.handsPlayerId = HandsPlayers.id
+                ORDER BY street, actionno
+            """
+
+            if db_server == 'mysql':
+                self.query['get_hand_1day_ago'] = """
+                    select coalesce(max(id),0)
+                    from Hands
+                    where handStart < date_sub(utc_timestamp(), interval '1' day)"""
+            elif db_server == 'postgresql':
+                self.query['get_hand_1day_ago'] = """
+                    select coalesce(max(id),0)
+                    from Hands
+                    where handStart < now() at time zone 'UTC' - interval '1 day'"""
+            elif db_server == 'sqlite':
+                self.query['get_hand_1day_ago'] = """
+                    select coalesce(max(id),0)
+                    from Hands
+                    where handStart < strftime('%J', 'now') - 1"""
+
+            # not used yet ...
+            # gets a date, would need to use handsplayers (not hudcache) to get exact hand Id
+            if db_server == 'mysql':
+                self.query['get_date_nhands_ago'] = """
+                    select concat( 'd', date_format(max(h.handStart), '%Y%m%d') )
+                    from (select hp.playerId
+                                ,coalesce(greatest(max(hp.handId)-%s,1),1) as maxminusx
+                          from HandsPlayers hp
+                          where hp.playerId = %s
+                          group by hp.playerId) hp2
+                    inner join HandsPlayers hp3 on (    hp3.handId <= hp2.maxminusx
+                                                    and hp3.playerId = hp2.playerId)
+                    inner join Hands h          on (h.id = hp3.handId)
+                    """
+            elif db_server == 'postgresql':
+                self.query['get_date_nhands_ago'] = """
+                    select 'd' || to_char(max(h3.handStart), 'YYMMDD')
+                    from (select hp.playerId
+                                ,coalesce(greatest(max(hp.handId)-%s,1),1) as maxminusx
+                          from HandsPlayers hp
+                          where hp.playerId = %s
+                          group by hp.playerId) hp2
+                    inner join HandsPlayers hp3 on (    hp3.handId <= hp2.maxminusx
+                                                    and hp3.playerId = hp2.playerId)
+                    inner join Hands h          on (h.id = hp3.handId)
+                    """
+            elif db_server == 'sqlite': # untested guess at query:
+                self.query['get_date_nhands_ago'] = """
+                    select 'd' || strftime(max(h3.handStart), 'YYMMDD')
+                    from (select hp.playerId
+                                ,coalesce(greatest(max(hp.handId)-%s,1),1) as maxminusx
+                          from HandsPlayers hp
+                          where hp.playerId = %s
+                          group by hp.playerId) hp2
+                    inner join HandsPlayers hp3 on (    hp3.handId <= hp2.maxminusx
+                                                    and hp3.playerId = hp2.playerId)
+                    inner join Hands h          on (h.id = hp3.handId)
+                    """
+
+            # used in GuiPlayerStats:
+            self.query['getPlayerId'] = """SELECT id from Players where name = %s"""
+
+            self.query['getPlayerIdBySite'] = """SELECT id from Players where name = %s AND siteId = %s"""
+
+
+            # used in Filters:
+            self.query['getSiteId'] = """SELECT id from Sites where name = %s"""
+            self.query['getGames'] = """SELECT DISTINCT category from Gametypes"""
+            self.query['getLimits'] = """SELECT DISTINCT bigBlind from Gametypes ORDER by bigBlind DESC"""
+
+            if db_server == 'mysql':
+                self.query['playerDetailedStats'] = """
+                         select  <hgameTypeId>                                                          AS hgametypeid
+                                ,gt.base
+                                ,gt.category
+                                ,upper(gt.limitType)                                                    AS limittype
+                                ,s.name
+                                ,min(gt.bigBlind)                                                       AS minbigblind
+                                ,max(gt.bigBlind)                                                       AS maxbigblind
+                                /*,<hcgametypeId>                                                         AS gtid*/
+                                ,<position>                                                             AS plposition
+                                ,count(1)                                                               AS n
+                                ,100.0*sum(cast(hp.street0VPI as <signed>integer))/count(1)             AS vpip
+                                ,100.0*sum(cast(hp.street0Aggr as <signed>integer))/count(1)            AS pfr
+                                ,case when sum(cast(hp.street0_3Bchance as <signed>integer)) = 0 then -999
+                                      else 100.0*sum(cast(hp.street0_3Bdone as <signed>integer))/sum(cast(hp.street0_3Bchance as <signed>integer))
+                                 end                                                                    AS pf3
+                                ,case when sum(cast(hp.stealattemptchance as <signed>integer)) = 0 then -999
+                                      else 100.0*sum(cast(hp.stealattempted as <signed>integer))/sum(cast(hp.stealattemptchance as <signed>integer))
+                                 end                                                                    AS steals
+                                ,100.0*sum(cast(hp.street1Seen as <signed>integer))/count(1)           AS saw_f
+                                ,100.0*sum(cast(hp.sawShowdown as <signed>integer))/count(1)           AS sawsd
+                                ,case when sum(cast(hp.street1Seen as <signed>integer)) = 0 then -999
+                                      else 100.0*sum(cast(hp.sawShowdown as <signed>integer))/sum(cast(hp.street1Seen as <signed>integer))
+                                 end                                                                    AS wtsdwsf
+                                ,case when sum(cast(hp.sawShowdown as <signed>integer)) = 0 then -999
+                                      else 100.0*sum(cast(hp.wonAtSD as <signed>integer))/sum(cast(hp.sawShowdown as <signed>integer))
+                                 end                                                                    AS wmsd
+                                ,case when sum(cast(hp.street1Seen as <signed>integer)) = 0 then -999
+                                      else 100.0*sum(cast(hp.street1Aggr as <signed>integer))/sum(cast(hp.street1Seen as <signed>integer))
+                                 end                                                                    AS flafq
+                                ,case when sum(cast(hp.street2Seen as <signed>integer)) = 0 then -999
+                                      else 100.0*sum(cast(hp.street2Aggr as <signed>integer))/sum(cast(hp.street2Seen as <signed>integer))
+                                 end                                                                    AS tuafq
+                                ,case when sum(cast(hp.street3Seen as <signed>integer)) = 0 then -999
+                                     else 100.0*sum(cast(hp.street3Aggr as <signed>integer))/sum(cast(hp.street3Seen as <signed>integer))
+                                 end                                                                    AS rvafq
+                                ,case when sum(cast(hp.street1Seen as <signed>integer))+sum(cast(hp.street2Seen as <signed>integer))+sum(cast(hp.street3Seen as <signed>integer)) = 0 then -999
+                                     else 100.0*(sum(cast(hp.street1Aggr as <signed>integer))+sum(cast(hp.street2Aggr as <signed>integer))+sum(cast(hp.street3Aggr as <signed>integer)))
+                                              /(sum(cast(hp.street1Seen as <signed>integer))+sum(cast(hp.street2Seen as <signed>integer))+sum(cast(hp.street3Seen as <signed>integer)))
+                                 end                                                                    AS pofafq
+                                ,sum(hp.totalProfit)/100.0                                              AS net
+                                ,sum(hp.rake)/100.0                                                     AS rake
+                                ,100.0*avg(hp.totalProfit/(gt.bigBlind+0.0))                            AS bbper100
+                                ,avg(hp.totalProfit)/100.0                                              AS profitperhand
+                                ,100.0*avg((hp.totalProfit+hp.rake)/(gt.bigBlind+0.0))                  AS bb100xr
+                                ,avg((hp.totalProfit+hp.rake)/100.0)                                    AS profhndxr
+                                ,avg(h.seats+0.0)                                                       AS avgseats
+                                ,variance(hp.totalProfit/100.0)                                         AS variance
+                          from HandsPlayers hp
+                               inner join Hands h       on  (h.id = hp.handId)
+                               inner join Gametypes gt  on  (gt.Id = h.gameTypeId)
+                               inner join Sites s       on  (s.Id = gt.siteId)
+                          where hp.playerId in <player_test>
+                          and   hp.tourneysPlayersId IS NULL
+                          and   h.seats <seats_test>
+                          <flagtest>
+                          <gtbigBlind_test>
+                          and   date_format(h.handStart, '%Y-%m-%d') <datestest>
+                          group by hgameTypeId
+                                  ,hp.playerId
+                                  ,gt.base
+                                  ,gt.category
+                                  <groupbyseats>
+                                  ,plposition
+                                  ,upper(gt.limitType)
+                                  ,s.name
+                          order by hp.playerId
+                                  ,gt.base
+                                  ,gt.category
+                                  <orderbyseats>
+                                  ,case <position> when 'B' then 'B'
+                                                   when 'S' then 'S'
+                                                   else concat('Z', <position>)
+                                   end
+                                  <orderbyhgameTypeId>
+                                  ,maxbigblind desc
+                                  ,upper(gt.limitType)
+                                  ,s.name
+                          """
+            else:   # assume postgresql
+                self.query['playerDetailedStats'] = """
+                         select  <hgameTypeId>                                                          AS hgametypeid
+                                ,gt.base
+                                ,gt.category
+                                ,upper(gt.limitType)                                                    AS limittype
+                                ,s.name
+                                ,min(gt.bigBlind)                                                       AS minbigblind
+                                ,max(gt.bigBlind)                                                       AS maxbigblind
+                                /*,<hcgametypeId>                                                       AS gtid*/
+                                ,<position>                                                             AS plposition
+                                ,count(1)                                                               AS n
+                                ,100.0*sum(cast(hp.street0VPI as <signed>integer))/count(1)             AS vpip
+                                ,100.0*sum(cast(hp.street0Aggr as <signed>integer))/count(1)            AS pfr
+                                ,case when sum(cast(hp.street0_3Bchance as <signed>integer)) = 0 then -999
+                                      else 100.0*sum(cast(hp.street0_3Bdone as <signed>integer))/sum(cast(hp.street0_3Bchance as <signed>integer))
+                                 end                                                                    AS pf3
+                                ,case when sum(cast(hp.stealattemptchance as <signed>integer)) = 0 then -999
+                                      else 100.0*sum(cast(hp.stealattempted as <signed>integer))/sum(cast(hp.stealattemptchance as <signed>integer))
+                                 end                                                                    AS steals
+                                ,100.0*sum(cast(hp.street1Seen as <signed>integer))/count(1)            AS saw_f
+                                ,100.0*sum(cast(hp.sawShowdown as <signed>integer))/count(1)            AS sawsd
+                                ,case when sum(cast(hp.street1Seen as <signed>integer)) = 0 then -999
+                                      else 100.0*sum(cast(hp.sawShowdown as <signed>integer))/sum(cast(hp.street1Seen as <signed>integer))
+                                 end                                                                    AS wtsdwsf
+                                ,case when sum(cast(hp.sawShowdown as <signed>integer)) = 0 then -999
+                                      else 100.0*sum(cast(hp.wonAtSD as <signed>integer))/sum(cast(hp.sawShowdown as <signed>integer))
+                                 end                                                                    AS wmsd
+                                ,case when sum(cast(hp.street1Seen as <signed>integer)) = 0 then -999
+                                      else 100.0*sum(cast(hp.street1Aggr as <signed>integer))/sum(cast(hp.street1Seen as <signed>integer))
+                                 end                                                                    AS flafq
+                                ,case when sum(cast(hp.street2Seen as <signed>integer)) = 0 then -999
+                                      else 100.0*sum(cast(hp.street2Aggr as <signed>integer))/sum(cast(hp.street2Seen as <signed>integer))
+                                 end                                                                    AS tuafq
+                                ,case when sum(cast(hp.street3Seen as <signed>integer)) = 0 then -999
+                                     else 100.0*sum(cast(hp.street3Aggr as <signed>integer))/sum(cast(hp.street3Seen as <signed>integer))
+                                 end                                                                    AS rvafq
+                                ,case when sum(cast(hp.street1Seen as <signed>integer))+sum(cast(hp.street2Seen as <signed>integer))+sum(cast(hp.street3Seen as <signed>integer)) = 0 then -999
+                                     else 100.0*(sum(cast(hp.street1Aggr as <signed>integer))+sum(cast(hp.street2Aggr as <signed>integer))+sum(cast(hp.street3Aggr as <signed>integer)))
+                                              /(sum(cast(hp.street1Seen as <signed>integer))+sum(cast(hp.street2Seen as <signed>integer))+sum(cast(hp.street3Seen as <signed>integer)))
+                                 end                                                                    AS pofafq
+                                ,sum(hp.totalProfit)/100.0                                              AS net
+                                ,sum(hp.rake)/100.0                                                     AS rake
+                                ,100.0*avg(hp.totalProfit/(gt.bigBlind+0.0))                            AS bbper100
+                                ,avg(hp.totalProfit)/100.0                                              AS profitperhand
+                                ,100.0*avg((hp.totalProfit+hp.rake)/(gt.bigBlind+0.0))                  AS bb100xr
+                                ,avg((hp.totalProfit+hp.rake)/100.0)                                    AS profhndxr
+                                ,avg(h.seats+0.0)                                                       AS avgseats
+                                ,variance(hp.totalProfit/100.0)                                         AS variance
+                          from HandsPlayers hp
+                               inner join Hands h       on  (h.id = hp.handId)
+                               inner join Gametypes gt  on  (gt.Id = h.gameTypeId)
+                               inner join Sites s       on  (s.Id = gt.siteId)
+                          where hp.playerId in <player_test>
+                          and   hp.tourneysPlayersId IS NULL
+                          and   h.seats <seats_test>
+                          <flagtest>
+                          <gtbigBlind_test>
+                          and   to_char(h.handStart, 'YYYY-MM-DD') <datestest>
+                          group by hgameTypeId
+                                  ,hp.playerId
+                                  ,gt.base
+                                  ,gt.category
+                                  <groupbyseats>
+                                  ,plposition
+                                  ,upper(gt.limitType)
+                                  ,s.name
+                          order by hp.playerId
+                                  ,gt.base
+                                  ,gt.category
+                                  <orderbyseats>
+                                  ,case <position> when 'B' then 'B'
+                                                   when 'S' then 'S'
+                                                   when '0' then 'Y'
+                                                   else 'Z'||<position>
+                                   end
+                                  <orderbyhgameTypeId>
+                                  ,maxbigblind desc
+                                  ,upper(gt.limitType)
+                                  ,s.name
+                          """
+            #elif db_server == 'sqlite':
+            #    self.query['playerDetailedStats'] = """ """
+
+            if db_server == 'mysql':
+                self.query['playerStats'] = """
+                    SELECT
+                          concat(upper(stats.limitType), ' '
+                                ,concat(upper(substring(stats.category,1,1)),substring(stats.category,2) ), ' '
+                                ,stats.name, ' '
+                                ,cast(stats.bigBlindDesc as char)
+                                )                                                      AS Game
+                         ,stats.n
+                         ,stats.vpip
+                         ,stats.pfr
+                         ,stats.pf3
+                         ,stats.steals
+                         ,stats.saw_f
+                         ,stats.sawsd
+                         ,stats.wtsdwsf
+                         ,stats.wmsd
+                         ,stats.FlAFq
+                         ,stats.TuAFq
+                         ,stats.RvAFq
+                         ,stats.PoFAFq
+                         ,stats.Net
+                         ,stats.BBper100
+                         ,stats.Profitperhand
+                         ,case when hprof2.variance = -999 then '-'
+                               else format(hprof2.variance, 2)
+                          end                                                          AS Variance
+                         ,stats.AvgSeats
+                    FROM
+                        (select /* stats from hudcache */
+                                gt.base
+                               ,gt.category
+                               ,upper(gt.limitType) as limitType
+                               ,s.name
+                               ,<selectgt.bigBlind>                                             AS bigBlindDesc
+                               ,<hcgametypeId>                                                  AS gtId
+                               ,sum(HDs)                                                        AS n
+                               ,format(100.0*sum(street0VPI)/sum(HDs),1)                        AS vpip
+                               ,format(100.0*sum(street0Aggr)/sum(HDs),1)                       AS pfr
+                               ,case when sum(street0_3Bchance) = 0 then '0'
+                                     else format(100.0*sum(street0_3Bdone)/sum(street0_3Bchance),1)
+                                end                                                             AS pf3
+                               ,case when sum(stealattemptchance) = 0 then '-'
+                                     else format(100.0*sum(stealattempted)/sum(stealattemptchance),1)
+                                end                                                             AS steals
+                               ,format(100.0*sum(street1Seen)/sum(HDs),1)                       AS saw_f
+                               ,format(100.0*sum(sawShowdown)/sum(HDs),1)                       AS sawsd
+                               ,case when sum(street1Seen) = 0 then '-'
+                                     else format(100.0*sum(sawShowdown)/sum(street1Seen),1)
+                                end                                                             AS wtsdwsf
+                               ,case when sum(sawShowdown) = 0 then '-'
+                                     else format(100.0*sum(wonAtSD)/sum(sawShowdown),1)
+                                end                                                             AS wmsd
+                               ,case when sum(street1Seen) = 0 then '-'
+                                     else format(100.0*sum(street1Aggr)/sum(street1Seen),1)
+                                end                                                             AS FlAFq
+                               ,case when sum(street2Seen) = 0 then '-'
+                                     else format(100.0*sum(street2Aggr)/sum(street2Seen),1)
+                                end                                                             AS TuAFq
+                               ,case when sum(street3Seen) = 0 then '-'
+                                    else format(100.0*sum(street3Aggr)/sum(street3Seen),1)
+                                end                                                             AS RvAFq
+                               ,case when sum(street1Seen)+sum(street2Seen)+sum(street3Seen) = 0 then '-'
+                                    else format(100.0*(sum(street1Aggr)+sum(street2Aggr)+sum(street3Aggr))
+                                             /(sum(street1Seen)+sum(street2Seen)+sum(street3Seen)),1)
+                                end                                                             AS PoFAFq
+                               ,format(sum(totalProfit)/100.0,2)                                AS Net
+                               ,format((sum(totalProfit/(gt.bigBlind+0.0))) / (sum(HDs)/100.0),2)
+                                                                                                AS BBper100
+                               ,format( (sum(totalProfit)/100.0) / sum(HDs), 4)                 AS Profitperhand
+                               ,format( sum(activeSeats*HDs)/(sum(HDs)+0.0), 2)                 AS AvgSeats
+                         from Gametypes gt
+                              inner join Sites s on s.Id = gt.siteId
+                              inner join HudCache hc on hc.gameTypeId = gt.Id
+                         where hc.playerId in <player_test>
+                         and   <gtbigBlind_test>
+                         and   hc.activeSeats <seats_test>
+                         and   concat( '20', substring(hc.styleKey,2,2), '-', substring(hc.styleKey,4,2), '-'
+                                     , substring(hc.styleKey,6,2) ) <datestest>
+                         group by gt.base
+                              ,gt.category
+                              ,upper(gt.limitType)
+                              ,s.name
+                              <groupbygt.bigBlind>
+                              ,gtId
+                        ) stats
+                    inner join
+                        ( select # profit from handsplayers/handsactions
+                                 hprof.gtId, sum(hprof.profit) sum_profit,
+                                 avg(hprof.profit/100.0) profitperhand,
+                                 case when hprof.gtId = -1 then -999
+                                      else variance(hprof.profit/100.0)
+                                 end as variance
+                          from
+                              (select hp.handId, <hgameTypeId> as gtId, hp.totalProfit as profit
+                               from HandsPlayers hp
+                               inner join Hands h        ON h.id            = hp.handId
+                               where hp.playerId in <player_test>
+                               and   hp.tourneysPlayersId IS NULL
+                               and   date_format(h.handStart, '%Y-%m-%d') <datestest>
+                               group by hp.handId, gtId, hp.totalProfit
+                              ) hprof
+                          group by hprof.gtId
+                         ) hprof2
+                        on hprof2.gtId = stats.gtId
+                    order by stats.category, stats.limittype, stats.bigBlindDesc desc <orderbyseats>"""
+            else:  # assume postgres
+                self.query['playerStats'] = """
+                    SELECT upper(stats.limitType) || ' '
+                           || initcap(stats.category) || ' '
+                           || stats.name || ' '
+                           || stats.bigBlindDesc                                          AS Game
+                          ,stats.n
+                          ,stats.vpip
+                          ,stats.pfr
+                          ,stats.pf3
+                          ,stats.steals
+                          ,stats.saw_f
+                          ,stats.sawsd
+                          ,stats.wtsdwsf
+                          ,stats.wmsd
+                          ,stats.FlAFq
+                          ,stats.TuAFq
+                          ,stats.RvAFq
+                          ,stats.PoFAFq
+                          ,stats.Net
+                          ,stats.BBper100
+                          ,stats.Profitperhand
+                          ,case when hprof2.variance = -999 then '-'
+                                else to_char(hprof2.variance, '0D00')
+                           end                                                          AS Variance
+                          ,AvgSeats
+                    FROM
+                        (select gt.base
+                               ,gt.category
+                               ,upper(gt.limitType)                                             AS limitType
+                               ,s.name
+                               ,<selectgt.bigBlind>                                             AS bigBlindDesc
+                               ,<hcgametypeId>                                                  AS gtId
+                               ,sum(HDs) as n
+                               ,to_char(100.0*sum(street0VPI)/sum(HDs),'990D0')                 AS vpip
+                               ,to_char(100.0*sum(street0Aggr)/sum(HDs),'90D0')                 AS pfr
+                               ,case when sum(street0_3Bchance) = 0 then '0'
+                                     else to_char(100.0*sum(street0_3Bdone)/sum(street0_3Bchance),'90D0')
+                                end                                                             AS pf3
+                               ,case when sum(stealattemptchance) = 0 then '-'
+                                     else to_char(100.0*sum(stealattempted)/sum(stealattemptchance),'90D0')
+                                end                                                             AS steals
+                               ,to_char(100.0*sum(street1Seen)/sum(HDs),'90D0')                 AS saw_f
+                               ,to_char(100.0*sum(sawShowdown)/sum(HDs),'90D0')                 AS sawsd
+                               ,case when sum(street1Seen) = 0 then '-'
+                                     else to_char(100.0*sum(sawShowdown)/sum(street1Seen),'90D0')
+                                end                                                             AS wtsdwsf
+                               ,case when sum(sawShowdown) = 0 then '-'
+                                     else to_char(100.0*sum(wonAtSD)/sum(sawShowdown),'90D0')
+                                end                                                             AS wmsd
+                               ,case when sum(street1Seen) = 0 then '-'
+                                     else to_char(100.0*sum(street1Aggr)/sum(street1Seen),'90D0')
+                                end                                                             AS FlAFq
+                               ,case when sum(street2Seen) = 0 then '-'
+                                     else to_char(100.0*sum(street2Aggr)/sum(street2Seen),'90D0')
+                                end                                                             AS TuAFq
+                               ,case when sum(street3Seen) = 0 then '-'
+                                    else to_char(100.0*sum(street3Aggr)/sum(street3Seen),'90D0')
+                                end                                                             AS RvAFq
+                               ,case when sum(street1Seen)+sum(street2Seen)+sum(street3Seen) = 0 then '-'
+                                    else to_char(100.0*(sum(street1Aggr)+sum(street2Aggr)+sum(street3Aggr))
+                                             /(sum(street1Seen)+sum(street2Seen)+sum(street3Seen)),'90D0')
+                                end                                                             AS PoFAFq
+                               ,round(sum(totalProfit)/100.0,2)                                 AS Net
+                               ,to_char((sum(totalProfit/(gt.bigBlind+0.0))) / (sum(HDs)/100.0), '990D00')
+                                                                                                AS BBper100
+                               ,to_char(sum(totalProfit/100.0) / (sum(HDs)+0.0), '990D0000')    AS Profitperhand
+                               ,to_char(sum(activeSeats*HDs)/(sum(HDs)+0.0),'90D00')            AS AvgSeats
+                         from Gametypes gt
+                              inner join Sites s on s.Id = gt.siteId
+                              inner join HudCache hc on hc.gameTypeId = gt.Id
+                         where hc.playerId in <player_test>
+                         and   <gtbigBlind_test>
+                         and   hc.activeSeats <seats_test>
+                         and   '20' || SUBSTR(hc.styleKey,2,2) || '-' || SUBSTR(hc.styleKey,4,2) || '-'
+                               || SUBSTR(hc.styleKey,6,2) <datestest>
+                         group by gt.base
+                              ,gt.category
+                              ,upper(gt.limitType)
+                              ,s.name
+                              <groupbygt.bigBlind>
+                              ,gtId
+                        ) stats
+                    inner join
+                        ( select
+                                 hprof.gtId, sum(hprof.profit) AS sum_profit,
+                                 avg(hprof.profit/100.0) AS profitperhand,
+                                 case when hprof.gtId = -1 then -999
+                                      else variance(hprof.profit/100.0)
+                                 end as variance
+                          from
+                              (select hp.handId, <hgameTypeId> as gtId, hp.totalProfit as profit
+                               from HandsPlayers hp
+                               inner join Hands h   ON (h.id = hp.handId)
+                               where hp.playerId in <player_test>
+                               and   hp.tourneysPlayersId IS NULL
+                               and   to_char(h.handStart, 'YYYY-MM-DD') <datestest>
+                               group by hp.handId, gtId, hp.totalProfit
+                              ) hprof
+                          group by hprof.gtId
+                         ) hprof2
+                        on hprof2.gtId = stats.gtId
+                    order by stats.base, stats.limittype, stats.bigBlindDesc desc <orderbyseats>"""
+            #elif db_server == 'sqlite':
+            #    self.query['playerStats'] = """ """
+
+            if db_server == 'mysql':
+                self.query['playerStatsByPosition'] = """
+                    SELECT
+                          concat(upper(stats.limitType), ' '
+                                ,concat(upper(substring(stats.category,1,1)),substring(stats.category,2) ), ' '
+                                ,stats.name, ' '
+                                ,cast(stats.bigBlindDesc as char)
+                                )                                                      AS Game
+                         ,case when stats.PlPosition = -2 then 'BB'
+                               when stats.PlPosition = -1 then 'SB'
+                               when stats.PlPosition =  0 then 'Btn'
+                               when stats.PlPosition =  1 then 'CO'
+                               when stats.PlPosition =  2 then 'MP'
+                               when stats.PlPosition =  5 then 'EP'
+                               else 'xx'
+                          end                                                          AS PlPosition
+                         ,stats.n
+                         ,stats.vpip
+                         ,stats.pfr
+                         ,stats.pf3
+                         ,stats.steals
+                         ,stats.saw_f
+                         ,stats.sawsd
+                         ,stats.wtsdwsf
+                         ,stats.wmsd
+                         ,stats.FlAFq
+                         ,stats.TuAFq
+                         ,stats.RvAFq
+                         ,stats.PoFAFq
+                         ,stats.Net
+                         ,stats.BBper100
+                         ,stats.Profitperhand
+                         ,case when hprof2.variance = -999 then '-'
+                               else format(hprof2.variance, 2)
+                          end                                                          AS Variance
+                         ,stats.AvgSeats
+                    FROM
+                        (select /* stats from hudcache */
+                                gt.base
+                               ,gt.category
+                               ,upper(gt.limitType)                                             AS limitType
+                               ,s.name
+                               ,<selectgt.bigBlind>                                             AS bigBlindDesc
+                               ,<hcgametypeId>                                                  AS gtId
+                               ,case when hc.position = 'B' then -2
+                                     when hc.position = 'S' then -1
+                                     when hc.position = 'D' then  0
+                                     when hc.position = 'C' then  1
+                                     when hc.position = 'M' then  2
+                                     when hc.position = 'E' then  5
+                                     else 9
+                                end                                                             as PlPosition
+                               ,sum(HDs)                                                        AS n
+                               ,format(100.0*sum(street0VPI)/sum(HDs),1)                        AS vpip
+                               ,format(100.0*sum(street0Aggr)/sum(HDs),1)                       AS pfr
+                               ,case when sum(street0_3Bchance) = 0 then '0'
+                                     else format(100.0*sum(street0_3Bdone)/sum(street0_3Bchance),1)
+                                end                                                             AS pf3
+                               ,case when sum(stealattemptchance) = 0 then '-'
+                                     else format(100.0*sum(stealattempted)/sum(stealattemptchance),1)
+                                end                                                             AS steals
+                               ,format(100.0*sum(street1Seen)/sum(HDs),1)                       AS saw_f
+                               ,format(100.0*sum(sawShowdown)/sum(HDs),1)                       AS sawsd
+                               ,case when sum(street1Seen) = 0 then '-'
+                                     else format(100.0*sum(sawShowdown)/sum(street1Seen),1)
+                                end                                                             AS wtsdwsf
+                               ,case when sum(sawShowdown) = 0 then '-'
+                                     else format(100.0*sum(wonAtSD)/sum(sawShowdown),1)
+                                end                                                             AS wmsd
+                               ,case when sum(street1Seen) = 0 then '-'
+                                     else format(100.0*sum(street1Aggr)/sum(street1Seen),1)
+                                end                                                             AS FlAFq
+                               ,case when sum(street2Seen) = 0 then '-'
+                                     else format(100.0*sum(street2Aggr)/sum(street2Seen),1)
+                                end                                                             AS TuAFq
+                               ,case when sum(street3Seen) = 0 then '-'
+                                    else format(100.0*sum(street3Aggr)/sum(street3Seen),1)
+                                end                                                             AS RvAFq
+                               ,case when sum(street1Seen)+sum(street2Seen)+sum(street3Seen) = 0 then '-'
+                                    else format(100.0*(sum(street1Aggr)+sum(street2Aggr)+sum(street3Aggr))
+                                             /(sum(street1Seen)+sum(street2Seen)+sum(street3Seen)),1)
+                                end                                                             AS PoFAFq
+                               ,format(sum(totalProfit)/100.0,2)                                AS Net
+                               ,format((sum(totalProfit/(gt.bigBlind+0.0))) / (sum(HDs)/100.0),2)
+                                                                                                AS BBper100
+                               ,format( (sum(totalProfit)/100.0) / sum(HDs), 4)                 AS Profitperhand
+                               ,format( sum(activeSeats*HDs)/(sum(HDs)+0.0), 2)                 AS AvgSeats
+                         from Gametypes gt
+                              inner join Sites s on s.Id = gt.siteId
+                              inner join HudCache hc on hc.gameTypeId = gt.Id
+                         where hc.playerId in <player_test>
+                         and   <gtbigBlind_test>
+                         and   hc.activeSeats <seats_test>
+                         and   concat( '20', substring(hc.styleKey,2,2), '-', substring(hc.styleKey,4,2), '-'
+                                     , substring(hc.styleKey,6,2) ) <datestest>
+                         group by gt.base
+                              ,gt.category
+                              ,upper(gt.limitType)
+                              ,s.name
+                              <groupbygt.bigBlind>
+                              ,gtId
+                              <groupbyseats>
+                              ,PlPosition
+                        ) stats
+                    inner join
+                        ( select # profit from handsplayers/handsactions
+                                 hprof.gtId,
+                                 case when hprof.position = 'B' then -2
+                                      when hprof.position = 'S' then -1
+                                      when hprof.position in ('3','4') then 2
+                                      when hprof.position in ('6','7') then 5
+                                      else hprof.position
+                                 end                                      as PlPosition,
+                                 sum(hprof.profit) as sum_profit,
+                                 avg(hprof.profit/100.0) as profitperhand,
+                                 case when hprof.gtId = -1 then -999
+                                      else variance(hprof.profit/100.0)
+                                 end as variance
+                          from
+                              (select hp.handId, <hgameTypeId> as gtId, hp.position
+                                    , hp.totalProfit as profit
+                               from HandsPlayers hp
+                               inner join Hands h  ON  (h.id = hp.handId)
+                               where hp.playerId in <player_test>
+                               and   hp.tourneysPlayersId IS NULL
+                               and   date_format(h.handStart, '%Y-%m-%d') <datestest>
+                               group by hp.handId, gtId, hp.position, hp.totalProfit
+                              ) hprof
+                          group by hprof.gtId, PlPosition
+                         ) hprof2
+                        on (    hprof2.gtId = stats.gtId
+                            and hprof2.PlPosition = stats.PlPosition)
+                    order by stats.category, stats.limitType, stats.bigBlindDesc desc
+                             <orderbyseats>, cast(stats.PlPosition as signed)
+                    """
+            else:  # assume postgresql
+                self.query['playerStatsByPosition'] = """
+                    select /* stats from hudcache */
+                           upper(stats.limitType) || ' '
+                           || upper(substr(stats.category,1,1)) || substr(stats.category,2) || ' '
+                           || stats.name || ' '
+                           || stats.bigBlindDesc                                        AS Game
+                          ,case when stats.PlPosition = -2 then 'BB'
+                                when stats.PlPosition = -1 then 'SB'
+                                when stats.PlPosition =  0 then 'Btn'
+                                when stats.PlPosition =  1 then 'CO'
+                                when stats.PlPosition =  2 then 'MP'
+                                when stats.PlPosition =  5 then 'EP'
+                                else 'xx'
+                           end                                                          AS PlPosition
+                          ,stats.n
+                          ,stats.vpip
+                          ,stats.pfr
+                          ,stats.pf3
+                          ,stats.steals
+                          ,stats.saw_f
+                          ,stats.sawsd
+                          ,stats.wtsdwsf
+                          ,stats.wmsd
+                          ,stats.FlAFq
+                          ,stats.TuAFq
+                          ,stats.RvAFq
+                          ,stats.PoFAFq
+                          ,stats.Net
+                          ,stats.BBper100
+                          ,stats.Profitperhand
+                          ,case when hprof2.variance = -999 then '-'
+                                else to_char(hprof2.variance, '0D00')
+                           end                                                          AS Variance
+                          ,stats.AvgSeats
+                    FROM
+                        (select /* stats from hudcache */
+                                gt.base
+                               ,gt.category
+                               ,upper(gt.limitType)                                             AS limitType
+                               ,s.name
+                               ,<selectgt.bigBlind>                                             AS bigBlindDesc
+                               ,<hcgametypeId>                                                  AS gtId
+                               ,case when hc.position = 'B' then -2
+                                     when hc.position = 'S' then -1
+                                     when hc.position = 'D' then  0
+                                     when hc.position = 'C' then  1
+                                     when hc.position = 'M' then  2
+                                     when hc.position = 'E' then  5
+                                     else 9
+                                end                                                             AS PlPosition
+                               ,sum(HDs)                                                        AS n
+                               ,to_char(round(100.0*sum(street0VPI)/sum(HDs)),'990D0')          AS vpip
+                               ,to_char(round(100.0*sum(street0Aggr)/sum(HDs)),'90D0')          AS pfr
+                               ,case when sum(street0_3Bchance) = 0 then '0'
+                                     else to_char(100.0*sum(street0_3Bdone)/sum(street0_3Bchance),'90D0')
+                                end                                                             AS pf3
+                               ,case when sum(stealattemptchance) = 0 then '-'
+                                     else to_char(100.0*sum(stealattempted)/sum(stealattemptchance),'90D0')
+                                end                                                             AS steals
+                               ,to_char(round(100.0*sum(street1Seen)/sum(HDs)),'90D0')          AS saw_f
+                               ,to_char(round(100.0*sum(sawShowdown)/sum(HDs)),'90D0')          AS sawsd
+                               ,case when sum(street1Seen) = 0 then '-'
+                                     else to_char(round(100.0*sum(sawShowdown)/sum(street1Seen)),'90D0')
+                                end                                                             AS wtsdwsf
+                               ,case when sum(sawShowdown) = 0 then '-'
+                                     else to_char(round(100.0*sum(wonAtSD)/sum(sawShowdown)),'90D0')
+                                end                                                             AS wmsd
+                               ,case when sum(street1Seen) = 0 then '-'
+                                     else to_char(round(100.0*sum(street1Aggr)/sum(street1Seen)),'90D0')
+                                end                                                             AS FlAFq
+                               ,case when sum(street2Seen) = 0 then '-'
+                                     else to_char(round(100.0*sum(street2Aggr)/sum(street2Seen)),'90D0')
+                                end                                                             AS TuAFq
+                               ,case when sum(street3Seen) = 0 then '-'
+                                    else to_char(round(100.0*sum(street3Aggr)/sum(street3Seen)),'90D0')
+                                end                                                             AS RvAFq
+                               ,case when sum(street1Seen)+sum(street2Seen)+sum(street3Seen) = 0 then '-'
+                                    else to_char(round(100.0*(sum(street1Aggr)+sum(street2Aggr)+sum(street3Aggr))
+                                             /(sum(street1Seen)+sum(street2Seen)+sum(street3Seen))),'90D0')
+                                end                                                             AS PoFAFq
+                               ,to_char(sum(totalProfit)/100.0,'9G999G990D00')                  AS Net
+                               ,case when sum(HDs) = 0 then '0'
+                                     else to_char(sum(totalProfit/(gt.bigBlind+0.0)) / (sum(HDs)/100.0), '990D00')
+                                end                                                             AS BBper100
+                               ,case when sum(HDs) = 0 then '0'
+                                     else to_char( (sum(totalProfit)/100.0) / sum(HDs), '90D0000')
+                                end                                                             AS Profitperhand
+                               ,to_char(sum(activeSeats*HDs)/(sum(HDs)+0.0),'90D00')            AS AvgSeats
+                         from Gametypes gt
+                              inner join Sites s     on (s.Id = gt.siteId)
+                              inner join HudCache hc on (hc.gameTypeId = gt.Id)
+                         where hc.playerId in <player_test>
+                         and   <gtbigBlind_test>
+                         and   hc.activeSeats <seats_test>
+                         and   '20' || SUBSTR(hc.styleKey,2,2) || '-' || SUBSTR(hc.styleKey,4,2) || '-'
+                               || SUBSTR(hc.styleKey,6,2) <datestest>
+                         group by gt.base
+                              ,gt.category
+                              ,upper(gt.limitType)
+                              ,s.name
+                              <groupbygt.bigBlind>
+                              ,gtId
+                              <groupbyseats>
+                              ,PlPosition
+                        ) stats
+                    inner join
+                        ( select /* profit from handsplayers/handsactions */
+                                 hprof.gtId,
+                                 case when hprof.position = 'B' then -2
+                                      when hprof.position = 'S' then -1
+                                      when hprof.position in ('3','4') then 2
+                                      when hprof.position in ('6','7') then 5
+                                      else cast(hprof.position as smallint)
+                                 end                                      as PlPosition,
+                                 sum(hprof.profit) as sum_profit,
+                                 avg(hprof.profit/100.0) as profitperhand,
+                                 case when hprof.gtId = -1 then -999
+                                      else variance(hprof.profit/100.0)
+                                 end as variance
+                          from
+                              (select hp.handId, <hgameTypeId> as gtId, hp.position
+                                    , hp.totalProfit as profit
+                               from HandsPlayers hp
+                               inner join Hands h  ON  (h.id = hp.handId)
+                               where hp.playerId in <player_test>
+                               and   hp.tourneysPlayersId IS NULL
+                               and   to_char(h.handStart, 'YYYY-MM-DD') <datestest>
+                               group by hp.handId, gameTypeId, hp.position, hp.totalProfit
+                              ) hprof
+                          group by hprof.gtId, PlPosition
+                        ) hprof2
+                        on (    hprof2.gtId = stats.gtId
+                            and hprof2.PlPosition = stats.PlPosition)
+                    order by stats.category, stats.limitType, stats.bigBlindDesc desc
+                             <orderbyseats>, cast(stats.PlPosition as smallint)
+                    """
+            #elif db_server == 'sqlite':
+            #    self.query['playerStatsByPosition'] = """ """
+
+            self.query['getRingProfitAllHandsPlayerIdSite'] = """
+                SELECT hp.handId, hp.totalProfit, hp.totalProfit, hp.totalProfit
+                FROM HandsPlayers hp
+                INNER JOIN Players pl      ON  (hp.playerId  = pl.id)
+                INNER JOIN Hands h         ON  (h.id         = hp.handId)
+                INNER JOIN Gametypes g     ON  (h.gametypeId = g.id)
+                where pl.id in <player_test>
+                AND   pl.siteId in <site_test>
+                AND   h.handStart > '<startdate_test>'
+                AND   h.handStart < '<enddate_test>'
+                AND   g.bigBlind in <limit_test>
+                AND   hp.tourneysPlayersId IS NULL
+                GROUP BY h.handStart, hp.handId, hp.totalProfit
+                ORDER BY h.handStart"""
+
+
+            ####################################
+            # Queries to rebuild/modify hudcache
+            ####################################
+          
+            self.query['clearHudCache'] = """DELETE FROM HudCache"""
+           
+            if db_server == 'mysql':
+                self.query['rebuildHudCache'] = """
+                    INSERT INTO HudCache
+                    (gametypeId
+                    ,playerId
+                    ,activeSeats
+                    ,position
+                    ,tourneyTypeId
+                    ,styleKey
+                    ,HDs
+                    ,wonWhenSeenStreet1
+                    ,wonAtSD
+                    ,street0VPI
+                    ,street0Aggr
+                    ,street0_3BChance
+                    ,street0_3BDone
+                    ,street1Seen
+                    ,street2Seen
+                    ,street3Seen
+                    ,street4Seen
+                    ,sawShowdown
+                    ,street1Aggr
+                    ,street2Aggr
+                    ,street3Aggr
+                    ,street4Aggr
+                    ,otherRaisedStreet1
+                    ,otherRaisedStreet2
+                    ,otherRaisedStreet3
+                    ,otherRaisedStreet4
+                    ,foldToOtherRaisedStreet1
+                    ,foldToOtherRaisedStreet2
+                    ,foldToOtherRaisedStreet3
+                    ,foldToOtherRaisedStreet4
+                    ,stealAttemptChance
+                    ,stealAttempted
+                    ,foldBbToStealChance
+                    ,foldedBbToSteal
+                    ,foldSbToStealChance
+                    ,foldedSbToSteal
+                    ,street1CBChance
+                    ,street1CBDone
+                    ,street2CBChance
+                    ,street2CBDone
+                    ,street3CBChance
+                    ,street3CBDone
+                    ,street4CBChance
+                    ,street4CBDone
+                    ,foldToStreet1CBChance
+                    ,foldToStreet1CBDone
+                    ,foldToStreet2CBChance
+                    ,foldToStreet2CBDone
+                    ,foldToStreet3CBChance
+                    ,foldToStreet3CBDone
+                    ,foldToStreet4CBChance
+                    ,foldToStreet4CBDone
+                    ,totalProfit
+                    ,street1CheckCallRaiseChance
+                    ,street1CheckCallRaiseDone
+                    ,street2CheckCallRaiseChance
+                    ,street2CheckCallRaiseDone
+                    ,street3CheckCallRaiseChance
+                    ,street3CheckCallRaiseDone
+                    ,street4CheckCallRaiseChance
+                    ,street4CheckCallRaiseDone
+                    )
+                    SELECT h.gametypeId
+                          ,hp.playerId
+                          ,h.seats
+                          ,case when hp.position = 'B' then 'B'
+                                when hp.position = 'S' then 'S'
+                                when hp.position = '0' then 'D'
+                                when hp.position = '1' then 'C'
+                                when hp.position = '2' then 'M'
+                                when hp.position = '3' then 'M'
+                                when hp.position = '4' then 'M'
+                                when hp.position = '5' then 'E'
+                                when hp.position = '6' then 'E'
+                                when hp.position = '7' then 'E'
+                                when hp.position = '8' then 'E'
+                                when hp.position = '9' then 'E'
+                                else 'E'
+                           end                                            AS hc_position
+                          ,hp.tourneyTypeId
+                          ,date_format(h.handStart, 'd%y%m%d')
+                          ,count(1)
+                          ,sum(wonWhenSeenStreet1)
+                          ,sum(wonAtSD)
+                          ,sum(street0VPI)
+                          ,sum(street0Aggr)
+                          ,sum(street0_3BChance)
+                          ,sum(street0_3BDone)
+                          ,sum(street1Seen)
+                          ,sum(street2Seen)
+                          ,sum(street3Seen)
+                          ,sum(street4Seen)
+                          ,sum(sawShowdown)
+                          ,sum(street1Aggr)
+                          ,sum(street2Aggr)
+                          ,sum(street3Aggr)
+                          ,sum(street4Aggr)
+                          ,sum(otherRaisedStreet1)
+                          ,sum(otherRaisedStreet2)
+                          ,sum(otherRaisedStreet3)
+                          ,sum(otherRaisedStreet4)
+                          ,sum(foldToOtherRaisedStreet1)
+                          ,sum(foldToOtherRaisedStreet2)
+                          ,sum(foldToOtherRaisedStreet3)
+                          ,sum(foldToOtherRaisedStreet4)
+                          ,sum(stealAttemptChance)
+                          ,sum(stealAttempted)
+                          ,sum(foldBbToStealChance)
+                          ,sum(foldedBbToSteal)
+                          ,sum(foldSbToStealChance)
+                          ,sum(foldedSbToSteal)
+                          ,sum(street1CBChance)
+                          ,sum(street1CBDone)
+                          ,sum(street2CBChance)
+                          ,sum(street2CBDone)
+                          ,sum(street3CBChance)
+                          ,sum(street3CBDone)
+                          ,sum(street4CBChance)
+                          ,sum(street4CBDone)
+                          ,sum(foldToStreet1CBChance)
+                          ,sum(foldToStreet1CBDone)
+                          ,sum(foldToStreet2CBChance)
+                          ,sum(foldToStreet2CBDone)
+                          ,sum(foldToStreet3CBChance)
+                          ,sum(foldToStreet3CBDone)
+                          ,sum(foldToStreet4CBChance)
+                          ,sum(foldToStreet4CBDone)
+                          ,sum(totalProfit)
+                          ,sum(street1CheckCallRaiseChance)
+                          ,sum(street1CheckCallRaiseDone)
+                          ,sum(street2CheckCallRaiseChance)
+                          ,sum(street2CheckCallRaiseDone)
+                          ,sum(street3CheckCallRaiseChance)
+                          ,sum(street3CheckCallRaiseDone)
+                          ,sum(street4CheckCallRaiseChance)
+                          ,sum(street4CheckCallRaiseDone)
+                    FROM HandsPlayers hp
+                    INNER JOIN Hands h ON (h.id = hp.handId)
+                    GROUP BY h.gametypeId
+                            ,hp.playerId
+                            ,h.seats
+                            ,hc_position
+                            ,hp.tourneyTypeId
+                            ,date_format(h.handStart, 'd%y%m%d')
+"""
+            elif db_server == 'postgresql':
+                self.query['rebuildHudCache'] = """
+                    INSERT INTO HudCache
+                    (gametypeId
+                    ,playerId
+                    ,activeSeats
+                    ,position
+                    ,tourneyTypeId
+                    ,styleKey
+                    ,HDs
+                    ,wonWhenSeenStreet1
+                    ,wonAtSD
+                    ,street0VPI
+                    ,street0Aggr
+                    ,street0_3BChance
+                    ,street0_3BDone
+                    ,street1Seen
+                    ,street2Seen
+                    ,street3Seen
+                    ,street4Seen
+                    ,sawShowdown
+                    ,street1Aggr
+                    ,street2Aggr
+                    ,street3Aggr
+                    ,street4Aggr
+                    ,otherRaisedStreet1
+                    ,otherRaisedStreet2
+                    ,otherRaisedStreet3
+                    ,otherRaisedStreet4
+                    ,foldToOtherRaisedStreet1
+                    ,foldToOtherRaisedStreet2
+                    ,foldToOtherRaisedStreet3
+                    ,foldToOtherRaisedStreet4
+                    ,stealAttemptChance
+                    ,stealAttempted
+                    ,foldBbToStealChance
+                    ,foldedBbToSteal
+                    ,foldSbToStealChance
+                    ,foldedSbToSteal
+                    ,street1CBChance
+                    ,street1CBDone
+                    ,street2CBChance
+                    ,street2CBDone
+                    ,street3CBChance
+                    ,street3CBDone
+                    ,street4CBChance
+                    ,street4CBDone
+                    ,foldToStreet1CBChance
+                    ,foldToStreet1CBDone
+                    ,foldToStreet2CBChance
+                    ,foldToStreet2CBDone
+                    ,foldToStreet3CBChance
+                    ,foldToStreet3CBDone
+                    ,foldToStreet4CBChance
+                    ,foldToStreet4CBDone
+                    ,totalProfit
+                    ,street1CheckCallRaiseChance
+                    ,street1CheckCallRaiseDone
+                    ,street2CheckCallRaiseChance
+                    ,street2CheckCallRaiseDone
+                    ,street3CheckCallRaiseChance
+                    ,street3CheckCallRaiseDone
+                    ,street4CheckCallRaiseChance
+                    ,street4CheckCallRaiseDone
+                    )
+                    SELECT h.gametypeId
+                          ,hp.playerId
+                          ,h.seats
+                          ,case when hp.position = 'B' then 'B'
+                                when hp.position = 'S' then 'S'
+                                when hp.position = '0' then 'D'
+                                when hp.position = '1' then 'C'
+                                when hp.position = '2' then 'M'
+                                when hp.position = '3' then 'M'
+                                when hp.position = '4' then 'M'
+                                when hp.position = '5' then 'E'
+                                when hp.position = '6' then 'E'
+                                when hp.position = '7' then 'E'
+                                when hp.position = '8' then 'E'
+                                when hp.position = '9' then 'E'
+                                else 'E'
+                           end                                            AS hc_position
+                          ,hp.tourneyTypeId
+                          ,'d' || to_char(h.handStart, 'YYMMDD')
+                          ,count(1)
+                          ,sum(wonWhenSeenStreet1)
+                          ,sum(wonAtSD)
+                          ,sum(CAST(street0VPI as integer))
+                          ,sum(CAST(street0Aggr as integer))
+                          ,sum(CAST(street0_3BChance as integer))
+                          ,sum(CAST(street0_3BDone as integer))
+                          ,sum(CAST(street1Seen as integer))
+                          ,sum(CAST(street2Seen as integer))
+                          ,sum(CAST(street3Seen as integer))
+                          ,sum(CAST(street4Seen as integer))
+                          ,sum(CAST(sawShowdown as integer))
+                          ,sum(CAST(street1Aggr as integer))
+                          ,sum(CAST(street2Aggr as integer))
+                          ,sum(CAST(street3Aggr as integer))
+                          ,sum(CAST(street4Aggr as integer))
+                          ,sum(CAST(otherRaisedStreet1 as integer))
+                          ,sum(CAST(otherRaisedStreet2 as integer))
+                          ,sum(CAST(otherRaisedStreet3 as integer))
+                          ,sum(CAST(otherRaisedStreet4 as integer))
+                          ,sum(CAST(foldToOtherRaisedStreet1 as integer))
+                          ,sum(CAST(foldToOtherRaisedStreet2 as integer))
+                          ,sum(CAST(foldToOtherRaisedStreet3 as integer))
+                          ,sum(CAST(foldToOtherRaisedStreet4 as integer))
+                          ,sum(CAST(stealAttemptChance as integer))
+                          ,sum(CAST(stealAttempted as integer))
+                          ,sum(CAST(foldBbToStealChance as integer))
+                          ,sum(CAST(foldedBbToSteal as integer))
+                          ,sum(CAST(foldSbToStealChance as integer))
+                          ,sum(CAST(foldedSbToSteal as integer))
+                          ,sum(CAST(street1CBChance as integer))
+                          ,sum(CAST(street1CBDone as integer))
+                          ,sum(CAST(street2CBChance as integer))
+                          ,sum(CAST(street2CBDone as integer))
+                          ,sum(CAST(street3CBChance as integer))
+                          ,sum(CAST(street3CBDone as integer))
+                          ,sum(CAST(street4CBChance as integer))
+                          ,sum(CAST(street4CBDone as integer))
+                          ,sum(CAST(foldToStreet1CBChance as integer))
+                          ,sum(CAST(foldToStreet1CBDone as integer))
+                          ,sum(CAST(foldToStreet2CBChance as integer))
+                          ,sum(CAST(foldToStreet2CBDone as integer))
+                          ,sum(CAST(foldToStreet3CBChance as integer))
+                          ,sum(CAST(foldToStreet3CBDone as integer))
+                          ,sum(CAST(foldToStreet4CBChance as integer))
+                          ,sum(CAST(foldToStreet4CBDone as integer))
+                          ,sum(CAST(totalProfit as integer))
+                          ,sum(CAST(street1CheckCallRaiseChance as integer))
+                          ,sum(CAST(street1CheckCallRaiseDone as integer))
+                          ,sum(CAST(street2CheckCallRaiseChance as integer))
+                          ,sum(CAST(street2CheckCallRaiseDone as integer))
+                          ,sum(CAST(street3CheckCallRaiseChance as integer))
+                          ,sum(CAST(street3CheckCallRaiseDone as integer))
+                          ,sum(CAST(street4CheckCallRaiseChance as integer))
+                          ,sum(CAST(street4CheckCallRaiseDone as integer))
+                    FROM HandsPlayers hp
+                    INNER JOIN Hands h ON (h.id = hp.handId)
+                    GROUP BY h.gametypeId
+                            ,hp.playerId
+                            ,h.seats
+                            ,hc_position
+                            ,hp.tourneyTypeId
+                            ,to_char(h.handStart, 'YYMMDD')
+"""
+            else:   # assume sqlite
+                self.query['rebuildHudCache'] = """
+                    INSERT INTO HudCache
+                    (gametypeId
+                    ,playerId
+                    ,activeSeats
+                    ,position
+                    ,tourneyTypeId
+                    ,styleKey
+                    ,HDs
+                    ,wonWhenSeenStreet1
+                    ,wonAtSD
+                    ,street0VPI
+                    ,street0Aggr
+                    ,street0_3BChance
+                    ,street0_3BDone
+                    ,street1Seen
+                    ,street2Seen
+                    ,street3Seen
+                    ,street4Seen
+                    ,sawShowdown
+                    ,street1Aggr
+                    ,street2Aggr
+                    ,street3Aggr
+                    ,street4Aggr
+                    ,otherRaisedStreet1
+                    ,otherRaisedStreet2
+                    ,otherRaisedStreet3
+                    ,otherRaisedStreet4
+                    ,foldToOtherRaisedStreet1
+                    ,foldToOtherRaisedStreet2
+                    ,foldToOtherRaisedStreet3
+                    ,foldToOtherRaisedStreet4
+                    ,stealAttemptChance
+                    ,stealAttempted
+                    ,foldBbToStealChance
+                    ,foldedBbToSteal
+                    ,foldSbToStealChance
+                    ,foldedSbToSteal
+                    ,street1CBChance
+                    ,street1CBDone
+                    ,street2CBChance
+                    ,street2CBDone
+                    ,street3CBChance
+                    ,street3CBDone
+                    ,street4CBChance
+                    ,street4CBDone
+                    ,foldToStreet1CBChance
+                    ,foldToStreet1CBDone
+                    ,foldToStreet2CBChance
+                    ,foldToStreet2CBDone
+                    ,foldToStreet3CBChance
+                    ,foldToStreet3CBDone
+                    ,foldToStreet4CBChance
+                    ,foldToStreet4CBDone
+                    ,totalProfit
+                    ,street1CheckCallRaiseChance
+                    ,street1CheckCallRaiseDone
+                    ,street2CheckCallRaiseChance
+                    ,street2CheckCallRaiseDone
+                    ,street3CheckCallRaiseChance
+                    ,street3CheckCallRaiseDone
+                    ,street4CheckCallRaiseChance
+                    ,street4CheckCallRaiseDone
+                    )
+                    SELECT h.gametypeId
+                          ,hp.playerId
+                          ,h.seats
+                          ,case when hp.position = 'B' then 'B'
+                                when hp.position = 'S' then 'S'
+                                when hp.position = '0' then 'D'
+                                when hp.position = '1' then 'C'
+                                when hp.position = '2' then 'M'
+                                when hp.position = '3' then 'M'
+                                when hp.position = '4' then 'M'
+                                when hp.position = '5' then 'E'
+                                when hp.position = '6' then 'E'
+                                when hp.position = '7' then 'E'
+                                when hp.position = '8' then 'E'
+                                when hp.position = '9' then 'E'
+                                else 'E'
+                           end                                            AS hc_position
+                          ,hp.tourneyTypeId
+                          ,'d' || substr(strftime('%Y%m%d', h.handStart),3,7)
+                          ,count(1)
+                          ,sum(wonWhenSeenStreet1)
+                          ,sum(wonAtSD)
+                          ,sum(CAST(street0VPI as integer))
+                          ,sum(CAST(street0Aggr as integer))
+                          ,sum(CAST(street0_3BChance as integer))
+                          ,sum(CAST(street0_3BDone as integer))
+                          ,sum(CAST(street1Seen as integer))
+                          ,sum(CAST(street2Seen as integer))
+                          ,sum(CAST(street3Seen as integer))
+                          ,sum(CAST(street4Seen as integer))
+                          ,sum(CAST(sawShowdown as integer))
+                          ,sum(CAST(street1Aggr as integer))
+                          ,sum(CAST(street2Aggr as integer))
+                          ,sum(CAST(street3Aggr as integer))
+                          ,sum(CAST(street4Aggr as integer))
+                          ,sum(CAST(otherRaisedStreet1 as integer))
+                          ,sum(CAST(otherRaisedStreet2 as integer))
+                          ,sum(CAST(otherRaisedStreet3 as integer))
+                          ,sum(CAST(otherRaisedStreet4 as integer))
+                          ,sum(CAST(foldToOtherRaisedStreet1 as integer))
+                          ,sum(CAST(foldToOtherRaisedStreet2 as integer))
+                          ,sum(CAST(foldToOtherRaisedStreet3 as integer))
+                          ,sum(CAST(foldToOtherRaisedStreet4 as integer))
+                          ,sum(CAST(stealAttemptChance as integer))
+                          ,sum(CAST(stealAttempted as integer))
+                          ,sum(CAST(foldBbToStealChance as integer))
+                          ,sum(CAST(foldedBbToSteal as integer))
+                          ,sum(CAST(foldSbToStealChance as integer))
+                          ,sum(CAST(foldedSbToSteal as integer))
+                          ,sum(CAST(street1CBChance as integer))
+                          ,sum(CAST(street1CBDone as integer))
+                          ,sum(CAST(street2CBChance as integer))
+                          ,sum(CAST(street2CBDone as integer))
+                          ,sum(CAST(street3CBChance as integer))
+                          ,sum(CAST(street3CBDone as integer))
+                          ,sum(CAST(street4CBChance as integer))
+                          ,sum(CAST(street4CBDone as integer))
+                          ,sum(CAST(foldToStreet1CBChance as integer))
+                          ,sum(CAST(foldToStreet1CBDone as integer))
+                          ,sum(CAST(foldToStreet2CBChance as integer))
+                          ,sum(CAST(foldToStreet2CBDone as integer))
+                          ,sum(CAST(foldToStreet3CBChance as integer))
+                          ,sum(CAST(foldToStreet3CBDone as integer))
+                          ,sum(CAST(foldToStreet4CBChance as integer))
+                          ,sum(CAST(foldToStreet4CBDone as integer))
+                          ,sum(CAST(totalProfit as integer))
+                          ,sum(CAST(street1CheckCallRaiseChance as integer))
+                          ,sum(CAST(street1CheckCallRaiseDone as integer))
+                          ,sum(CAST(street2CheckCallRaiseChance as integer))
+                          ,sum(CAST(street2CheckCallRaiseDone as integer))
+                          ,sum(CAST(street3CheckCallRaiseChance as integer))
+                          ,sum(CAST(street3CheckCallRaiseDone as integer))
+                          ,sum(CAST(street4CheckCallRaiseChance as integer))
+                          ,sum(CAST(street4CheckCallRaiseDone as integer))
+                    FROM HandsPlayers hp
+                    INNER JOIN Hands h ON (h.id = hp.handId)
+                    GROUP BY h.gametypeId
+                            ,hp.playerId
+                            ,h.seats
+                            ,hc_position
+                            ,hp.tourneyTypeId
+                            ,'d' || substr(strftime('%Y%m%d', h.handStart),3,7)
+"""
+
+            if db_server == 'mysql':
+                self.query['analyze'] = """
+                analyze table Autorates, GameTypes, Hands, HandsPlayers, Hudcache, Players
+                            , Settings, Sites, Tourneys, TourneysPlayers, TourneyTypes
+                """
+            else:  # assume postgres
+                self.query['analyze'] = "vacuum analyze"
+
+            if db_server == 'mysql':
+                self.query['lockForInsert'] = """
+                    lock tables Hands write, HandsPlayers write, HandsActions write, Players write
+                              , HudCache write, GameTypes write, Sites write, Tourneys write
+                              , TourneysPlayers write, TourneyTypes write, Autorates write
+                    """
+            else:  # assume postgres
+                self.query['lockForInsert'] = ""
+
+            self.query['getGametypeFL'] = """SELECT id
+                                               FROM Gametypes
+                                               WHERE siteId=%s
+                                               AND   type=%s
+                                               AND   category=%s
+                                               AND   limitType=%s
+                                               AND   smallBet=%s
+                                               AND   bigBet=%s
+            """
+
+            self.query['getGametypeNL'] = """SELECT id
+                                               FROM Gametypes
+                                               WHERE siteId=%s
+                                               AND   type=%s
+                                               AND   category=%s
+                                               AND   limitType=%s
+                                               AND   smallBlind=%s
+                                               AND   bigBlind=%s
+            """
+
+            self.query['insertGameTypes'] = """INSERT INTO Gametypes
+                                                  (siteId, type, base, category, limitType
+                                                  ,hiLo, smallBlind, bigBlind, smallBet, bigBet)
+                                               VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)"""
+
+            self.query['isAlreadyInDB'] = """SELECT id FROM Hands 
+                                             WHERE gametypeId=%s AND siteHandNo=%s
+            """
+
+            if db_server == 'mysql':
+                self.query['placeholder'] = u'%s'
+            elif db_server == 'postgresql':
+                self.query['placeholder'] = u'%s'
+            elif db_server == 'sqlite':
+                self.query['placeholder'] = u'?'
+
+
+            # If using sqlite, use the ? placeholder instead of %s
+            if db_server == 'sqlite':
+                for k,q in self.query.iteritems():
+                    self.query[k] = re.sub('%s','?',q)
+
+if __name__== "__main__":
+#    just print the default queries and exit
+    s = Sql()
+    for key in s.query:
+        print "For query " + key + ", sql ="
+        print s.query[key]
diff --git a/pyfpdb/Tables.py b/pyfpdb/Tables.py
index 97a897ca..082bc171 100755
--- a/pyfpdb/Tables.py
+++ b/pyfpdb/Tables.py
@@ -39,6 +39,7 @@ if os.name == 'nt':
 
 #    FreePokerTools modules
 import Configuration
+from fpdb_simple import LOCALE_ENCODING
 
 #    Each TableWindow object must have the following attributes correctly populated:
 #    tw.name = the table name from the title bar, which must to match the table name
@@ -230,11 +231,13 @@ def discover_nt_by_name(c, tablename):
     """Finds poker client window with the given table name."""
     titles = {}
     win32gui.EnumWindows(win_enum_handler, titles)
+        
     for hwnd in titles:
         #print "Tables.py: tablename =", tablename, "title =", titles[hwnd]
         try:
+            # maybe it's better to make global titles[hwnd] decoding?
             # this can blow up in XP on some windows, eg firefox displaying http://docs.python.org/tutorial/classes.html
-            if not tablename.lower() in titles[hwnd].lower(): continue
+            if not tablename.lower() in titles[hwnd].decode(LOCALE_ENCODING).lower(): continue
         except:
             continue
         if 'History for table:' in titles[hwnd]: continue # Everleaf Network HH viewer window
diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
index 51af7865..c4752f16 100755
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -244,30 +244,27 @@ class fpdb:
         if self.obtain_global_lock():  # returns true if successful
 
             #lock_released = False
-            try:
-                dia_confirm = gtk.MessageDialog(parent=None, flags=0, type=gtk.MESSAGE_WARNING,
-                        buttons=(gtk.BUTTONS_YES_NO), message_format="Confirm deleting and recreating tables")
-                diastring = "Please confirm that you want to (re-)create the tables. If there already are tables in the database " \
-                            +self.db.fdb.database+" on "+self.db.fdb.host+" they will be deleted."
-                dia_confirm.format_secondary_text(diastring)#todo: make above string with bold for db, host and deleted
+            dia_confirm = gtk.MessageDialog(parent=None, flags=0, type=gtk.MESSAGE_WARNING,
+                    buttons=(gtk.BUTTONS_YES_NO), message_format="Confirm deleting and recreating tables")
+            diastring = "Please confirm that you want to (re-)create the tables. If there already are tables in the database " \
+                        +self.db.fdb.database+" on "+self.db.fdb.host+" they will be deleted."
+            dia_confirm.format_secondary_text(diastring)#todo: make above string with bold for db, host and deleted
 
-                response = dia_confirm.run()
-                dia_confirm.destroy()
-                if response == gtk.RESPONSE_YES:
-                    #if self.db.fdb.backend == self.fdb_lock.fdb.MYSQL_INNODB:
-                        # mysql requires locks on all tables or none - easier to release this lock 
-                        # than lock all the other tables
-                        # ToDo: lock all other tables so that lock doesn't have to be released
-                    #    self.release_global_lock()
-                    #    lock_released = True
-                    self.db.recreate_tables()
-                    #else:
-                        # for other dbs use same connection as holds global lock
-                    #    self.fdb_lock.fdb.recreate_tables()
-                elif response == gtk.RESPONSE_NO:
-                    print 'User cancelled recreating tables'
-            except:
-                pass
+            response = dia_confirm.run()
+            dia_confirm.destroy()
+            if response == gtk.RESPONSE_YES:
+                #if self.db.fdb.backend == self.fdb_lock.fdb.MYSQL_INNODB:
+                    # mysql requires locks on all tables or none - easier to release this lock 
+                    # than lock all the other tables
+                    # ToDo: lock all other tables so that lock doesn't have to be released
+                #    self.release_global_lock()
+                #    lock_released = True
+                self.db.recreate_tables()
+                #else:
+                    # for other dbs use same connection as holds global lock
+                #    self.fdb_lock.fdb.recreate_tables()
+            elif response == gtk.RESPONSE_NO:
+                print 'User cancelled recreating tables'
             #if not lock_released:
             self.release_global_lock()
     #end def dia_recreate_tables
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index ac0153f6..6a493be6 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -384,8 +384,9 @@ class Importer:
         conv = None
         (stored, duplicates, partial, errors, ttime) = (0, 0, 0, 0, 0)
 
+        file =  file.decode(fpdb_simple.LOCALE_ENCODING) 
+
         # Load filter, process file, pass returned filename to import_fpdb_file
-            
         if self.settings['threads'] > 0 and self.writeq != None:
             log.info("Converting " + file + " (" + str(q.qsize()) + ")")
         else:
diff --git a/pyfpdb/fpdb_simple.py b/pyfpdb/fpdb_simple.py
index 1ff408c3..1ab6060f 100644
--- a/pyfpdb/fpdb_simple.py
+++ b/pyfpdb/fpdb_simple.py
@@ -26,6 +26,8 @@ import time
 import re
 import sys
 from Exceptions import *
+import locale
+
 import Card
  
 PS  = 1
@@ -37,6 +39,8 @@ MYSQL_INNODB    = 2
 PGSQL           = 3
 SQLITE          = 4
 
+LOCALE_ENCODING = locale.getdefaultlocale()[1]
+
 #returns an array of the total money paid. intending to add rebuys/addons here
 def calcPayin(count, buyin, fee):
     return [buyin + fee for i in xrange(count)]
@@ -531,7 +535,7 @@ def parseActionType(line):
 #parses the ante out of the given line and checks which player paid it, updates antes accordingly.
 def parseAnteLine(line, isTourney, names, antes):
     for i, name in enumerate(names):
-        if line.startswith(name.encode("latin-1")):
+        if line.startswith(name.encode(LOCALE_ENCODING)):
             pos = line.rfind("$") + 1
             if not isTourney:
                 antes[i] += float2int(line[pos:])
@@ -693,7 +697,7 @@ def parseHandStartTime(topline):
 def findName(line):
     pos1 = line.find(":") + 2
     pos2 = line.rfind("(") - 1
-    return unicode(line[pos1:pos2], "latin-1")
+    return unicode(line[pos1:pos2], LOCALE_ENCODING)
 
 def parseNames(lines):
     return [findName(line) for line in lines]
@@ -810,7 +814,7 @@ def parseTourneyNo(topline):
 def parseWinLine(line, names, winnings, isTourney):
     #print "parseWinLine: line:",line
     for i,n in enumerate(names):
-        n = n.encode("latin-1")
+        n = n.encode(LOCALE_ENCODING)
         if line.startswith(n):
             if isTourney:
                 pos1 = line.rfind("collected ") + 10
@@ -1020,14 +1024,15 @@ def recognisePlayerIDs(db, names, site_id):
 def recognisePlayerNo(line, names, atype):
     #print "recogniseplayerno, names:",names
     for i in xrange(len(names)):
+        encodedName = names[i].encode(LOCALE_ENCODING)
         if (atype=="unbet"):
-            if (line.endswith(names[i].encode("latin-1"))):
+            if (line.endswith(encodedName)):
                 return (i)
         elif (line.startswith("Dealt to ")):
             #print "recognisePlayerNo, card precut, line:",line
             tmp=line[9:]
             #print "recognisePlayerNo, card postcut, tmp:",tmp
-            if (tmp.startswith(names[i].encode("latin-1"))):
+            if (tmp.startswith(encodedName)):
                 return (i)
         elif (line.startswith("Seat ")):
             if (line.startswith("Seat 10")):
@@ -1035,10 +1040,10 @@ def recognisePlayerNo(line, names, atype):
             else:
                 tmp=line[8:]
             
-            if (tmp.startswith(names[i].encode("latin-1"))):
+            if (tmp.startswith(encodedName)):
                 return (i)
         else:
-            if (line.startswith(names[i].encode("latin-1"))):
+            if (line.startswith(encodedName)):
                 return (i)
     #if we're here we mustve failed
     raise FpdbError ("failed to recognise player in: "+line+" atype:"+atype)
diff --git a/pyfpdb/interlocks.py b/pyfpdb/interlocks.py
index 96edaa3e..b19ff43b 100755
--- a/pyfpdb/interlocks.py
+++ b/pyfpdb/interlocks.py
@@ -1,271 +1,271 @@
-
-# Code from http://ender.snowburst.org:4747/~jjohns/interlocks.py
-# Thanks JJ!
-
-import sys
-import os, os.path
-import subprocess
-import time
-import signal
-import base64
-
-InterProcessLock = None
-
-"""
-Just use me like a thread lock.  acquire() / release() / locked()
-
-Differences compared to thread locks:
-1. By default, acquire()'s wait parameter is false.
-2. When acquire fails, SingleInstanceError is thrown instead of simply returning false.
-3. acquire() can take a 3rd parameter retry_time, which, if wait is True, tells the locking 
-   mechanism how long to sleep between retrying the lock.  Has no effect for unix/InterProcessLockFcntl.
-
-Differences in fpdb version to JJ's original:
-1. Changed acquire() to return false like other locks
-2. Made acquire fail if same process already has the lock
-"""
-
-class SingleInstanceError(RuntimeError):
-    "Thrown when you try to acquire an InterProcessLock and another version of the process is already running."
-
-class InterProcessLockBase:
-    def __init__(self, name=None ):
-        self._has_lock = False
-        if not name:
-            name = sys.argv[0]
-        self.name = name
-
-    def getHashedName(self):
-        return base64.b64encode(self.name).replace('=','')
-
-    def acquire_impl(self, wait): abstract
-        
-    def acquire(self, wait=False, retry_time=1):
-        if self._has_lock:             # make sure 2nd acquire in same process fails
-            return False
-        while not self._has_lock:
-            try:
-                self.acquire_impl(wait)
-                self._has_lock = True
-                #print 'i have the lock'
-            except SingleInstanceError:
-                if not wait:
-                    # raise            # change back to normal acquire functionality, sorry JJ!
-                    return False
-                time.sleep(retry_time)
-        return True
-
-    def release(self):
-        self.release_impl()
-        self._has_lock = False
-
-    def locked(self):
-        if self._has_lock:
-            return True
-        try:
-            self.acquire()
-            self.release()
-            return False
-        except SingleInstanceError:
-            return True    
-
-LOCK_FILE_DIRECTORY = '/tmp'
-
-class InterProcessLockFcntl(InterProcessLockBase):
-    def __init__(self, name=None):
-        InterProcessLockBase.__init__(self, name)
-        self.lockfd = 0
-        self.lock_file_name = os.path.join(LOCK_FILE_DIRECTORY, self.getHashedName() + '.lck')
-        assert(os.path.isdir(LOCK_FILE_DIRECTORY))
-
-    # This is the suggested way to get a safe file name, but I like having a descriptively named lock file.
-    def getHashedName(self):
-        import re
-        bad_filename_character_re = re.compile(r'/\?<>\\\:;\*\|\'\"\^=\.\[\]')
-        return bad_filename_character_re.sub('_',self.name)
-
-    def acquire_impl(self, wait):
-        self.lockfd = open(self.lock_file_name, 'w')
-        fcntrl_options = fcntl.LOCK_EX
-        if not wait:
-            fcntrl_options |= fcntl.LOCK_NB
-        try:
-            fcntl.flock(self.lockfd, fcntrl_options)
-        except IOError:
-            self.lockfd.close()
-            self.lockfd = 0
-            raise SingleInstanceError('Could not acquire exclusive lock on '+self.lock_file_name)
-            
-    def release_impl(self):
-        fcntl.lockf(self.lockfd, fcntl.LOCK_UN)
-        self.lockfd.close()
-        self.lockfd = 0
-        try:
-            os.unlink(self.lock_file_name)
-        except IOError:
-            # We don't care about the existence of the file too much here.  It's the flock() we care about,
-            # And that should just go away magically.
-            pass
-
-class InterProcessLockWin32(InterProcessLockBase):
-    def __init__(self, name=None):
-        InterProcessLockBase.__init__(self, name)        
-        self.mutex = None
-            
-    def acquire_impl(self,wait):
-        self.mutex = win32event.CreateMutex(None, 0, self.getHashedName())
-        if win32api.GetLastError() == winerror.ERROR_ALREADY_EXISTS:
-            self.mutex.Close()
-            self.mutex = None
-            raise SingleInstanceError('Could not acquire exclusive lock on ' + self.name)
-            
-    def release_impl(self):
-        self.mutex.Close()
-        
-class InterProcessLockSocket(InterProcessLockBase):
-    def __init__(self, name=None):
-        InterProcessLockBase.__init__(self, name)        
-        self.socket = None
-        self.portno = 65530 - abs(self.getHashedName().__hash__()) % 32749
-        
-    def acquire_impl(self, wait):
-        self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        try:
-            self.socket.bind(('127.0.0.1', self.portno))
-        except socket.error:
-            self.socket.close()
-            self.socket = None
-            raise SingleInstanceError('Could not acquire exclusive lock on ' + self.name)
-        
-    def release_impl(self):
-        self.socket.close()
-        self.socket = None
-
-# Set InterProcessLock to the correct type given the sysem parameters available
-try:
-    import fcntl
-    InterProcessLock = InterProcessLockFcntl
-except ImportError:
-    try:
-        import win32event
-        import win32api
-        import winerror
-        InterProcessLock = InterProcessLockWin32
-    except ImportError:
-        import socket
-        InterProcessLock = InterProcessLockSocket
-
-def test_construct():
-    """
-    # Making the name of the test unique so it can be executed my multiple users on the same machine.
-    >>> test_name = 'InterProcessLockTest' +str(os.getpid()) + str(time.time())
-
-    >>> lock1 = InterProcessLock(name=test_name)
-    >>> lock1.acquire()
-
-    >>> lock2 = InterProcessLock(name=test_name)
-    >>> lock3 = InterProcessLock(name=test_name)
-
-    # Since lock1 is locked, other attempts to acquire it fail.
-    >>> lock2.acquire()
-    Traceback (most recent call last):
-    ...
-    SingleInstanceError: Could not acquire exclusive lock on /tmp/test.lck
-
-    >>> lock3.acquire()
-    Traceback (most recent call last):
-    ...
-    SingleInstanceError: Could not acquire exclusive lock on /tmp/test.lck
-
-    # Release the lock and let lock2 have it.
-    >>> lock1.release()
-    >>> lock2.acquire()
-
-    >>> lock3.acquire()
-    Traceback (most recent call last):
-    ...
-    SingleInstanceError: Could not acquire exclusive lock on /tmp/test.lck
-
-    # Release it and give it back to lock1
-    >>> lock2.release()
-    >>> lock1.acquire()
-
-    >>> lock2.acquire()
-    Traceback (most recent call last):
-    ...
-    SingleInstanceError: Could not acquire exclusive lock on /tmp/test.lck
-
-    # Test lock status
-    >>> lock2.locked()
-    True
-    >>> lock3.locked()
-    True
-    >>> lock1.locked()
-    True
-
-    >>> lock1.release()
-
-    >>> lock2.locked()
-    False
-    >>> lock3.locked()
-    False
-    >>> lock1.locked()
-    False
-
-    >>> if os.name == 'posix':
-    ...    def os_independent_kill(pid):
-    ...        import signal
-    ...        os.kill(pid, signal.SIGKILL)
-    ... else:
-    ...        assert(os.name == 'nt')
-    ...        def os_independent_kill(pid):
-    ...            ''' http://www.python.org/doc/faq/windows/#how-do-i-emulate-os-kill-in-windows '''
-    ...            import win32api
-    ...            import win32con
-    ...            import pywintypes
-    ...            handle = win32api.OpenProcess(win32con.PROCESS_TERMINATE , pywintypes.FALSE, pid)
-    ...            return (0 != win32api.TerminateProcess(handle, 0))
-
-    # Test to acquire the lock in another process.
-    >>> def execute(cmd):
-    ...    cmd = 'import time;' + cmd + 'time.sleep(10);'
-    ...    process = subprocess.Popen([sys.executable, '-c', cmd])
-    ...    pid = process.pid
-    ...    time.sleep(2) # quick hack, but we test synchronization in the end
-    ...    return pid
-
-    >>> pid = execute('import interlocks;a=interlocks.InterProcessLock(name=\\''+test_name+ '\\');a.acquire();')
-
-    >>> lock1.acquire()
-    Traceback (most recent call last):
-    ...
-    SingleInstanceError: Could not acquire exclusive lock on /tmp/test.lck
-
-    >>> os_independent_kill(pid)
-
-    >>> time.sleep(1)
-
-    >>> lock1.acquire()
-    >>> lock1.release()
-
-    # Testing wait
-
-    >>> pid = execute('import interlocks;a=interlocks.InterProcessLock(name=\\''+test_name+ '\\');a.acquire();')
-
-    >>> lock1.acquire()
-    Traceback (most recent call last):
-    ...
-    SingleInstanceError: Could not acquire exclusive lock on /tmp/test.lck
-
-    >>> os_independent_kill(pid)
-
-    >>> lock1.acquire(True)
-    >>> lock1.release()
-
-    """
-    
-    pass
-
-if __name__=='__main__':
-    import doctest
-    doctest.testmod(optionflags=doctest.IGNORE_EXCEPTION_DETAIL)
+
+# Code from http://ender.snowburst.org:4747/~jjohns/interlocks.py
+# Thanks JJ!
+
+import sys
+import os, os.path
+import subprocess
+import time
+import signal
+import base64
+
+InterProcessLock = None
+
+"""
+Just use me like a thread lock.  acquire() / release() / locked()
+
+Differences compared to thread locks:
+1. By default, acquire()'s wait parameter is false.
+2. When acquire fails, SingleInstanceError is thrown instead of simply returning false.
+3. acquire() can take a 3rd parameter retry_time, which, if wait is True, tells the locking 
+   mechanism how long to sleep between retrying the lock.  Has no effect for unix/InterProcessLockFcntl.
+
+Differences in fpdb version to JJ's original:
+1. Changed acquire() to return false like other locks
+2. Made acquire fail if same process already has the lock
+"""
+
+class SingleInstanceError(RuntimeError):
+    "Thrown when you try to acquire an InterProcessLock and another version of the process is already running."
+
+class InterProcessLockBase:
+    def __init__(self, name=None ):
+        self._has_lock = False
+        if not name:
+            name = sys.argv[0]
+        self.name = name
+
+    def getHashedName(self):
+        return base64.b64encode(self.name).replace('=','')
+
+    def acquire_impl(self, wait): abstract
+        
+    def acquire(self, wait=False, retry_time=1):
+        if self._has_lock:             # make sure 2nd acquire in same process fails
+            return False
+        while not self._has_lock:
+            try:
+                self.acquire_impl(wait)
+                self._has_lock = True
+                #print 'i have the lock'
+            except SingleInstanceError:
+                if not wait:
+                    # raise            # change back to normal acquire functionality, sorry JJ!
+                    return False
+                time.sleep(retry_time)
+        return True
+
+    def release(self):
+        self.release_impl()
+        self._has_lock = False
+
+    def locked(self):
+        if self._has_lock:
+            return True
+        try:
+            self.acquire()
+            self.release()
+            return False
+        except SingleInstanceError:
+            return True    
+
+LOCK_FILE_DIRECTORY = '/tmp'
+
+class InterProcessLockFcntl(InterProcessLockBase):
+    def __init__(self, name=None):
+        InterProcessLockBase.__init__(self, name)
+        self.lockfd = 0
+        self.lock_file_name = os.path.join(LOCK_FILE_DIRECTORY, self.getHashedName() + '.lck')
+        assert(os.path.isdir(LOCK_FILE_DIRECTORY))
+
+    # This is the suggested way to get a safe file name, but I like having a descriptively named lock file.
+    def getHashedName(self):
+        import re
+        bad_filename_character_re = re.compile(r'/\?<>\\\:;\*\|\'\"\^=\.\[\]')
+        return bad_filename_character_re.sub('_',self.name)
+
+    def acquire_impl(self, wait):
+        self.lockfd = open(self.lock_file_name, 'w')
+        fcntrl_options = fcntl.LOCK_EX
+        if not wait:
+            fcntrl_options |= fcntl.LOCK_NB
+        try:
+            fcntl.flock(self.lockfd, fcntrl_options)
+        except IOError:
+            self.lockfd.close()
+            self.lockfd = 0
+            raise SingleInstanceError('Could not acquire exclusive lock on '+self.lock_file_name)
+            
+    def release_impl(self):
+        fcntl.lockf(self.lockfd, fcntl.LOCK_UN)
+        self.lockfd.close()
+        self.lockfd = 0
+        try:
+            os.unlink(self.lock_file_name)
+        except IOError:
+            # We don't care about the existence of the file too much here.  It's the flock() we care about,
+            # And that should just go away magically.
+            pass
+
+class InterProcessLockWin32(InterProcessLockBase):
+    def __init__(self, name=None):
+        InterProcessLockBase.__init__(self, name)        
+        self.mutex = None
+            
+    def acquire_impl(self,wait):
+        self.mutex = win32event.CreateMutex(None, 0, self.getHashedName())
+        if win32api.GetLastError() == winerror.ERROR_ALREADY_EXISTS:
+            self.mutex.Close()
+            self.mutex = None
+            raise SingleInstanceError('Could not acquire exclusive lock on ' + self.name)
+            
+    def release_impl(self):
+        self.mutex.Close()
+        
+class InterProcessLockSocket(InterProcessLockBase):
+    def __init__(self, name=None):
+        InterProcessLockBase.__init__(self, name)        
+        self.socket = None
+        self.portno = 65530 - abs(self.getHashedName().__hash__()) % 32749
+        
+    def acquire_impl(self, wait):
+        self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        try:
+            self.socket.bind(('127.0.0.1', self.portno))
+        except socket.error:
+            self.socket.close()
+            self.socket = None
+            raise SingleInstanceError('Could not acquire exclusive lock on ' + self.name)
+        
+    def release_impl(self):
+        self.socket.close()
+        self.socket = None
+
+# Set InterProcessLock to the correct type given the sysem parameters available
+try:
+    import fcntl
+    InterProcessLock = InterProcessLockFcntl
+except ImportError:
+    try:
+        import win32event
+        import win32api
+        import winerror
+        InterProcessLock = InterProcessLockWin32
+    except ImportError:
+        import socket
+        InterProcessLock = InterProcessLockSocket
+
+def test_construct():
+    """
+    # Making the name of the test unique so it can be executed my multiple users on the same machine.
+    >>> test_name = 'InterProcessLockTest' +str(os.getpid()) + str(time.time())
+
+    >>> lock1 = InterProcessLock(name=test_name)
+    >>> lock1.acquire()
+
+    >>> lock2 = InterProcessLock(name=test_name)
+    >>> lock3 = InterProcessLock(name=test_name)
+
+    # Since lock1 is locked, other attempts to acquire it fail.
+    >>> lock2.acquire()
+    Traceback (most recent call last):
+    ...
+    SingleInstanceError: Could not acquire exclusive lock on /tmp/test.lck
+
+    >>> lock3.acquire()
+    Traceback (most recent call last):
+    ...
+    SingleInstanceError: Could not acquire exclusive lock on /tmp/test.lck
+
+    # Release the lock and let lock2 have it.
+    >>> lock1.release()
+    >>> lock2.acquire()
+
+    >>> lock3.acquire()
+    Traceback (most recent call last):
+    ...
+    SingleInstanceError: Could not acquire exclusive lock on /tmp/test.lck
+
+    # Release it and give it back to lock1
+    >>> lock2.release()
+    >>> lock1.acquire()
+
+    >>> lock2.acquire()
+    Traceback (most recent call last):
+    ...
+    SingleInstanceError: Could not acquire exclusive lock on /tmp/test.lck
+
+    # Test lock status
+    >>> lock2.locked()
+    True
+    >>> lock3.locked()
+    True
+    >>> lock1.locked()
+    True
+
+    >>> lock1.release()
+
+    >>> lock2.locked()
+    False
+    >>> lock3.locked()
+    False
+    >>> lock1.locked()
+    False
+
+    >>> if os.name == 'posix':
+    ...    def os_independent_kill(pid):
+    ...        import signal
+    ...        os.kill(pid, signal.SIGKILL)
+    ... else:
+    ...        assert(os.name == 'nt')
+    ...        def os_independent_kill(pid):
+    ...            ''' http://www.python.org/doc/faq/windows/#how-do-i-emulate-os-kill-in-windows '''
+    ...            import win32api
+    ...            import win32con
+    ...            import pywintypes
+    ...            handle = win32api.OpenProcess(win32con.PROCESS_TERMINATE , pywintypes.FALSE, pid)
+    ...            return (0 != win32api.TerminateProcess(handle, 0))
+
+    # Test to acquire the lock in another process.
+    >>> def execute(cmd):
+    ...    cmd = 'import time;' + cmd + 'time.sleep(10);'
+    ...    process = subprocess.Popen([sys.executable, '-c', cmd])
+    ...    pid = process.pid
+    ...    time.sleep(2) # quick hack, but we test synchronization in the end
+    ...    return pid
+
+    >>> pid = execute('import interlocks;a=interlocks.InterProcessLock(name=\\''+test_name+ '\\');a.acquire();')
+
+    >>> lock1.acquire()
+    Traceback (most recent call last):
+    ...
+    SingleInstanceError: Could not acquire exclusive lock on /tmp/test.lck
+
+    >>> os_independent_kill(pid)
+
+    >>> time.sleep(1)
+
+    >>> lock1.acquire()
+    >>> lock1.release()
+
+    # Testing wait
+
+    >>> pid = execute('import interlocks;a=interlocks.InterProcessLock(name=\\''+test_name+ '\\');a.acquire();')
+
+    >>> lock1.acquire()
+    Traceback (most recent call last):
+    ...
+    SingleInstanceError: Could not acquire exclusive lock on /tmp/test.lck
+
+    >>> os_independent_kill(pid)
+
+    >>> lock1.acquire(True)
+    >>> lock1.release()
+
+    """
+    
+    pass
+
+if __name__=='__main__':
+    import doctest
+    doctest.testmod(optionflags=doctest.IGNORE_EXCEPTION_DETAIL)
diff --git a/pyfpdb/upd_indexes.sql b/pyfpdb/upd_indexes.sql
index e79f4bd4..f652edc4 100755
--- a/pyfpdb/upd_indexes.sql
+++ b/pyfpdb/upd_indexes.sql
@@ -1,27 +1,27 @@
-
-# script to update indexes on mysql (+other?) database
-
-select '1. Dropping indexes' as ' ';
-select 'Can''t drop messages indicate index already gone' as ' ';
-
-ALTER TABLE `fpdb`.`Settings` DROP INDEX `id`;
-ALTER TABLE `fpdb`.`Sites` DROP INDEX `id`;
-ALTER TABLE `fpdb`.`Gametypes` DROP INDEX `id`;
-ALTER TABLE `fpdb`.`Players` DROP INDEX `id`;
-ALTER TABLE `fpdb`.`Autorates` DROP INDEX `id`;
-ALTER TABLE `fpdb`.`Hands` DROP INDEX `id`;
-ALTER TABLE `fpdb`.`BoardCards` DROP INDEX `id`;
-ALTER TABLE `fpdb`.`TourneyTypes` DROP INDEX `id`;
-ALTER TABLE `fpdb`.`Tourneys` DROP INDEX `id`;
-ALTER TABLE `fpdb`.`TourneysPlayers` DROP INDEX `id`;
-ALTER TABLE `fpdb`.`HandsPlayers` DROP INDEX `id`;
-ALTER TABLE `fpdb`.`HandsActions` DROP INDEX `id`;
-ALTER TABLE `fpdb`.`HudCache` DROP INDEX `id`;
-
-select '2. Adding extra indexes on useful fields' as ' ';
-select 'Duplicate key name messages indicate new indexes already there' as ' '; 
-
-ALTER TABLE `fpdb`.`tourneys` ADD INDEX `siteTourneyNo`(`siteTourneyNo`);
-ALTER TABLE `fpdb`.`hands` ADD INDEX `siteHandNo`(`siteHandNo`);
-ALTER TABLE `fpdb`.`players` ADD INDEX `name`(`name`);
-
+
+# script to update indexes on mysql (+other?) database
+
+select '1. Dropping indexes' as ' ';
+select 'Can''t drop messages indicate index already gone' as ' ';
+
+ALTER TABLE `fpdb`.`Settings` DROP INDEX `id`;
+ALTER TABLE `fpdb`.`Sites` DROP INDEX `id`;
+ALTER TABLE `fpdb`.`Gametypes` DROP INDEX `id`;
+ALTER TABLE `fpdb`.`Players` DROP INDEX `id`;
+ALTER TABLE `fpdb`.`Autorates` DROP INDEX `id`;
+ALTER TABLE `fpdb`.`Hands` DROP INDEX `id`;
+ALTER TABLE `fpdb`.`BoardCards` DROP INDEX `id`;
+ALTER TABLE `fpdb`.`TourneyTypes` DROP INDEX `id`;
+ALTER TABLE `fpdb`.`Tourneys` DROP INDEX `id`;
+ALTER TABLE `fpdb`.`TourneysPlayers` DROP INDEX `id`;
+ALTER TABLE `fpdb`.`HandsPlayers` DROP INDEX `id`;
+ALTER TABLE `fpdb`.`HandsActions` DROP INDEX `id`;
+ALTER TABLE `fpdb`.`HudCache` DROP INDEX `id`;
+
+select '2. Adding extra indexes on useful fields' as ' ';
+select 'Duplicate key name messages indicate new indexes already there' as ' '; 
+
+ALTER TABLE `fpdb`.`tourneys` ADD INDEX `siteTourneyNo`(`siteTourneyNo`);
+ALTER TABLE `fpdb`.`hands` ADD INDEX `siteHandNo`(`siteHandNo`);
+ALTER TABLE `fpdb`.`players` ADD INDEX `name`(`name`);
+