From b85f8ec155060a7dbc9c7868f559b2820329ccca Mon Sep 17 00:00:00 2001
From: PassThePeas <stephane.alessio@gmail.com>
Date: Wed, 26 Aug 2009 01:13:34 +0200
Subject: [PATCH 01/10] Some fixes in FTP summary parsing and preparations for
 summary import in DB. No behaviour change expected

	modified:   FulltiltToFpdb.py
	* Tourney Summary File parsing : add support for Madness tourneys
	* HH file parsing : enhance Tourney topline parsing to retrieve some info (HU, Rebuy, KO, Turbo, ...) and store it into Hand object
	modified:   Hand.py
	* Some attributes added to store tourney specific info
	modified:   SQL.py
	* Add a new request (getTourneyTypeIdByTourneyNo) to help finding a tourney already in db (preparation for Tourney Summary import)
	modified:   Tourney.py
	* Attribute tourneyComment added
	modified:   fpdb_parse_logic.py
	* Change parameters in call of fpdb_simple.recogniseTourneyTypeId
	modified:   fpdb_simple.py
	* recogniseTourneyTypeId : signature changed to allow for the search of a tourney id already in db prior to searching for tourneyTypeId
---
 pyfpdb/FulltiltToFpdb.py   | 45 ++++++++++++++++++++++++++++----------
 pyfpdb/Hand.py             |  9 ++++++++
 pyfpdb/SQL.py              |  6 +++++
 pyfpdb/Tourney.py          |  7 +++---
 pyfpdb/fpdb_parse_logic.py |  3 ++-
 pyfpdb/fpdb_simple.py      | 23 ++++++++++++++-----
 6 files changed, 71 insertions(+), 22 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index 30b9cb2d..b8ea378b 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -57,6 +57,13 @@ class Fulltilt(HandHistoryConverter):
                                     (?P<PARTIAL>\(partial\))?\n
                                     (?:.*?\n(?P<CANCELLED>Hand\s\#(?P=HID)\shas\sbeen\scanceled))?
                                  ''', re.VERBOSE|re.DOTALL)
+    re_TourneyExtraInfo  = re.compile('''(((?P<TOURNEY_NAME>[^$]+)?
+                                         (?P<CURRENCY>\$)?(?P<BUYIN>[.0-9]+)?\s*\+\s*\$?(?P<FEE>[.0-9]+)?
+                                         (\s(?P<SPECIAL>(KO|Heads\sUp|Matrix\s\dx|Rebuy|Madness)))?
+                                         (\s(?P<SHOOTOUT>Shootout))?
+                                         (\s(?P<SNG>Sit\s&\sGo))?
+                                         (\s\((?P<TURBO>Turbo)\))?)|(?P<UNREADABLE_INFO>.+))
+                                    ''', re.VERBOSE)
     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_TourneyPlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\$?(?P<CASH>[,.0-9]+)\)', re.MULTILINE)
@@ -66,7 +73,7 @@ class Fulltilt(HandHistoryConverter):
     re_TourneyInfo  = re.compile('''Tournament\sSummary\s
                                     (?P<TOURNAMENT_NAME>[^$(]+)?\s*
                                     ((?P<CURRENCY>\$|)?(?P<BUYIN>[.0-9]+)\s*\+\s*\$?(?P<FEE>[.0-9]+)\s)?
-                                    ((?P<SPECIAL>(KO|Heads\sUp|Matrix\s\dx|Rebuy))\s)?
+                                    ((?P<SPECIAL>(KO|Heads\sUp|Matrix\s\dx|Rebuy|Madness))\s)?
                                     ((?P<SHOOTOUT>Shootout)\s)?
                                     ((?P<SNG>Sit\s&\sGo)\s)?
                                     (\((?P<TURBO1>Turbo)\)\s)?
@@ -202,16 +209,30 @@ class Fulltilt(HandHistoryConverter):
         if m.group('PLAY') != None:
             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")
+        # Done: if there's a way to figure these out, we should.. otherwise we have to stuff it with unknowns
+        if m.group('TOURNAMENT') is not None:
+            n = self.re_TourneyExtraInfo.search(m.group('TOURNAMENT'))
+            if n.group('UNREADABLE_INFO') is not None:
+                hand.tourneyComment = n.group('UNREADABLE_INFO') 
+            else:
+                hand.tourneyComment = n.group('TOURNEY_NAME')   # can be None
+                if (n.group('CURRENCY') is not None and n.group('BUYIN') is not None and n.group('FEE') is not None):
+                    hand.buyin = "%s%s+%s%s" %(n.group('CURRENCY'), n.group('BUYIN'), n.group('CURRENCY'), n.group('FEE'))
+                if n.group('TURBO') is not None :
+                    hand.speed = "Turbo"
+                if n.group('SPECIAL') is not None :
+                    special = n.group('SPECIAL')
+                    if special == "Rebuy":
+                        hand.isRebuy = True
+                    if special == "KO":
+                        hand.isKO = True
+                    if special == "Head's Up":
+                        hand.isHU = True
+                    if re.search("Matrix", special):
+                        hand.isMatrix = True
+                    if special == "Shootout":
+                        hand.isShootout = True
+                 
 
         if hand.buyin == None:
             hand.buyin = "$0.00+$0.00"
@@ -472,6 +493,8 @@ class Fulltilt(HandHistoryConverter):
                 tourney.isMatrix = True
             if special == "Rebuy":
                 tourney.isRebuy = True
+            if special == "Madness":
+                tourney.tourneyComment = "Madness"
         if mg['SHOOTOUT'] is not None:
             tourney.isShootout = True
         if mg['TURBO1'] is not None or mg['TURBO2'] is not None :
diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index 1bfd7aa8..7a95f78a 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -63,6 +63,15 @@ class Hand(object):
         self.fee = None  # the Database code is looking for this one .. ?
         self.level = None
         self.mixed = None
+        # Some attributes for hand from a tourney
+        self.speed = "Normal"
+        self.isRebuy = False
+        self.isKO = False
+        self.isHU = False
+        self.isMatrix = False
+        self.isShootout = False
+        self.tourneyComment = None
+
         self.seating = []
         self.players = []
         self.posted = []
diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index 95bb24cc..25fa1dd3 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -2758,6 +2758,12 @@ class Sql:
             self.query['isAlreadyInDB'] = """SELECT id FROM Hands 
                                              WHERE gametypeId=%s AND siteHandNo=%s
             """
+            
+            self.query['getTourneyTypeIdByTourneyNo'] = """SELECT tt.id 
+                                                        FROM TourneyTypes tt 
+                                                        INNER JOIN Tourneys t ON (t.tourneyTypeId = tt.id) 
+                                                        WHERE t.siteTourneyNo=%s AND tt.siteId=%s
+            """
 
             if db_server == 'mysql':
                 self.query['placeholder'] = u'%s'
diff --git a/pyfpdb/Tourney.py b/pyfpdb/Tourney.py
index 1d8b1eb7..28ae9445 100644
--- a/pyfpdb/Tourney.py
+++ b/pyfpdb/Tourney.py
@@ -46,7 +46,6 @@ class Tourney(object):
 
 
     def __init__(self, sitename, gametype, summaryText, builtFrom = "HHC"):
-        print "Tourney.__init__"
         self.sitename           = sitename
         self.siteId             = self.SITEIDS[sitename]
         self.gametype           = gametype
@@ -82,14 +81,13 @@ class Tourney(object):
         self.totalAddOns        = 0
         self.koBounty           = 0
         self.countKO            = 0     #To use for winnings calculation which is not counted in the rest of the summary file
+        self.tourneyComment     = None
         self.players            = []
 
         # Collections indexed by player names
         self.finishPositions    = {}
         self.winnings           = {}
 
-
-
         # currency symbol for this summary
         self.sym = None
         #self.sym = self.SYMBOL[self.gametype['currency']] # save typing! delete this attr when done
@@ -129,7 +127,8 @@ class Tourney(object):
                  ("TOTAL REBUYS", self.totalRebuys),
                  ("TOTAL ADDONS", self.totalAddOns),
                  ("KO BOUNTY", self.koBounty),
-                 ("NB OF KO", self.countKO)
+                 ("NB OF KO", self.countKO),
+                 ("TOURNEY COMMENT", self.tourneyComment)
         )
  
         structs = ( ("GAMETYPE", self.gametype),
diff --git a/pyfpdb/fpdb_parse_logic.py b/pyfpdb/fpdb_parse_logic.py
index 696f42d2..bd9661c6 100644
--- a/pyfpdb/fpdb_parse_logic.py
+++ b/pyfpdb/fpdb_parse_logic.py
@@ -67,7 +67,8 @@ def mainParser(settings, siteID, category, hand, config, db = None, writeq = Non
         tourneyStartTime= handStartTime #todo: read tourney start time
         rebuyOrAddon    = fpdb_simple.isRebuyOrAddon(hand[0])
 
-        tourneyTypeId   = fpdb_simple.recogniseTourneyTypeId(db.get_cursor(), siteID, buyin, fee, knockout, rebuyOrAddon)
+        ## The tourney site id has to be searched because it may already be in db with a TourneyTypeId which is different from the one automatically calculated (Summary import first) 
+        tourneyTypeId   = fpdb_simple.recogniseTourneyTypeId(db, siteID, siteTourneyNo, buyin, fee, knockout, rebuyOrAddon)
     else:
         siteTourneyNo   = -1
         buyin           = -1
diff --git a/pyfpdb/fpdb_simple.py b/pyfpdb/fpdb_simple.py
index 086f2bbb..f11828c9 100644
--- a/pyfpdb/fpdb_simple.py
+++ b/pyfpdb/fpdb_simple.py
@@ -954,17 +954,28 @@ def recogniseGametypeID(backend, db, cursor, topline, smallBlindLine, site_id, c
     return result[0]
 #end def recogniseGametypeID
  
-def recogniseTourneyTypeId(cursor, siteId, buyin, fee, knockout, rebuyOrAddon):
-    cursor.execute ("SELECT id FROM TourneyTypes WHERE siteId=%s AND buyin=%s AND fee=%s AND knockout=%s AND rebuyOrAddon=%s", (siteId, buyin, fee, knockout, rebuyOrAddon))
+def recogniseTourneyTypeId(db, siteId, tourneySiteId, buyin, fee, knockout, rebuyOrAddon):
+    cursor = db.get_cursor()
+    # First we try to find the tourney itself (by its tourneySiteId) in case it has already been inserted before (by a summary file for instance)
+    # The reason is that some tourneys may not be identified correctly in the HH toplines (especially Buy-In and Fee which are used to search/create the TourneyTypeId)
+    #TODO: When the summary file will be dumped to BD, if the tourney is already in, Buy-In/Fee may need an update (e.g. creation of a new type and link to the Tourney)
+    cursor.execute (db.sql.query['getTourneyTypeIdByTourneyNo'].replace('%s', db.sql.query['placeholder']), (tourneySiteId, siteId))
     result=cursor.fetchone()
-    #print "tried SELECTing gametypes.id, result:",result
     
     try:
         len(result)
-    except TypeError:#this means we need to create a new entry
-        cursor.execute("""INSERT INTO TourneyTypes (siteId, buyin, fee, knockout, rebuyOrAddon) VALUES (%s, %s, %s, %s, %s)""", (siteId, buyin, fee, knockout, rebuyOrAddon))
-        cursor.execute("SELECT id FROM TourneyTypes WHERE siteId=%s AND buyin=%s AND fee=%s AND knockout=%s AND rebuyOrAddon=%s", (siteId, buyin, fee, knockout, rebuyOrAddon))
+    except:
+        cursor.execute ("SELECT id FROM TourneyTypes WHERE siteId=%s AND buyin=%s AND fee=%s AND knockout=%s AND rebuyOrAddon=%s", (siteId, buyin, fee, knockout, rebuyOrAddon))
         result=cursor.fetchone()
+        #print "tried SELECTing gametypes.id, result:",result
+    
+        try:
+            len(result)
+        except TypeError:#this means we need to create a new entry
+            cursor.execute("""INSERT INTO TourneyTypes (siteId, buyin, fee, knockout, rebuyOrAddon) VALUES (%s, %s, %s, %s, %s)""", (siteId, buyin, fee, knockout, rebuyOrAddon))
+            cursor.execute("SELECT id FROM TourneyTypes WHERE siteId=%s AND buyin=%s AND fee=%s AND knockout=%s AND rebuyOrAddon=%s", (siteId, buyin, fee, knockout, rebuyOrAddon))
+            result=cursor.fetchone()
+            
     return result[0]
 #end def recogniseTourneyTypeId
  

From 0217e2320cab6708fe7ba9c7a6016a3a242c0b76 Mon Sep 17 00:00:00 2001
From: PassThePeas <stephane.alessio@gmail.com>
Date: Thu, 27 Aug 2009 01:41:04 +0200
Subject: [PATCH 02/10] DB Model changes to prepare for Tourney Summary import

	modified:   Database.py
		* fillDefaultData : queries that inserts the default line into TourneyTypes rewritten (simplified to take into account the columns that have "new" DEFAULT attribute)
	modified:   SQL.py
		* createTourneyTypesTable query modified : some existing columns are now created with a default values, new columns added
		* createTourneysTable query modified : new columns added
		* createTourneysPlayersTable query modified : new columns added
---
 pyfpdb/Database.py |  8 ++----
 pyfpdb/SQL.py      | 69 ++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 060c8dd7..e8f79c5b 100755
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -964,12 +964,10 @@ class Database:
         c.execute("INSERT INTO Sites (name,currency) VALUES ('Absolute', 'USD')")
         c.execute("INSERT INTO Sites (name,currency) VALUES ('PartyPoker', 'USD')")
         if self.backend == self.SQLITE:
-            c.execute("INSERT INTO TourneyTypes VALUES (NULL, 1, 0, 0, 0, 0);")
+            c.execute("INSERT INTO TourneyTypes (id, siteId, buyin, fee) VALUES (NULL, 1, 0, 0);")
         else:
-            c.execute("INSERT INTO TourneyTypes VALUES (DEFAULT, 1, 0, 0, 0, False);")
-        #c.execute("""INSERT INTO TourneyTypes
-        #          (siteId,buyin,fee,knockout,rebuyOrAddon) VALUES
-        #          (1,0,0,0,?)""",(False,) )
+            c.execute("INSERT INTO TourneyTypes (siteId, buyin, fee) VALUES (1, 0, 0);")
+            
     #end def fillDefaultData
 
     def rebuild_hudcache(self):
diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index 25fa1dd3..19fbbf14 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -325,8 +325,14 @@ class Sql:
                                 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)
+                                maxSeats INT NOT NULL DEFAULT -1,
+                                knockout BOOLEAN NOT NULL DEFAULT False,
+                                rebuyOrAddon BOOLEAN NOT NULL DEFAULT False,
+                                speed varchar(10),
+                                headsUp BOOLEAN NOT NULL DEFAULT False,
+                                shootout BOOLEAN NOT NULL DEFAULT False,
+                                matrix BOOLEAN NOT NULL DEFAULT False
+                                )
                             ENGINE=INNODB"""
             elif db_server == 'postgresql':
                 self.query['createTourneyTypesTable'] = """CREATE TABLE TourneyTypes (
@@ -334,16 +340,28 @@ class Sql:
                             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)"""
+                            maxSeats INT NOT NULL DEFAULT -1,
+                            knockout BOOLEAN NOT NULL DEFAULT False,
+                            rebuyOrAddon BOOLEAN NOT NULL DEFAULT False,
+                            speed varchar(10),
+                            headsUp BOOLEAN NOT NULL DEFAULT False,
+                            shootout BOOLEAN NOT NULL DEFAULT False,
+                            matrix BOOLEAN NOT NULL DEFAULT False
+                            )"""
             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)"""
+                            maxSeats INT NOT NULL DEFAULT -1,
+                            knockout BOOLEAN NOT NULL DEFAULT 0,
+                            rebuyOrAddon BOOLEAN NOT NULL DEFAULT 0,
+                            speed TEXT,
+                            headsUp BOOLEAN NOT NULL DEFAULT 0,
+                            shootout BOOLEAN NOT NULL DEFAULT 0,
+                            matrix BOOLEAN NOT NULL DEFAULT 0
+                            )"""
 
             ################################
             # Create Tourneys
@@ -357,6 +375,17 @@ class Sql:
                             entries INT NOT NULL,
                             prizepool INT NOT NULL,
                             startTime DATETIME NOT NULL,
+                            endTime DATETIME,
+                            buyinChips INT,
+                            tourneyName varchar(20),
+                            matrixIdProcessed TINYINT UNSIGNED DEFAULT 0,    /* Mask use : 1=Positionnal Winnings|2=Match1|4=Match2|...|pow(2,n)=Matchn */
+                            rebuyChips INT DEFAULT 0,
+                            addonChips INT DEFAULT 0,
+                            rebuyAmount INT DEFAULT 0,
+                            addonAmount INT DEFAULT 0,
+                            totalRebuys INT DEFAULT 0,
+                            totalAddons INT DEFAULT 0,
+                            koBounty INT DEFAULT 0,
                             comment TEXT,
                             commentTs DATETIME)
                             ENGINE=INNODB"""
@@ -368,6 +397,17 @@ class Sql:
                             entries INT,
                             prizepool INT,
                             startTime timestamp without time zone,
+                            endTime timestamp without time zone,
+                            buyinChips INT,
+                            tourneyName varchar(20),
+                            matrixIdProcessed SMALLINT UNSIGNED DEFAULT 0,    /* Mask use : 1=Positionnal Winnings|2=Match1|4=Match2|...|pow(2,n)=Matchn */
+                            rebuyChips INT DEFAULT 0,
+                            addonChips INT DEFAULT 0,
+                            rebuyAmount INT DEFAULT 0,
+                            addonAmount INT DEFAULT 0,
+                            totalRebuys INT DEFAULT 0,
+                            totalAddons INT DEFAULT 0,
+                            koBounty INT DEFAULT 0,
                             comment TEXT,
                             commentTs timestamp without time zone)"""
             elif db_server == 'sqlite':
@@ -378,6 +418,17 @@ class Sql:
                             entries INT,
                             prizepool INT,
                             startTime REAL,
+                            endTime REAL,
+                            buyinChips INT,
+                            tourneyName TEXT,
+                            matrixIdProcessed INT UNSIGNED DEFAULT 0,    /* Mask use : 1=Positionnal Winnings|2=Match1|4=Match2|...|pow(2,n)=Matchn */
+                            rebuyChips INT DEFAULT 0,
+                            addonChips INT DEFAULT 0,
+                            rebuyAmount INT DEFAULT 0,
+                            addonAmount INT DEFAULT 0,
+                            totalRebuys INT DEFAULT 0,
+                            totalAddons INT DEFAULT 0,
+                            koBounty INT DEFAULT 0,
                             comment TEXT,
                             commentTs REAL)"""
             ################################
@@ -749,6 +800,9 @@ class Sql:
                             payinAmount INT NOT NULL,
                             rank INT NOT NULL,
                             winnings INT NOT NULL,
+                            nbRebuys INT DEFAULT 0,
+                            nbAddons INT DEFAULT 0,
+                            nbKO INT DEFAULT 0,
                             comment TEXT,
                             commentTs DATETIME)
                             ENGINE=INNODB"""
@@ -760,6 +814,9 @@ class Sql:
                             payinAmount INT,
                             rank INT,
                             winnings INT,
+                            nbRebuys INT DEFAULT 0,
+                            nbAddons INT DEFAULT 0,
+                            nbKO INT DEFAULT 0,
                             comment TEXT,
                             commentTs timestamp without time zone)"""
             elif db_server == 'sqlite':

From 3323d25ce7b40a07a3be1136a82eb087fdbcbe5d Mon Sep 17 00:00:00 2001
From: PassThePeas <stephane.alessio@gmail.com>
Date: Mon, 31 Aug 2009 01:30:28 +0200
Subject: [PATCH 03/10] Patch for handsplayers.tourneyTypeId and preparation
 for Tourney import

	modified:   Database.py
		* correct the HandsPlayers.tourneyTypeId entry (null for omaha/he ring games, correct value instead of 1 or null for omaha/he & stud tourneys)
		* add prototypes and description of new methods to store Tourneys info
	modified:   Tourney.py
		* add calls to new methods in Tourney.insert
---
 pyfpdb/Database.py | 53 ++++++++++++++++++++++++++++++++++++----------
 pyfpdb/Tourney.py  | 10 +++++++++
 2 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index e8f79c5b..6b168514 100755
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -42,6 +42,7 @@ import fpdb_simple
 import Configuration
 import SQL
 import Card
+import Tourney
 
 class Database:
 
@@ -584,7 +585,7 @@ class Database:
         hands_players_ids = self.store_hands_players_holdem_omaha_tourney(
                           self.backend, category, hands_id, player_ids, start_cashes, positions
                         , card_values, card_suits, winnings, rakes, seatNos, tourneys_players_ids
-                        , hudImportData)
+                        , hudImportData, tourneyTypeId)
 
         #print "tourney holdem, backend=%d" % backend
         if 'dropHudCache' not in settings or settings['dropHudCache'] != 'drop':
@@ -612,7 +613,7 @@ class Database:
 
         hands_players_ids = self.store_hands_players_stud_tourney(self.backend, hands_id
                                                  , playerIds, startCashes, antes, cardValues, cardSuits
-                                                 , winnings, rakes, seatNos, tourneys_players_ids)
+                                                 , winnings, rakes, seatNos, tourneys_players_ids, tourneyTypeId)
 
         if 'dropHudCache' not in settings or settings['dropHudCache'] != 'drop':
             self.storeHudCache(self.backend, base, category, gametypeId, hand_start_time, playerIds, hudImportData)
@@ -1281,7 +1282,7 @@ class Database:
                     raise fpdb_simple.FpdbError("invalid category")
 
                 inserts.append( (
-                                 hands_id, player_ids[i], start_cashes[i], positions[i], 1, # tourneytypeid
+                                 hands_id, player_ids[i], start_cashes[i], positions[i],
                                  card1, card2, card3, card4, startCards,
                                  winnings[i], rakes[i], seatNos[i], hudCache['totalProfit'][i],
                                  hudCache['street0VPI'][i], hudCache['street0Aggr'][i], 
@@ -1312,7 +1313,7 @@ class Database:
             c = self.get_cursor()
             c.executemany ("""
         INSERT INTO HandsPlayers
-        (handId, playerId, startCash, position, tourneyTypeId,
+        (handId, playerId, startCash, position,
          card1, card2, card3, card4, startCards, winnings, rake, seatNo, totalProfit,
          street0VPI, street0Aggr, street0_3BChance, street0_3BDone,
          street1Seen, street2Seen, street3Seen, street4Seen, sawShowdown,
@@ -1333,7 +1334,7 @@ class Database:
         VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,
          %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,
          %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, 
-         %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)""".replace('%s', self.sql.query['placeholder'])
+         %s, %s, %s, %s, %s, %s, %s, %s, %s)""".replace('%s', self.sql.query['placeholder'])
                                           ,inserts )
             result.append( self.get_last_insert_id(c) ) # wrong? not used currently
         except:
@@ -1383,7 +1384,7 @@ class Database:
     def store_hands_players_holdem_omaha_tourney(self, backend, category, hands_id, player_ids
                                                 ,start_cashes, positions, card_values, card_suits
                                                 ,winnings, rakes, seatNos, tourneys_players_ids
-                                                ,hudCache):
+                                                ,hudCache, tourneyTypeId):
         #stores hands_players for tourney holdem/omaha hands
 
         try:
@@ -1405,7 +1406,7 @@ class Database:
                 else:
                     raise FpdbError ("invalid card_values length:"+str(len(card_values[0])))
 
-                inserts.append( (hands_id, player_ids[i], start_cashes[i], positions[i], 1, # tourneytypeid
+                inserts.append( (hands_id, player_ids[i], start_cashes[i], positions[i], tourneyTypeId,
                                  card1, card2, card3, card4, startCards,
                                  winnings[i], rakes[i], tourneys_players_ids[i], seatNos[i], hudCache['totalProfit'][i],
                                  hudCache['street0VPI'][i], hudCache['street0Aggr'][i], 
@@ -1474,7 +1475,7 @@ class Database:
     #end def store_hands_players_holdem_omaha_tourney
      
     def store_hands_players_stud_tourney(self, backend, hands_id, player_ids, start_cashes,
-                antes, card_values, card_suits, winnings, rakes, seatNos, tourneys_players_ids):
+                antes, card_values, card_suits, winnings, rakes, seatNos, tourneys_players_ids, tourneyTypeId):
         #stores hands_players for tourney stud/razz hands
 
         try:
@@ -1486,14 +1487,14 @@ class Database:
         card1Value, card1Suit, card2Value, card2Suit,
         card3Value, card3Suit, card4Value, card4Suit,
         card5Value, card5Suit, card6Value, card6Suit,
-        card7Value, card7Suit, winnings, rake, tourneysPlayersId, seatNo)
+        card7Value, card7Suit, winnings, rake, tourneysPlayersId, seatNo, tourneyTypeId)
         VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,
-        %s, %s, %s, %s, %s, %s)""".replace('%s', self.sql.query['placeholder']),
+        %s, %s, %s, %s, %s, %s, %s)""".replace('%s', self.sql.query['placeholder']),
                 (hands_id, player_ids[i], start_cashes[i], antes[i],
                 card_values[i][0], card_suits[i][0], card_values[i][1], card_suits[i][1],
                 card_values[i][2], card_suits[i][2], card_values[i][3], card_suits[i][3],
                 card_values[i][4], card_suits[i][4], card_values[i][5], card_suits[i][5],
-                card_values[i][6], card_suits[i][6], winnings[i], rakes[i], tourneys_players_ids[i], seatNos[i]))
+                card_values[i][6], card_suits[i][6], winnings[i], rakes[i], tourneys_players_ids[i], seatNos[i], tourneyTypeId))
                 #cursor.execute("SELECT id FROM HandsPlayers WHERE handId=%s AND playerId+0=%s", (hands_id, player_ids[i]))
                 #result.append(cursor.fetchall()[0][0])
                 result.append( self.get_last_insert_id(c) )
@@ -1832,6 +1833,36 @@ class Database:
             print "***Error sending finish: "+err[2]+"("+str(err[1])+"): "+str(sys.exc_info()[1])
     # end def send_finish_msg():
 
+    def tRecogniseTourneyType(self, tourney):
+        print "Database.tRecogniseTourneyType"
+        typeId = 1
+        # Check for an existing TTypeId that matches tourney info (buyin/fee, knockout, rebuy, speed, matrix, shootout)
+        # if not found create it
+        
+        # Checks for an existing tourney with tourney.siteId and tourney.tourNo (and get the tourneyTypeId)
+        # if the two TTypeId don't match, update the Tourneys.tourneyTypeId
+        return typeId
+        
+    def tRecognizeTourney(self, tourney, dbTourneyTypeId):
+        print "Database.tRecognizeTourney"
+        tourneyID = 1
+        # Check if tourney exists in db (based on tourney.siteId and tourney.tourNo)
+        # If not => create it with the tourneyTypeId given as input
+        # if found => retrieve data (in the first query) and check if an update is needed, if so do it
+        # rem : Tourney Specific data = entries, prizepool, buyinchips, rebuychips, addonchips, totalrebuys, totaladdons, kobounty
+        return tourneyID
+
+    def tStoreTourneyPlayers(self, tourney, dbTourneyId):
+        print "Database.tStoreTourneyPlayers"
+        tourneyPlayersIds=[]
+        # Look for existing players in TourneysPlayers
+        # For the ones not in db insert with all data (nbrebuys, nbaddons, nbKO, payinAmount, rank, winnings)
+        # For the others, get data and check if an update is needed, if so, do it
+        return tourneyPlayersIds
+        
+    def tCheckTourneysHandsPlayers(self, tourney, dbTourneysPlayersIds, dbTourneyTypeId):
+        print "Database.tCheckTourneysHandsPlayers"
+        # Make a direct update of lines from HandsPlayers where touneyplayersid=<input> and tourneyTypeId <> dbTourneyTypeId, set tourneyTypeId=dbTourneyTypeId  
 
 # Class used to hold all the data needed to write a hand to the db
 # mainParser() in fpdb_parse_logic.py creates one of these and then passes it to 
diff --git a/pyfpdb/Tourney.py b/pyfpdb/Tourney.py
index 28ae9445..12026d78 100644
--- a/pyfpdb/Tourney.py
+++ b/pyfpdb/Tourney.py
@@ -162,6 +162,16 @@ class Tourney(object):
         # Starttime may not match the one in the Summary file : HH = time of the first Hand / could be slighltly different from the one in the summary file
         # Note: If the TourneyNo could be a unique id .... this would really be a relief to deal with matrix matches ==> Ask on the IRC / Ask Fulltilt ??
         
+        dbTourneyTypeId = db.tRecogniseTourneyType(self)
+        print "Tourney Type ID = %d" % dbTourneyTypeId
+        dbTourneyId = db.tRecognizeTourney(self, dbTourneyTypeId)
+        print "Tourney ID = %d" % dbTourneyId
+        dbTourneysPlayersIds = db.tStoreTourneyPlayers(self, dbTourneyId)
+        db.tCheckTourneysHandsPlayers(self, dbTourneysPlayersIds, dbTourneyTypeId)
+        
+        # TO DO : Return what has been done (tourney created, updated, nothing)
+        # ?? stored = 1 if tourney is fully created / duplicates = 1, if everything was already here and correct / partial=1 if some things were already here (between tourney, tourneyPlayers and handsplayers)
+        # if so, prototypes may need changes to know what has been done
         stored = 0
         duplicates = 0
         partial = 0

From b00a58249f08c9ab52147ddc643a0ba6fe29453b Mon Sep 17 00:00:00 2001
From: PassThePeas <stephane.alessio@gmail.com>
Date: Tue, 1 Sep 2009 02:35:52 +0200
Subject: [PATCH 04/10] Tourney import : tRecogniseTourneyType implemented

	modified:   Database.py
	* tRecogniseTourneyType : implemented
	modified:   FulltiltToFpdb.py
	* buyin, fee, rebuyAmount, addOnAmount : converted using fpdb_simple.float2int
	modified:   SQL.py
	* Added queries for Database.tRecogniseTourneyType (getTourneyTypeIdByTourneyNo modified to return all data, getTourneyTypeId and insertTourneyTypes added)
---
 pyfpdb/Database.py       | 57 +++++++++++++++++++++++++++++++++++-----
 pyfpdb/FulltiltToFpdb.py | 26 ++++++++++--------
 pyfpdb/SQL.py            | 29 +++++++++++++++++++-
 3 files changed, 94 insertions(+), 18 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 6b168514..cfd1317d 100755
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -1836,12 +1836,57 @@ class Database:
     def tRecogniseTourneyType(self, tourney):
         print "Database.tRecogniseTourneyType"
         typeId = 1
-        # Check for an existing TTypeId that matches tourney info (buyin/fee, knockout, rebuy, speed, matrix, shootout)
-        # if not found create it
+        # Check if Tourney exists, and if so retrieve TTypeId : in that case, check values of the ttype
+        cursor = self.get_cursor()
+        cursor.execute (self.sql.query['getTourneyTypeIdByTourneyNo'].replace('%s', self.sql.query['placeholder']),
+                        (tourney.tourNo, tourney.siteId)
+                        )
+        result=cursor.fetchone()
+
+        expectedValues = { 1 : "buyin", 2 : "fee", 4 : "isKO", 5 : "isRebuy", 6 : "speed", 
+                           7 : "isHU", 8 : "isShootout", 9 : "isMatrix" }
+        typeIdMatch = True
+
+        try:
+            len(result)
+            typeId = result[0]
+            print "Tourney found in db with Tourney_Type_ID = %d" % typeId
+            for ev in expectedValues :
+                print "ev : %s" % ev
+                if ( getattr( tourney, expectedValues.get(ev) ) <> result[ev] ):
+                    print "TypeId mismatch : wrong %s : Tourney=%s / db=%s" % (expectedValues.get(ev), getattr( tourney, expectedValues.get(ev)), result[ev] )
+                    typeIdMatch = False
+                    #break
+        except:
+            # Tourney not found : a TourneyTypeId has to be found or created for that specific tourney
+            typeIdMatch = False
+    
+        if typeIdMatch == False :
+            # Check for an existing TTypeId that matches tourney info (buyin/fee, knockout, rebuy, speed, matrix, shootout)
+            # if not found create it
+            print "Searching for a TourneyTypeId matching TourneyType data"
+            cursor.execute (self.sql.query['getTourneyTypeId'].replace('%s', self.sql.query['placeholder']), 
+                            (tourney.siteId, tourney.buyin, tourney.fee, tourney.isKO,
+                             tourney.isRebuy, tourney.speed, tourney.isHU, tourney.isShootout, tourney.isMatrix)
+                            )
+            result=cursor.fetchone()
+            #print "tried SELECTing gametypes.id, result:",result
         
-        # Checks for an existing tourney with tourney.siteId and tourney.tourNo (and get the tourneyTypeId)
-        # if the two TTypeId don't match, update the Tourneys.tourneyTypeId
-        return typeId
+            try:
+                len(result)
+                typeId = result[0]
+                print "Existing Tourney Type Id found : %d" % typeId
+            except TypeError: #this means we need to create a new entry
+                print "Tourney Type Id not found : create one"
+                cursor.execute (self.sql.query['insertTourneyTypes'].replace('%s', self.sql.query['placeholder']),
+                                (tourney.siteId, tourney.buyin, tourney.fee, tourney.isKO, tourney.isRebuy,
+                                 tourney.speed, tourney.isHU, tourney.isShootout, tourney.isMatrix)
+                                )
+                typeId = self.get_last_insert_id(cursor)
+
+        return typeId            
+    #end def tRecogniseTourneyType
+
         
     def tRecognizeTourney(self, tourney, dbTourneyTypeId):
         print "Database.tRecognizeTourney"
@@ -1849,7 +1894,7 @@ class Database:
         # Check if tourney exists in db (based on tourney.siteId and tourney.tourNo)
         # If not => create it with the tourneyTypeId given as input
         # if found => retrieve data (in the first query) and check if an update is needed, if so do it
-        # rem : Tourney Specific data = entries, prizepool, buyinchips, rebuychips, addonchips, totalrebuys, totaladdons, kobounty
+        # rem : Tourney Specific data = tourneyTypeId, entries, prizepool, buyinchips, rebuychips, addonchips, totalrebuys, totaladdons, kobounty
         return tourneyID
 
     def tStoreTourneyPlayers(self, tourney, dbTourneyId):
diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index b8ea378b..bebb9406 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -20,6 +20,7 @@
 
 import sys
 import logging
+import fpdb_simple
 from HandHistoryConverter import *
 
 # Fulltilt HH Format converter
@@ -475,10 +476,10 @@ class Fulltilt(HandHistoryConverter):
 
         # Additional info can be stored in the tourney object
         if mg['BUYIN'] is not None:
-            tourney.buyin = mg['BUYIN']
+            tourney.buyin = fpdb_simple.float2int(mg['BUYIN'])
             tourney.fee = 0
         if mg['FEE'] is not None:
-            tourney.fee = mg['FEE']
+            tourney.fee = fpdb_simple.float2int(mg['FEE'])
         if mg['TOURNAMENT_NAME'] is not None:
             # Tournament Name can have a trailing space at the end (depending on the tournament description)
             tourney.tourneyName = mg['TOURNAMENT_NAME'].rstrip()
@@ -523,24 +524,24 @@ class Fulltilt(HandHistoryConverter):
             mg = m.groupdict()
             if tourney.isMatrix :
                 if mg['BUYIN'] is not None:
-                    tourney.subTourneyBuyin = mg['BUYIN']
+                    tourney.subTourneyBuyin = fpdb_simple.float2int(mg['BUYIN'])
                     tourney.subTourneyFee = 0
                 if mg['FEE'] is not None:
-                    tourney.subTourneyFee = mg['FEE']
+                    tourney.subTourneyFee = fpdb_simple.float2int(mg['FEE'])
             else :
                 if mg['BUYIN'] is not None:
                     if tourney.buyin is None:
-                        tourney.buyin = mg['BUYIN']
+                        tourney.buyin = fpdb_simple.float2int(mg['BUYIN'])
                     else :
-                        if mg['BUYIN'] != tourney.buyin:
-                            log.error( "Conflict between buyins read in topline (%s) and in BuyIn field (%s)" % (touney.buyin, mg['BUYIN']) )
-                            tourney.subTourneyBuyin = mg['BUYIN']
+                        if fpdb_simple.float2int(mg['BUYIN']) != tourney.buyin:
+                            log.error( "Conflict between buyins read in topline (%s) and in BuyIn field (%s)" % (touney.buyin, fpdb_simple.float2int(mg['BUYIN'])) )
+                            tourney.subTourneyBuyin = fpdb_simple.float2int(mg['BUYIN'])
                 if mg['FEE'] is not None:
                     if tourney.fee is None:
-                        tourney.fee = mg['FEE']
+                        tourney.fee = fpdb_simple.float2int(mg['FEE'])
                     else :
-                        if mg['FEE'] != tourney.fee:
-                            log.error( "Conflict between fees read in topline (%s) and in BuyIn field (%s)" % (touney.fee, mg['FEE']) )
+                        if fpdb_simple.float2int(mg['FEE']) != tourney.fee:
+                            log.error( "Conflict between fees read in topline (%s) and in BuyIn field (%s)" % (touney.fee, fpdb_simple.float2int(mg['FEE'])) )
                             tourney.subTourneyFee = mg['FEE']
 
         if tourney.buyin is None:
@@ -596,6 +597,9 @@ class Fulltilt(HandHistoryConverter):
         if mg['IN_PROGRESS'] is not None or mg['ENDTIME'] is not None:
             # Assign endtime to tourney (if None, that's ok, it's because the tourney wans't over over when the summary file was produced)
             tourney.endtime = mg['ENDTIME']
+            
+        tourney.rebuyAmount = fpdb_simple.float2int("%s" % tourney.rebuyAmount)
+        tourney.addOnAmount = fpdb_simple.float2int("%s" % tourney.addOnAmount)
         #print mg
 
         return True
diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index 19fbbf14..7bed9144 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -2816,11 +2816,38 @@ class Sql:
                                              WHERE gametypeId=%s AND siteHandNo=%s
             """
             
-            self.query['getTourneyTypeIdByTourneyNo'] = """SELECT tt.id 
+            self.query['getTourneyTypeIdByTourneyNo'] = """SELECT tt.id,
+                                                                  tt.buyin,
+                                                                  tt.fee,
+                                                                  tt.maxSeats,
+                                                                  tt.knockout,
+                                                                  tt.rebuyOrAddon,
+                                                                  tt.speed,
+                                                                  tt.headsUp,
+                                                                  tt.shootout,
+                                                                  tt.matrix
                                                         FROM TourneyTypes tt 
                                                         INNER JOIN Tourneys t ON (t.tourneyTypeId = tt.id) 
                                                         WHERE t.siteTourneyNo=%s AND tt.siteId=%s
             """
+            
+            self.query['getTourneyTypeId'] = """SELECT  id
+                                                FROM TourneyTypes
+                                                WHERE siteId=%s
+                                                AND buyin=%s
+                                                AND fee=%s
+                                                AND knockout=%s
+                                                AND rebuyOrAddon=%s
+                                                AND speed=%s
+                                                AND headsUp=%s
+                                                AND shootout=%s
+                                                AND matrix=%s
+            """
+            self.query['insertTourneyTypes'] = """INSERT INTO TourneyTypes
+                                                      (siteId, buyin, fee, knockout, rebuyOrAddon
+                                                      ,speed, headsUp, shootout, matrix)
+                                                  VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s)
+            """
 
             if db_server == 'mysql':
                 self.query['placeholder'] = u'%s'

From 4a0b2274f806864ec62b0fb8702558fe7fabfc73 Mon Sep 17 00:00:00 2001
From: PassThePeas <stephane.alessio@gmail.com>
Date: Tue, 1 Sep 2009 23:46:46 +0200
Subject: [PATCH 05/10] Tourney parsing : Use of "Decimal" insted of float2int
 / Handle amounts in cents four Tourney Object

---
 pyfpdb/FulltiltToFpdb.py | 39 ++++++++++++++++++++-------------------
 pyfpdb/Tourney.py        |  3 +--
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index bebb9406..e0d9c402 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -20,7 +20,6 @@
 
 import sys
 import logging
-import fpdb_simple
 from HandHistoryConverter import *
 
 # Fulltilt HH Format converter
@@ -476,10 +475,10 @@ class Fulltilt(HandHistoryConverter):
 
         # Additional info can be stored in the tourney object
         if mg['BUYIN'] is not None:
-            tourney.buyin = fpdb_simple.float2int(mg['BUYIN'])
-            tourney.fee = 0
+            tourney.buyin = 100*Decimal(re.sub(u',', u'', "%s" % mg['BUYIN']))
+            tourney.fee = 0 
         if mg['FEE'] is not None:
-            tourney.fee = fpdb_simple.float2int(mg['FEE'])
+            tourney.fee = 100*Decimal(re.sub(u',', u'', "%s" % mg['FEE']))
         if mg['TOURNAMENT_NAME'] is not None:
             # Tournament Name can have a trailing space at the end (depending on the tournament description)
             tourney.tourneyName = mg['TOURNAMENT_NAME'].rstrip()
@@ -524,25 +523,25 @@ class Fulltilt(HandHistoryConverter):
             mg = m.groupdict()
             if tourney.isMatrix :
                 if mg['BUYIN'] is not None:
-                    tourney.subTourneyBuyin = fpdb_simple.float2int(mg['BUYIN'])
+                    tourney.subTourneyBuyin = 100*Decimal(re.sub(u',', u'', "%s" % mg['BUYIN']))
                     tourney.subTourneyFee = 0
                 if mg['FEE'] is not None:
-                    tourney.subTourneyFee = fpdb_simple.float2int(mg['FEE'])
+                    tourney.subTourneyFee = 100*Decimal(re.sub(u',', u'', "%s" % mg['FEE']))
             else :
                 if mg['BUYIN'] is not None:
                     if tourney.buyin is None:
-                        tourney.buyin = fpdb_simple.float2int(mg['BUYIN'])
+                        tourney.buyin = 100*Decimal(re.sub(u',', u'', "%s" % mg['BUYIN']))
                     else :
-                        if fpdb_simple.float2int(mg['BUYIN']) != tourney.buyin:
-                            log.error( "Conflict between buyins read in topline (%s) and in BuyIn field (%s)" % (touney.buyin, fpdb_simple.float2int(mg['BUYIN'])) )
-                            tourney.subTourneyBuyin = fpdb_simple.float2int(mg['BUYIN'])
+                        if 100*Decimal(re.sub(u',', u'', "%s" % mg['BUYIN'])) != tourney.buyin:
+                            log.error( "Conflict between buyins read in topline (%s) and in BuyIn field (%s)" % (touney.buyin, 100*Decimal(re.sub(u',', u'', "%s" % mg['BUYIN']))) )
+                            tourney.subTourneyBuyin = 100*Decimal(re.sub(u',', u'', "%s" % mg['BUYIN']))
                 if mg['FEE'] is not None:
                     if tourney.fee is None:
-                        tourney.fee = fpdb_simple.float2int(mg['FEE'])
+                        tourney.fee = 100*Decimal(re.sub(u',', u'', "%s" % mg['FEE']))
                     else :
-                        if fpdb_simple.float2int(mg['FEE']) != tourney.fee:
-                            log.error( "Conflict between fees read in topline (%s) and in BuyIn field (%s)" % (touney.fee, fpdb_simple.float2int(mg['FEE'])) )
-                            tourney.subTourneyFee = mg['FEE']
+                        if 100*Decimal(re.sub(u',', u'', "%s" % mg['FEE'])) != tourney.fee:
+                            log.error( "Conflict between fees read in topline (%s) and in BuyIn field (%s)" % (touney.fee, 100*Decimal(re.sub(u',', u'', "%s" % mg['FEE']))) )
+                            tourney.subTourneyFee = 100*Decimal(re.sub(u',', u'', "%s" % mg['FEE']))
 
         if tourney.buyin is None:
             log.info( "Unable to affect a buyin to this tournament : assume it's a freeroll" )
@@ -597,11 +596,13 @@ class Fulltilt(HandHistoryConverter):
         if mg['IN_PROGRESS'] is not None or mg['ENDTIME'] is not None:
             # Assign endtime to tourney (if None, that's ok, it's because the tourney wans't over over when the summary file was produced)
             tourney.endtime = mg['ENDTIME']
-            
-        tourney.rebuyAmount = fpdb_simple.float2int("%s" % tourney.rebuyAmount)
-        tourney.addOnAmount = fpdb_simple.float2int("%s" % tourney.addOnAmount)
-        #print mg
 
+        # Deal with money amounts
+        tourney.koBounty    = 100*Decimal(re.sub(u',', u'', "%s" % tourney.koBounty))
+        tourney.prizepool   = 100*Decimal(re.sub(u',', u'', "%s" % tourney.prizepool))
+        tourney.rebuyAmount = 100*Decimal(re.sub(u',', u'', "%s" % tourney.rebuyAmount))
+        tourney.addOnAmount = 100*Decimal(re.sub(u',', u'', "%s" % tourney.addOnAmount))
+        #print mg
         return True
 
     def getPlayersPositionsAndWinnings(self, tourney):
@@ -617,7 +618,7 @@ class Fulltilt(HandHistoryConverter):
                     rank = Decimal(a.group('RANK'))
 
                 if a.group('WINNING') is not None:
-                    winnings = a.group('WINNING')
+                    winnings = 100*Decimal(re.sub(u',', u'', "%s" % a.group('WINNING')))
                 else:
                     winnings = "0"
 
diff --git a/pyfpdb/Tourney.py b/pyfpdb/Tourney.py
index 12026d78..1c2cb365 100644
--- a/pyfpdb/Tourney.py
+++ b/pyfpdb/Tourney.py
@@ -260,10 +260,9 @@ db: a connected fpdb_db object"""
 Adds a player to the tourney, and initialises data structures indexed by player.
 rank        (int) indicating the finishing rank (can be -1 if unknown)
 name        (string) player name
-winnings    (string) the money the player ended the tourney with (can be 0, or -1 if unknown)
+winnings    (decimal) the money the player ended the tourney with (can be 0, or -1 if unknown)
 """
         log.debug("addPlayer: rank:%s - name : '%s' - Winnings (%s)" % (rank, name, winnings))
-        winnings = re.sub(u',', u'', winnings) #some sites have commas
         self.players.append(name)
         self.finishPositions.update( { name : Decimal(rank) } )
         self.winnings.update( { name : Decimal(winnings) } )

From d28f56db187a3962c2cbb9a4472d494ee1982769 Mon Sep 17 00:00:00 2001
From: PassThePeas <stephane.alessio@gmail.com>
Date: Wed, 2 Sep 2009 22:55:47 +0200
Subject: [PATCH 06/10] Tourney import : tRecognizeTourney implemented (search,
 update or insert a Tourney

---
 pyfpdb/Database.py | 101 +++++++++++++++++++++++++++++++++++++++------
 pyfpdb/SQL.py      |  55 ++++++++++++++++++++++++
 2 files changed, 143 insertions(+), 13 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index cfd1317d..71b9cce7 100755
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -1834,7 +1834,7 @@ class Database:
     # end def send_finish_msg():
 
     def tRecogniseTourneyType(self, tourney):
-        print "Database.tRecogniseTourneyType"
+        logging.debug("Database.tRecogniseTourneyType")
         typeId = 1
         # Check if Tourney exists, and if so retrieve TTypeId : in that case, check values of the ttype
         cursor = self.get_cursor()
@@ -1850,11 +1850,10 @@ class Database:
         try:
             len(result)
             typeId = result[0]
-            print "Tourney found in db with Tourney_Type_ID = %d" % typeId
+            logging.debug("Tourney found in db with Tourney_Type_ID = %d" % typeId)
             for ev in expectedValues :
-                print "ev : %s" % ev
                 if ( getattr( tourney, expectedValues.get(ev) ) <> result[ev] ):
-                    print "TypeId mismatch : wrong %s : Tourney=%s / db=%s" % (expectedValues.get(ev), getattr( tourney, expectedValues.get(ev)), result[ev] )
+                    logging.debug("TypeId mismatch : wrong %s : Tourney=%s / db=%s" % (expectedValues.get(ev), getattr( tourney, expectedValues.get(ev)), result[ev]) )
                     typeIdMatch = False
                     #break
         except:
@@ -1864,37 +1863,113 @@ class Database:
         if typeIdMatch == False :
             # Check for an existing TTypeId that matches tourney info (buyin/fee, knockout, rebuy, speed, matrix, shootout)
             # if not found create it
-            print "Searching for a TourneyTypeId matching TourneyType data"
+            logging.debug("Searching for a TourneyTypeId matching TourneyType data")
             cursor.execute (self.sql.query['getTourneyTypeId'].replace('%s', self.sql.query['placeholder']), 
                             (tourney.siteId, tourney.buyin, tourney.fee, tourney.isKO,
                              tourney.isRebuy, tourney.speed, tourney.isHU, tourney.isShootout, tourney.isMatrix)
                             )
             result=cursor.fetchone()
-            #print "tried SELECTing gametypes.id, result:",result
         
             try:
                 len(result)
                 typeId = result[0]
-                print "Existing Tourney Type Id found : %d" % typeId
+                logging.debug("Existing Tourney Type Id found : %d" % typeId)
             except TypeError: #this means we need to create a new entry
-                print "Tourney Type Id not found : create one"
+                logging.debug("Tourney Type Id not found : create one")
                 cursor.execute (self.sql.query['insertTourneyTypes'].replace('%s', self.sql.query['placeholder']),
                                 (tourney.siteId, tourney.buyin, tourney.fee, tourney.isKO, tourney.isRebuy,
                                  tourney.speed, tourney.isHU, tourney.isShootout, tourney.isMatrix)
                                 )
                 typeId = self.get_last_insert_id(cursor)
 
-        return typeId            
+        return typeId
     #end def tRecogniseTourneyType
 
         
     def tRecognizeTourney(self, tourney, dbTourneyTypeId):
-        print "Database.tRecognizeTourney"
+        logging.debug("Database.tRecognizeTourney")
         tourneyID = 1
         # Check if tourney exists in db (based on tourney.siteId and tourney.tourNo)
-        # If not => create it with the tourneyTypeId given as input
-        # if found => retrieve data (in the first query) and check if an update is needed, if so do it
-        # rem : Tourney Specific data = tourneyTypeId, entries, prizepool, buyinchips, rebuychips, addonchips, totalrebuys, totaladdons, kobounty
+        # If so retrieve all data to check for consistency
+        cursor = self.get_cursor()
+        cursor.execute (self.sql.query['getTourney'].replace('%s', self.sql.query['placeholder']),
+                        (tourney.tourNo, tourney.siteId)
+                        )
+        result=cursor.fetchone()
+
+        expectedValuesDecimal = { 2  : "entries", 3 : "prizepool", 6  : "buyInChips", 9  : "rebuyChips", 
+                                  10 : "addOnChips", 11 : "rebuyAmount", 12 : "addOnAmount", 13 : "totalRebuys", 
+                                  14 : "totalAddOns", 15 : "koBounty" }
+        expectedValues = { 7 : "tourneyName", 16 : "tourneyComment"  }
+
+        tourneyDataMatch = True
+        tCommentTs = None
+        starttime = None
+        endtime = None
+
+        try:
+            len(result)
+            tourneyID = result[0]
+            logging.debug("Tourney found in db with TourneyID = %d" % tourneyID)
+            if result[1] <> dbTourneyTypeId:
+                tourneyDataMatch = False
+                logging.debug("Tourney has wrong type ID (expected : %s - found : %s)" % (dbTourneyTypeId, result[1]))
+            if (tourney.starttime is None and result[4] is not None) or ( tourney.starttime is not None and fpdb_simple.parseHandStartTime("- %s" % tourney.starttime) <> result[4]) :
+                tourneyDataMatch = False
+                logging.debug("Tourney data mismatch : wrong starttime : Tourney=%s / db=%s" % (tourney.starttime, result[4]))
+            if (tourney.endtime is None and result[5] is not None) or ( tourney.endtime is not None and fpdb_simple.parseHandStartTime("- %s" % tourney.endtime) <> result[5]) :
+                tourneyDataMatch = False
+                logging.debug("Tourney data mismatch : wrong endtime : Tourney=%s / db=%s" % (tourney.endtime, result[5]))
+
+            for ev in expectedValues :
+                if ( getattr( tourney, expectedValues.get(ev) ) <> result[ev] ):
+                    logging.debug("Tourney data mismatch : wrong %s : Tourney=%s / db=%s" % (expectedValues.get(ev), getattr( tourney, expectedValues.get(ev)), result[ev]) )
+                    tourneyDataMatch = False
+                    #break
+            for evD in expectedValuesDecimal :
+                if ( Decimal(getattr( tourney, expectedValuesDecimal.get(evD)) ) <> result[evD] ):
+                    logging.debug("Tourney data mismatch : wrong %s : Tourney=%s / db=%s" % (expectedValuesDecimal.get(evD), getattr( tourney, expectedValuesDecimal.get(evD)), result[evD]) )
+                    tourneyDataMatch = False
+                    #break
+
+            # TO DO : Deal with matrix summary mutliple parsings
+            
+        except:
+            # Tourney not found : create
+            logging.debug("Tourney is not found : create")
+            if tourney.tourneyComment is not None :
+                tCommentTs = datetime.today()
+            if tourney.starttime is not None :
+                starttime = fpdb_simple.parseHandStartTime("- %s" % tourney.starttime)
+            if tourney.endtime is not None :
+                endtime = fpdb_simple.parseHandStartTime("- %s" % tourney.endtime)
+            # TODO : deal with matrix Id processed
+            cursor.execute (self.sql.query['insertTourney'].replace('%s', self.sql.query['placeholder']),
+                                (dbTourneyTypeId, tourney.tourNo, tourney.entries, tourney.prizepool, starttime,
+                                 endtime, tourney.buyInChips, tourney.tourneyName, 0, tourney.rebuyChips, tourney.addOnChips,
+                                 tourney.rebuyAmount, tourney.addOnAmount, tourney.totalRebuys, tourney.totalAddOns, tourney.koBounty,
+                                 tourney.tourneyComment, tCommentTs)
+                                )
+            tourneyID = self.get_last_insert_id(cursor)
+
+
+        # Deal with inconsistent tourney in db
+        if tourneyDataMatch == False :
+            # Update Tourney
+            if result[16] <> tourney.tourneyComment :
+                tCommentTs = datetime.today()
+            if tourney.starttime is not None :
+                starttime = fpdb_simple.parseHandStartTime("- %s" % tourney.starttime)
+            if tourney.endtime is not None :
+                endtime = fpdb_simple.parseHandStartTime("- %s" % tourney.endtime)
+
+            cursor.execute (self.sql.query['updateTourney'].replace('%s', self.sql.query['placeholder']),
+                                (dbTourneyTypeId, tourney.entries, tourney.prizepool, starttime,
+                                 endtime, tourney.buyInChips, tourney.tourneyName, 0, tourney.rebuyChips, tourney.addOnChips,
+                                 tourney.rebuyAmount, tourney.addOnAmount, tourney.totalRebuys, tourney.totalAddOns, tourney.koBounty,
+                                 tourney.tourneyComment, tCommentTs, tourneyID)
+                                )
+
         return tourneyID
 
     def tStoreTourneyPlayers(self, tourney, dbTourneyId):
diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index 7bed9144..28a4bd71 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -2843,12 +2843,67 @@ class Sql:
                                                 AND shootout=%s
                                                 AND matrix=%s
             """
+
             self.query['insertTourneyTypes'] = """INSERT INTO TourneyTypes
                                                       (siteId, buyin, fee, knockout, rebuyOrAddon
                                                       ,speed, headsUp, shootout, matrix)
                                                   VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s)
             """
 
+            self.query['getTourney'] = """SELECT t.id,
+                                                 t.tourneyTypeId,
+                                                 t.entries,
+                                                 t.prizepool,
+                                                 t.startTime,
+                                                 t.endTime,
+                                                 t.buyinChips,
+                                                 t.tourneyName,
+                                                 t.matrixIdProcessed,
+                                                 t.rebuyChips,
+                                                 t.addonChips,
+                                                 t.rebuyAmount,
+                                                 t.addonAmount,
+                                                 t.totalRebuys,
+                                                 t.totalAddons,
+                                                 t.koBounty,
+                                                 t.comment
+                                            FROM Tourneys t  
+                                            INNER JOIN TourneyTypes tt ON (t.tourneyTypeId = tt.id) 
+                                            WHERE t.siteTourneyNo=%s AND tt.siteId=%s
+            """
+
+            self.query['insertTourney'] = """INSERT INTO Tourneys
+                                                (tourneyTypeId, siteTourneyNo, entries, prizepool,
+                                                 startTime, endTime, buyinChips, tourneyName, matrixIdProcessed,
+                                                 rebuyChips, addonChips, rebuyAmount, addonAmount, totalRebuys,
+                                                 totalAddons, koBounty, comment, commentTs)
+                                            VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s,
+                                                    %s, %s, %s, %s, %s, %s, %s, %s)
+            """
+            
+            self.query['updateTourney'] = """UPDATE Tourneys
+                                                 SET tourneyTypeId = %s,
+                                                     entries = %s,
+                                                     prizepool = %s,
+                                                     startTime = %s,
+                                                     endTime = %s,
+                                                     buyinChips = %s,
+                                                     tourneyName = %s,
+                                                     matrixIdProcessed = %s,
+                                                     rebuyChips = %s,
+                                                     addonChips = %s,
+                                                     rebuyAmount = %s,
+                                                     addonAmount = %s,
+                                                     totalRebuys = %s,
+                                                     totalAddons = %s,
+                                                     koBounty = %s,
+                                                     comment = %s,
+                                                     commentTs = %s
+                                            WHERE id=%s
+            """
+
+            
+            
             if db_server == 'mysql':
                 self.query['placeholder'] = u'%s'
             elif db_server == 'postgresql':

From 025c81b1e15638c49a6487c5a3d10ac78e04ba9d Mon Sep 17 00:00:00 2001
From: PassThePeas <stephane.alessio@gmail.com>
Date: Thu, 3 Sep 2009 02:11:38 +0200
Subject: [PATCH 07/10] Tourney parsing : payinAmounts, countRebuys,
 countAddons and countKO are now defined by player (instead of being attached
 to the Tourney for Hero)

---
 pyfpdb/FulltiltToFpdb.py | 49 ++++++++++++++++++++++++++++------------
 pyfpdb/Tourney.py        | 27 +++++++++++-----------
 2 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index e0d9c402..bc0fc30f 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -426,9 +426,9 @@ class Fulltilt(HandHistoryConverter):
                 self.status = False
             else:
                 self.tourney = Tourney.Tourney(sitename = self.sitename, gametype = None, summaryText = summaryInfoList, builtFrom = "HHC")
-                self.status = self.determineTourneyType(self.tourney)
+                self.status = status = self.getPlayersPositionsAndWinnings(self.tourney)
                 if self.status == True :
-                    self.status = status = self.getPlayersPositionsAndWinnings(self.tourney)
+                    self.status = self.determineTourneyType(self.tourney)
                     #print self.tourney
                 else:
                     log.info("Parsing NOK : rejected")
@@ -558,15 +558,12 @@ class Fulltilt(HandHistoryConverter):
                         "PRIZEPOOL"         : self.re_TourneyPrizePool,
                         "REBUY_AMOUNT"      : self.re_TourneyRebuyAmount,
                         "ADDON_AMOUNT"      : self.re_TourneyAddOnAmount,
-                        "REBUY_COUNT"       : self.re_TourneyRebuyCount,
-                        "ADDON_COUNT"       : self.re_TourneyAddOnCount,
                         "REBUY_TOTAL"       : self.re_TourneyRebuysTotal,
                         "ADDONS_TOTAL"      : self.re_TourneyAddOnsTotal,
                         "REBUY_CHIPS"       : self.re_TourneyRebuyChips,
                         "ADDON_CHIPS"       : self.re_TourneyAddOnChips,
                         "STARTTIME"         : self.re_TourneyTimeInfo,
                         "KO_BOUNTY_AMOUNT"  : self.re_TourneyKOBounty,
-                        "COUNT_KO"          : self.re_TourneyCountKO
                     }
 
 
@@ -575,15 +572,12 @@ class Fulltilt(HandHistoryConverter):
                         "PRIZEPOOL"         : "prizepool",
                         "REBUY_AMOUNT"      : "rebuyAmount",
                         "ADDON_AMOUNT"      : "addOnAmount",
-                        "REBUY_COUNT"       : "countRebuys",
-                        "ADDON_COUNT"       : "countAddOns",
                         "REBUY_TOTAL"       : "totalRebuys",
                         "ADDONS_TOTAL"      : "totalAddOns",
                         "REBUY_CHIPS"       : "rebuyChips",
                         "ADDON_CHIPS"       : "addOnChips",
                         "STARTTIME"         : "starttime",
-                        "KO_BOUNTY_AMOUNT"  : "koBounty",
-                        "COUNT_KO"          : "countKO"
+                        "KO_BOUNTY_AMOUNT"  : "koBounty"
                     }
 
         mg = {}     # After the loop, mg will contain all the matching groups, including the ones that have not been used, like ENDTIME and IN-PROGRESS
@@ -597,11 +591,41 @@ class Fulltilt(HandHistoryConverter):
             # Assign endtime to tourney (if None, that's ok, it's because the tourney wans't over over when the summary file was produced)
             tourney.endtime = mg['ENDTIME']
 
+        # Deal with hero specific information
+        if tourney.hero is not None :
+            m = self.re_TourneyRebuyCount.search(tourneyText)
+            if m is not None:
+                mg = m.groupdict()
+                if mg['REBUY_COUNT'] is not None :
+                    tourney.countRebuys.update( { tourney.hero : Decimal(mg['REBUY_COUNT']) } )
+            m = self.re_TourneyAddOnCount.search(tourneyText)
+            if m is not None:
+                mg = m.groupdict()
+                if mg['ADDON_COUNT'] is not None :
+                    tourney.countAddOns.update( { tourney.hero : Decimal(mg['ADDON_COUNT']) } )
+            m = self.re_TourneyCountKO.search(tourneyText)
+            if m is not None:
+                mg = m.groupdict()
+                if mg['COUNT_KO'] is not None :
+                    tourney.countKO.update( { tourney.hero : Decimal(mg['COUNT_KO']) } )
+
         # Deal with money amounts
         tourney.koBounty    = 100*Decimal(re.sub(u',', u'', "%s" % tourney.koBounty))
         tourney.prizepool   = 100*Decimal(re.sub(u',', u'', "%s" % tourney.prizepool))
         tourney.rebuyAmount = 100*Decimal(re.sub(u',', u'', "%s" % tourney.rebuyAmount))
         tourney.addOnAmount = 100*Decimal(re.sub(u',', u'', "%s" % tourney.addOnAmount))
+        
+        # Calculate payin amounts and update winnings -- not possible to take into account nb of rebuys, addons or Knockouts for other players than hero on FTP
+        for p in tourney.players :
+            tourney.payinAmounts[p] = tourney.buyin + tourney.fee + (tourney.rebuyAmount * tourney.countRebuys[p]) + (tourney.addOnAmount * tourney.countAddOns[p])
+            #print " player %s : payinAmount = %d" %( p, tourney.payinAmounts[p])
+            if tourney.isKO :
+                #tourney.incrementPlayerWinnings(tourney.players[p], Decimal(tourney.koBounty)*Decimal(tourney.countKO[p]))
+                tourney.winnings[p] += Decimal(tourney.koBounty)*Decimal(tourney.countKO[p])
+                #print "player %s : winnings %d" % (p, tourney.winnings[p])
+  
+                    
+
         #print mg
         return True
 
@@ -622,11 +646,11 @@ class Fulltilt(HandHistoryConverter):
                 else:
                     winnings = "0"
 
-                tourney.addPlayer(rank, a.group('PNAME'), winnings)
+                tourney.addPlayer(rank, a.group('PNAME'), winnings, 0, 0, 0, 0)
             else:
                 print "Player finishing stats unreadable : %s" % a
 
-        # Deal with KO tournaments for hero winnings calculation
+        # Find Hero
         n = self.re_TourneyHeroFinishingP.search(playersText)
         if n is not None:
             heroName = n.group('HERO_NAME')
@@ -634,9 +658,6 @@ class Fulltilt(HandHistoryConverter):
             # Is this really useful ?
             if (tourney.finishPositions[heroName] != Decimal(n.group('HERO_FINISHING_POS'))):
                 print "Bad parsing : finish position incoherent : %s / %s" % (tourney.finishPositions[heroName], n.group('HERO_FINISHING_POS'))
-            if tourney.isKO:
-                #Update the winnings with the (KO amount) * (# of KO)
-                tourney.incrementPlayerWinnings(n.group('HERO_NAME'), Decimal(tourney.koBounty)*Decimal(tourney.countKO))
 
         return True
 
diff --git a/pyfpdb/Tourney.py b/pyfpdb/Tourney.py
index 1c2cb365..f6f30b1b 100644
--- a/pyfpdb/Tourney.py
+++ b/pyfpdb/Tourney.py
@@ -73,20 +73,21 @@ class Tourney(object):
         self.subTourneyFee      = None
         self.rebuyChips         = 0
         self.addOnChips         = 0
-        self.countRebuys        = 0
-        self.countAddOns        = 0
         self.rebuyAmount		= 0
         self.addOnAmount		= 0
         self.totalRebuys        = 0
         self.totalAddOns        = 0
         self.koBounty           = 0
-        self.countKO            = 0     #To use for winnings calculation which is not counted in the rest of the summary file
         self.tourneyComment     = None
         self.players            = []
 
         # Collections indexed by player names
         self.finishPositions    = {}
         self.winnings           = {}
+        self.payinAmounts       = {}
+        self.countRebuys        = {}
+        self.countAddOns        = {}
+        self.countKO            = {}
 
         # currency symbol for this summary
         self.sym = None
@@ -120,21 +121,20 @@ class Tourney(object):
                  ("ADDON CHIPS", self.addOnChips),
                  ("REBUY AMOUNT", self.rebuyAmount),
                  ("ADDON AMOUNT", self.addOnAmount),
-                 ("COUNT REBUYS", self.countRebuys),
-                 ("COUNT ADDONS", self.countAddOns),
-                 ("NB REBUYS", self.countRebuys),
-                 ("NB ADDONS", self.countAddOns),
                  ("TOTAL REBUYS", self.totalRebuys),
                  ("TOTAL ADDONS", self.totalAddOns),
                  ("KO BOUNTY", self.koBounty),
-                 ("NB OF KO", self.countKO),
                  ("TOURNEY COMMENT", self.tourneyComment)
         )
  
         structs = ( ("GAMETYPE", self.gametype),
                     ("PLAYERS", self.players),
+                    ("PAYIN AMOUNTS", self.payinAmounts),
                     ("POSITIONS", self.finishPositions),                    
                     ("WINNINGS", self.winnings),
+                    ("COUNT REBUYS", self.countRebuys),
+                    ("COUNT ADDONS", self.countAddOns),
+                    ("NB OF KO", self.countKO)
         )
         str = ''
         for (name, var) in vars:
@@ -255,7 +255,7 @@ db: a connected fpdb_db object"""
         
         
 
-    def addPlayer(self, rank, name, winnings):
+    def addPlayer(self, rank, name, winnings, payinAmount, nbRebuys, nbAddons, nbKO):
         """\
 Adds a player to the tourney, and initialises data structures indexed by player.
 rank        (int) indicating the finishing rank (can be -1 if unknown)
@@ -266,6 +266,10 @@ winnings    (decimal) the money the player ended the tourney with (can be 0, or
         self.players.append(name)
         self.finishPositions.update( { name : Decimal(rank) } )
         self.winnings.update( { name : Decimal(winnings) } )
+        self.payinAmounts.update( {name : Decimal(payinAmount) } )
+        self.countRebuys.update( {name: Decimal(nbRebuys) } )
+        self.countAddOns.update( {name: Decimal(nbAddons) } )
+        self.countKO.update( {name : Decimal(nbKO) } )
         
 
     def incrementPlayerWinnings(self, name, additionnalWinnings):
@@ -277,11 +281,6 @@ winnings    (decimal) the money the player ended the tourney with (can be 0, or
             self.players.append([-1, name, 0])
             
         self.winnings[name] = oldWins + Decimal(additionnalWinnings)
-        
-
-    def calculatePayinAmount(self):
-        return self.buyin + self.fee + (self.rebuyAmount * self.countRebuys) + (self.addOnAmount	* self.countAddOns )
-
 
     def checkPlayerExists(self,player):
         if player not in [p[1] for p in self.players]:

From 4853b888a60da046550f5d35748c2a4b70d63383 Mon Sep 17 00:00:00 2001
From: PassThePeas <stephane.alessio@gmail.com>
Date: Thu, 3 Sep 2009 07:51:05 +0200
Subject: [PATCH 08/10] Correct oddity : self.status = status =
 self.getPlayersPosit... and status unused

---
 pyfpdb/FulltiltToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py
index bc0fc30f..d24c7bdd 100755
--- a/pyfpdb/FulltiltToFpdb.py
+++ b/pyfpdb/FulltiltToFpdb.py
@@ -426,7 +426,7 @@ class Fulltilt(HandHistoryConverter):
                 self.status = False
             else:
                 self.tourney = Tourney.Tourney(sitename = self.sitename, gametype = None, summaryText = summaryInfoList, builtFrom = "HHC")
-                self.status = status = self.getPlayersPositionsAndWinnings(self.tourney)
+                self.status = self.getPlayersPositionsAndWinnings(self.tourney)
                 if self.status == True :
                     self.status = self.determineTourneyType(self.tourney)
                     #print self.tourney

From c350d6208980bda87281a8528352602273f2e5e9 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 3 Sep 2009 15:44:28 +0800
Subject: [PATCH 09/10] Fix typos

---
 pyfpdb/fpdb_import.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index a7cc9d66..52e23c7e 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -55,9 +55,9 @@ try:
     pgsqlLibFound=True
     import psycopg2.extensions
     psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
-    log.debug("Import module: pyscopg2")
+    log.debug("Import module: psycopg2")
 except:
-    log.debug("Import module: pyscopg2 not found")
+    log.debug("Import module: psycopg2 not found")
 
 class Importer:
 

From 91ebbe79e17f6dbf9090731c774d5501cf95d18b Mon Sep 17 00:00:00 2001
From: PassThePeas <stephane.alessio@gmail.com>
Date: Fri, 4 Sep 2009 02:01:41 +0200
Subject: [PATCH 10/10] Last part of core tourney import Database.py :
 tStoreTourneyPlayers and tUpdateTourneysHandsPlayers implemented
 HandHistoryConverter.py : fix for 0-byte summary files SQL.py : new queries
 Tourney.py : cleanup stdout

---
 pyfpdb/Database.py             | 100 +++++++++++++++++++++++++++++----
 pyfpdb/HandHistoryConverter.py |   3 +-
 pyfpdb/SQL.py                  |  49 ++++++++++++++++
 pyfpdb/Tourney.py              |  12 ++--
 4 files changed, 148 insertions(+), 16 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 71b9cce7..47ae282e 100755
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -1968,21 +1968,101 @@ class Database:
                                  endtime, tourney.buyInChips, tourney.tourneyName, 0, tourney.rebuyChips, tourney.addOnChips,
                                  tourney.rebuyAmount, tourney.addOnAmount, tourney.totalRebuys, tourney.totalAddOns, tourney.koBounty,
                                  tourney.tourneyComment, tCommentTs, tourneyID)
-                                )
+                            )
 
         return tourneyID
-
+    #end def tRecognizeTourney
+    
     def tStoreTourneyPlayers(self, tourney, dbTourneyId):
-        print "Database.tStoreTourneyPlayers"
+        logging.debug("Database.tStoreTourneyPlayers")
+        # First, get playerids for the players and specifically the one for hero : 
+        playersIds = fpdb_simple.recognisePlayerIDs(self, tourney.players, tourney.siteId)
+        # hero may be None for matrix tourneys summaries
+#        hero = [ tourney.hero ]
+#        heroId = fpdb_simple.recognisePlayerIDs(self, hero , tourney.siteId)
+#        logging.debug("hero Id = %s - playersId = %s" % (heroId , playersIds))
+
         tourneyPlayersIds=[]
-        # Look for existing players in TourneysPlayers
-        # For the ones not in db insert with all data (nbrebuys, nbaddons, nbKO, payinAmount, rank, winnings)
-        # For the others, get data and check if an update is needed, if so, do it
+        try:
+            cursor = self.get_cursor()
+    
+            for i in xrange(len(playersIds)):
+                cursor.execute(self.sql.query['getTourneysPlayers'].replace('%s', self.sql.query['placeholder'])
+                              ,(dbTourneyId, playersIds[i]))
+                result=cursor.fetchone()
+                #print "tried SELECTing tourneys_players.id:",tmp
+                
+                try:
+                    len(result)
+                    # checking data
+                    logging.debug("TourneysPlayers found : checking data")
+                    expectedValuesDecimal = { 1  : "payinAmounts", 2 : "finishPositions", 3  : "winnings", 4 : "countRebuys", 
+                                              5  : "countAddOns", 6 : "countKO" }
+    
+                    tourneyPlayersIds.append(result[0]);
+    
+                    tourneysPlayersDataMatch = True
+                    for evD in expectedValuesDecimal :
+                        if ( Decimal(getattr( tourney, expectedValuesDecimal.get(evD))[tourney.players[i]] ) <> result[evD] ):
+                            logging.debug("TourneysPlayers data mismatch for TourneysPlayer id=%d, name=%s : wrong %s : Tourney=%s / db=%s" % (result[0], tourney.players[i], expectedValuesDecimal.get(evD), getattr( tourney, expectedValuesDecimal.get(evD))[tourney.players[i]], result[evD]) )
+                            tourneysPlayersDataMatch = False
+                            #break
+
+                    if tourneysPlayersDataMatch == False:
+                        logging.debug("TourneysPlayers data update needed")
+                        cursor.execute (self.sql.query['updateTourneysPlayers'].replace('%s', self.sql.query['placeholder']),
+                                            (tourney.payinAmounts[tourney.players[i]], tourney.finishPositions[tourney.players[i]],
+                                             tourney.winnings[tourney.players[i]] , tourney.countRebuys[tourney.players[i]],
+                                             tourney.countAddOns[tourney.players[i]] , tourney.countKO[tourney.players[i]],
+                                             result[7], result[8], result[0])
+                                        )
+
+                except TypeError:
+                    logging.debug("TourneysPlayers not found : need insert")
+                    cursor.execute (self.sql.query['insertTourneysPlayers'].replace('%s', self.sql.query['placeholder']),
+                                        (dbTourneyId, playersIds[i],
+                                         tourney.payinAmounts[tourney.players[i]], tourney.finishPositions[tourney.players[i]],
+                                         tourney.winnings[tourney.players[i]] , tourney.countRebuys[tourney.players[i]],
+                                         tourney.countAddOns[tourney.players[i]] , tourney.countKO[tourney.players[i]],
+                                         None, None)
+                                        )
+                    tourneyPlayersIds.append(self.get_last_insert_id(cursor))
+                                        
+        except:
+            raise fpdb_simple.FpdbError( "tStoreTourneyPlayers error: " + str(sys.exc_value) )
+    
         return tourneyPlayersIds
-        
-    def tCheckTourneysHandsPlayers(self, tourney, dbTourneysPlayersIds, dbTourneyTypeId):
-        print "Database.tCheckTourneysHandsPlayers"
-        # Make a direct update of lines from HandsPlayers where touneyplayersid=<input> and tourneyTypeId <> dbTourneyTypeId, set tourneyTypeId=dbTourneyTypeId  
+    #end def tStoreTourneyPlayers
+
+    def tUpdateTourneysHandsPlayers(self, tourney, dbTourneysPlayersIds, dbTourneyTypeId):
+        logging.debug("Database.tCheckTourneysHandsPlayers")
+        try:
+            # Massive update seems to take quite some time ...
+#            query = self.sql.query['updateHandsPlayersForTTypeId2'] % (dbTourneyTypeId, self.sql.query['handsPlayersTTypeId_joiner'].join([self.sql.query['placeholder'] for id in dbTourneysPlayersIds]) )
+#            cursor = self.get_cursor()
+#            cursor.execute (query, dbTourneysPlayersIds)
+
+            query = self.sql.query['selectHandsPlayersWithWrongTTypeId'] % (dbTourneyTypeId, self.sql.query['handsPlayersTTypeId_joiner'].join([self.sql.query['placeholder'] for id in dbTourneysPlayersIds]) )
+            #print "query : %s" % query
+            cursor = self.get_cursor()
+            cursor.execute (query, dbTourneysPlayersIds)
+            result=cursor.fetchall()
+
+            if (len(result) > 0):
+                logging.debug("%d lines need update : %s" % (len(result), result) )
+                listIds = []
+                for i in result:
+                    listIds.append(i[0])
+
+                query2 = self.sql.query['updateHandsPlayersForTTypeId'] % (dbTourneyTypeId, self.sql.query['handsPlayersTTypeId_joiner_id'].join([self.sql.query['placeholder'] for id in listIds]) )
+                cursor.execute (query2, listIds)
+            else:
+                logging.debug("No need to update, HandsPlayers are correct")
+
+        except:
+            raise fpdb_simple.FpdbError( "tStoreTourneyPlayers error: " + str(sys.exc_value) )
+    #end def tUpdateTourneysHandsPlayers
+
 
 # Class used to hold all the data needed to write a hand to the db
 # mainParser() in fpdb_parse_logic.py creates one of these and then passes it to 
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 51819bfc..92c5ef1f 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -139,7 +139,8 @@ Otherwise, finish at EOF.
                 handsList = self.allHandsAsList()
                 log.info("Parsing %d hands" % len(handsList))
                 # Determine if we're dealing with a HH file or a Summary file
-                if self.isSummary(handsList[0]) == False:
+                # quick fix : empty files make the handsList[0] fail ==> If empty file, go on with HH parsing
+                if len(handsList) == 0 or self.isSummary(handsList[0]) == False:
                     self.parsedObjectType = "HH"
                     for handText in handsList:
                         try:
diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index 28a4bd71..5f314517 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -2901,6 +2901,55 @@ class Sql:
                                                      commentTs = %s
                                             WHERE id=%s
             """
+            
+            self.query['getTourneysPlayers'] = """SELECT    id,
+                                                            payinAmount,
+                                                            rank,
+                                                            winnings,
+                                                            nbRebuys,
+                                                            nbAddons,
+                                                            nbKO,
+                                                            comment,
+                                                            commentTs
+                                                    FROM TourneysPlayers
+                                                    WHERE tourneyId=%s AND playerId+0=%s            
+            """
+
+            self.query['updateTourneysPlayers'] = """UPDATE TourneysPlayers
+                                                     SET payinAmount = %s,
+                                                         rank = %s,
+                                                         winnings = %s,
+                                                         nbRebuys = %s,
+                                                         nbAddons = %s,
+                                                         nbKO = %s,
+                                                         comment = %s,
+                                                         commentTs = %s
+                                                     WHERE id=%s
+            """
+
+            self.query['insertTourneysPlayers'] = """INSERT INTO TourneysPlayers
+                                                        (tourneyId, playerId, payinAmount, rank, winnings, nbRebuys, nbAddons, nbKO, comment, commentTs)
+                                                    VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
+            """
+
+            self.query['selectHandsPlayersWithWrongTTypeId'] = """SELECT id
+                                                                  FROM HandsPlayers 
+                                                                  WHERE tourneyTypeId <> %s AND (TourneysPlayersId+0=%s)
+            """
+
+#            self.query['updateHandsPlayersForTTypeId2'] = """UPDATE HandsPlayers 
+#                                                            SET tourneyTypeId= %s
+#                                                            WHERE (TourneysPlayersId+0=%s)
+#            """
+
+            self.query['updateHandsPlayersForTTypeId'] = """UPDATE HandsPlayers 
+                                                             SET tourneyTypeId= %s
+                                                             WHERE (id=%s)
+            """
+
+
+            self.query['handsPlayersTTypeId_joiner'] = " OR TourneysPlayersId+0="
+            self.query['handsPlayersTTypeId_joiner_id'] = " OR id="
 
             
             
diff --git a/pyfpdb/Tourney.py b/pyfpdb/Tourney.py
index f6f30b1b..8f7e59c5 100644
--- a/pyfpdb/Tourney.py
+++ b/pyfpdb/Tourney.py
@@ -151,7 +151,6 @@ class Tourney(object):
         pass
 
     def insert(self, db):
-        print "TODO: Insert Tourney in DB"
         # First : check all needed info is filled in the object, especially for the initial select
 
         # Notes on DB Insert
@@ -163,15 +162,18 @@ class Tourney(object):
         # Note: If the TourneyNo could be a unique id .... this would really be a relief to deal with matrix matches ==> Ask on the IRC / Ask Fulltilt ??
         
         dbTourneyTypeId = db.tRecogniseTourneyType(self)
-        print "Tourney Type ID = %d" % dbTourneyTypeId
+        logging.debug("Tourney Type ID = %d" % dbTourneyTypeId)
         dbTourneyId = db.tRecognizeTourney(self, dbTourneyTypeId)
-        print "Tourney ID = %d" % dbTourneyId
+        logging.debug("Tourney ID = %d" % dbTourneyId)
         dbTourneysPlayersIds = db.tStoreTourneyPlayers(self, dbTourneyId)
-        db.tCheckTourneysHandsPlayers(self, dbTourneysPlayersIds, dbTourneyTypeId)
+        logging.debug("TourneysPlayersId = %s" % dbTourneysPlayersIds) 
+        db.tUpdateTourneysHandsPlayers(self, dbTourneysPlayersIds, dbTourneyTypeId)
+        logging.debug("tUpdateTourneysHandsPlayers done")
+        logging.debug("Tourney Insert done")
         
         # TO DO : Return what has been done (tourney created, updated, nothing)
         # ?? stored = 1 if tourney is fully created / duplicates = 1, if everything was already here and correct / partial=1 if some things were already here (between tourney, tourneyPlayers and handsplayers)
-        # if so, prototypes may need changes to know what has been done
+        # if so, prototypes may need changes to know what has been done or make some kind of dict in Tourney object that could be updated during the insert process to store that information
         stored = 0
         duplicates = 0
         partial = 0