From 468b98fb7ac68c9ef256ea692fff4f0a0968b9d3 Mon Sep 17 00:00:00 2001 From: Worros Date: Wed, 30 Mar 2011 11:46:49 +0800 Subject: [PATCH 1/2] THP: Ignore gameSessionId --- pyfpdb/TestHandsPlayers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyfpdb/TestHandsPlayers.py b/pyfpdb/TestHandsPlayers.py index d6e76d38..1bb7eae8 100755 --- a/pyfpdb/TestHandsPlayers.py +++ b/pyfpdb/TestHandsPlayers.py @@ -157,7 +157,7 @@ def compare_hands_file(filename, importer, errors): pass else: # Stats don't match. - if datum == "gametypeId" or datum == 'sessionId' or datum == 'tourneyId': + if datum == "gametypeId" or datum == 'sessionId' or datum == 'tourneyId' or datum == 'gameSessionId': # Not an error. gametypeIds are dependent on the order added to the db. #print "DEBUG: Skipping mismatched gamtypeId" pass From bac1d29166206bc79286c1eb678839f6431a9a3f Mon Sep 17 00:00:00 2001 From: Worros Date: Wed, 30 Mar 2011 11:49:02 +0800 Subject: [PATCH 2/2] Regression: Add gameSessionId to .hands files --- .../cash/Everest/Flop/PLO-EUR-5-10-Unknown-Sample.txt.hands | 3 ++- .../cash/FTP/Draw/3-Draw-Limit-USD-150-300-201012.txt.hands | 3 ++- ...-250-500-201011.Hero.sitting.out.but.not.listed.txt.hands | 3 ++- ...raw-Limit-USD-0.10-0.20-201011.Sample.Not.UTF16.txt.hands | 3 ++- ...-NL-USD-0.10-0.20-201011.Saw.Showdown.Not.UTF16.txt.hands | 3 ++- ...5-Carddraw-PL-0.10-0.25-201011.Sample.Not.UTF16.txt.hands | 3 ++- .../Badugi-USD-0.05-0.10-201011.Sample.Not.UTF16.txt.hands | 3 ++- ...-9max-USD-1-2.201012.Button.Player4.Sitting.out.txt.hands | 3 ++- ...6max-USD-200-400.200610.Observed.Hand.with.chat.txt.hands | 3 ++- ...6max-EUR-0.01-0.02.201008.Weird.table.character.txt.hands | 3 ++- ...ax-USD-0.02-0.05.201007.Short.lived.date.format.txt.hands | 3 ++- .../PLO-6max-USD-0.01-0.02.201003.River.Showdown.txt.hands | 3 ++- ...Razz-USD-0.10-0.20-201012.CCT.and.ET.timeformat.txt.hands | 3 ++- ...-0.10-0.20-201012.Player6.listed.but.doesnt.act.txt.hands | 3 ++- ...LHE-10max-USD-0.02-0.04-201102.Speed.table.BWin.txt.hands | 3 ++- .../Flop/888-FLH-PM-0.50-1.00-HeroLoses18.txt.hands | 3 ++- ...2-0.05-201010.Side.pot.Biggest.stack.loses.main.txt.hands | 5 +++-- ...zz-USD-HUSNG-2-201102.Villain.allin.on.bringing.txt.hands | 3 ++- 18 files changed, 37 insertions(+), 19 deletions(-) diff --git a/pyfpdb/regression-test-files/cash/Everest/Flop/PLO-EUR-5-10-Unknown-Sample.txt.hands b/pyfpdb/regression-test-files/cash/Everest/Flop/PLO-EUR-5-10-Unknown-Sample.txt.hands index be086d9d..625f58b9 100644 --- a/pyfpdb/regression-test-files/cash/Everest/Flop/PLO-EUR-5-10-Unknown-Sample.txt.hands +++ b/pyfpdb/regression-test-files/cash/Everest/Flop/PLO-EUR-5-10-Unknown-Sample.txt.hands @@ -3,6 +3,7 @@ 'boardcard3': 0, 'boardcard4': 5, 'boardcard5': 29, + 'gameSessionId': 1, 'gametypeId': 1, 'importTime': None, 'maxSeats': 10, @@ -28,4 +29,4 @@ 'street4Raises': 0, 'tableName': u'Toulouse-2', 'texture': None, - 'tourneyId': None} + 'tourneyId': None} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-150-300-201012.txt.hands b/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-150-300-201012.txt.hands index 08368ea4..13b03de7 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-150-300-201012.txt.hands +++ b/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-150-300-201012.txt.hands @@ -3,6 +3,7 @@ 'boardcard3': 0, 'boardcard4': 0, 'boardcard5': 0, + 'gameSessionId': 1, 'gametypeId': 12, 'importTime': None, 'maxSeats': 6, @@ -28,4 +29,4 @@ 'street4Raises': 0, 'tableName': u"David's Draw", 'texture': None, - 'tourneyId': None} + 'tourneyId': None} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-250-500-201011.Hero.sitting.out.but.not.listed.txt.hands b/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-250-500-201011.Hero.sitting.out.but.not.listed.txt.hands index 9a07dbed..50d33dbe 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-250-500-201011.Hero.sitting.out.but.not.listed.txt.hands +++ b/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-250-500-201011.Hero.sitting.out.but.not.listed.txt.hands @@ -3,6 +3,7 @@ 'boardcard3': 0, 'boardcard4': 0, 'boardcard5': 0, + 'gameSessionId': 1, 'gametypeId': 1, 'importTime': None, 'maxSeats': 6, @@ -29,4 +30,4 @@ 'street4Raises': 0, 'tableName': u'Rocky Cliff', 'texture': None, - 'tourneyId': None} + 'tourneyId': None} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-Limit-USD-0.10-0.20-201011.Sample.Not.UTF16.txt.hands b/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-Limit-USD-0.10-0.20-201011.Sample.Not.UTF16.txt.hands index 8d7b463c..21c69cf8 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-Limit-USD-0.10-0.20-201011.Sample.Not.UTF16.txt.hands +++ b/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-Limit-USD-0.10-0.20-201011.Sample.Not.UTF16.txt.hands @@ -3,6 +3,7 @@ 'boardcard3': 0, 'boardcard4': 0, 'boardcard5': 0, + 'gameSessionId': 1, 'gametypeId': 1, 'importTime': None, 'maxSeats': 6, @@ -28,4 +29,4 @@ 'street4Raises': 0, 'tableName': u'Shady Oak', 'texture': None, - 'tourneyId': None} + 'tourneyId': None} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-NL-USD-0.10-0.20-201011.Saw.Showdown.Not.UTF16.txt.hands b/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-NL-USD-0.10-0.20-201011.Saw.Showdown.Not.UTF16.txt.hands index b276608a..92e2deae 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-NL-USD-0.10-0.20-201011.Saw.Showdown.Not.UTF16.txt.hands +++ b/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-NL-USD-0.10-0.20-201011.Saw.Showdown.Not.UTF16.txt.hands @@ -3,6 +3,7 @@ 'boardcard3': 0, 'boardcard4': 0, 'boardcard5': 0, + 'gameSessionId': 1, 'gametypeId': 117, 'importTime': None, 'maxSeats': 6, @@ -28,4 +29,4 @@ 'street4Raises': 0, 'tableName': u'Calla Lily', 'texture': None, - 'tourneyId': None} + 'tourneyId': None} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-PL-0.10-0.25-201011.Sample.Not.UTF16.txt.hands b/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-PL-0.10-0.25-201011.Sample.Not.UTF16.txt.hands index d9716d32..cc99017d 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-PL-0.10-0.25-201011.Sample.Not.UTF16.txt.hands +++ b/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-PL-0.10-0.25-201011.Sample.Not.UTF16.txt.hands @@ -3,6 +3,7 @@ 'boardcard3': 0, 'boardcard4': 0, 'boardcard5': 0, + 'gameSessionId': 1, 'gametypeId': 1, 'importTime': None, 'maxSeats': 6, @@ -28,4 +29,4 @@ 'street4Raises': 0, 'tableName': u'Axe Handle', 'texture': None, - 'tourneyId': None} + 'tourneyId': None} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Draw/Badugi-USD-0.05-0.10-201011.Sample.Not.UTF16.txt.hands b/pyfpdb/regression-test-files/cash/FTP/Draw/Badugi-USD-0.05-0.10-201011.Sample.Not.UTF16.txt.hands index d98855ae..1623ff48 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Draw/Badugi-USD-0.05-0.10-201011.Sample.Not.UTF16.txt.hands +++ b/pyfpdb/regression-test-files/cash/FTP/Draw/Badugi-USD-0.05-0.10-201011.Sample.Not.UTF16.txt.hands @@ -3,6 +3,7 @@ 'boardcard3': 0, 'boardcard4': 0, 'boardcard5': 0, + 'gameSessionId': 1, 'gametypeId': 2, 'importTime': None, 'maxSeats': 7, @@ -28,4 +29,4 @@ 'street4Raises': 0, 'tableName': u'Laurelvale', 'texture': None, - 'tourneyId': None} + 'tourneyId': None} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Flop/LHE-9max-USD-1-2.201012.Button.Player4.Sitting.out.txt.hands b/pyfpdb/regression-test-files/cash/FTP/Flop/LHE-9max-USD-1-2.201012.Button.Player4.Sitting.out.txt.hands index 022ee68a..c854bd82 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Flop/LHE-9max-USD-1-2.201012.Button.Player4.Sitting.out.txt.hands +++ b/pyfpdb/regression-test-files/cash/FTP/Flop/LHE-9max-USD-1-2.201012.Button.Player4.Sitting.out.txt.hands @@ -3,6 +3,7 @@ 'boardcard3': 52, 'boardcard4': 17, 'boardcard5': 29, + 'gameSessionId': 1, 'gametypeId': 99, 'importTime': None, 'maxSeats': 9, @@ -28,4 +29,4 @@ 'street4Raises': 0, 'tableName': u'Slaw', 'texture': None, - 'tourneyId': None} + 'tourneyId': None} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Flop/LO8-6max-USD-200-400.200610.Observed.Hand.with.chat.txt.hands b/pyfpdb/regression-test-files/cash/FTP/Flop/LO8-6max-USD-200-400.200610.Observed.Hand.with.chat.txt.hands index 64bcafb2..6be9b8d7 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Flop/LO8-6max-USD-200-400.200610.Observed.Hand.with.chat.txt.hands +++ b/pyfpdb/regression-test-files/cash/FTP/Flop/LO8-6max-USD-200-400.200610.Observed.Hand.with.chat.txt.hands @@ -3,6 +3,7 @@ 'boardcard3': 41, 'boardcard4': 42, 'boardcard5': 13, + 'gameSessionId': 1, 'gametypeId': 21, 'importTime': None, 'maxSeats': 6, @@ -28,4 +29,4 @@ 'street4Raises': 0, 'tableName': u'Vero', 'texture': None, - 'tourneyId': None} + 'tourneyId': None} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-6max-EUR-0.01-0.02.201008.Weird.table.character.txt.hands b/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-6max-EUR-0.01-0.02.201008.Weird.table.character.txt.hands index 8ec3d748..4aa30cdb 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-6max-EUR-0.01-0.02.201008.Weird.table.character.txt.hands +++ b/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-6max-EUR-0.01-0.02.201008.Weird.table.character.txt.hands @@ -3,6 +3,7 @@ 'boardcard3': 0, 'boardcard4': 0, 'boardcard5': 0, + 'gameSessionId': 1, 'gametypeId': 7, 'importTime': None, 'maxSeats': 6, @@ -28,4 +29,4 @@ 'street4Raises': 0, 'tableName': u'Douai\u2013Lens', 'texture': None, - 'tourneyId': None} + 'tourneyId': None} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-9max-USD-0.02-0.05.201007.Short.lived.date.format.txt.hands b/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-9max-USD-0.02-0.05.201007.Short.lived.date.format.txt.hands index a06edc8b..7999c79c 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-9max-USD-0.02-0.05.201007.Short.lived.date.format.txt.hands +++ b/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-9max-USD-0.02-0.05.201007.Short.lived.date.format.txt.hands @@ -3,6 +3,7 @@ 'boardcard3': 0, 'boardcard4': 0, 'boardcard5': 0, + 'gameSessionId': 1, 'gametypeId': 6, 'importTime': None, 'maxSeats': 9, @@ -28,4 +29,4 @@ 'street4Raises': 0, 'tableName': u'Flash', 'texture': None, - 'tourneyId': None} + 'tourneyId': None} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Flop/PLO-6max-USD-0.01-0.02.201003.River.Showdown.txt.hands b/pyfpdb/regression-test-files/cash/FTP/Flop/PLO-6max-USD-0.01-0.02.201003.River.Showdown.txt.hands index 5a84abc1..6d2678ac 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Flop/PLO-6max-USD-0.01-0.02.201003.River.Showdown.txt.hands +++ b/pyfpdb/regression-test-files/cash/FTP/Flop/PLO-6max-USD-0.01-0.02.201003.River.Showdown.txt.hands @@ -3,6 +3,7 @@ 'boardcard3': 8, 'boardcard4': 51, 'boardcard5': 5, + 'gameSessionId': 1, 'gametypeId': 8, 'importTime': None, 'maxSeats': 6, @@ -28,4 +29,4 @@ 'street4Raises': 0, 'tableName': u'Gaines', 'texture': None, - 'tourneyId': None} + 'tourneyId': None} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Stud/Razz-USD-0.10-0.20-201012.CCT.and.ET.timeformat.txt.hands b/pyfpdb/regression-test-files/cash/FTP/Stud/Razz-USD-0.10-0.20-201012.CCT.and.ET.timeformat.txt.hands index 0c845eb0..94af5c23 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Stud/Razz-USD-0.10-0.20-201012.CCT.and.ET.timeformat.txt.hands +++ b/pyfpdb/regression-test-files/cash/FTP/Stud/Razz-USD-0.10-0.20-201012.CCT.and.ET.timeformat.txt.hands @@ -3,6 +3,7 @@ 'boardcard3': 0, 'boardcard4': 0, 'boardcard5': 0, + 'gameSessionId': 1, 'gametypeId': 5, 'importTime': None, 'maxSeats': 8, @@ -28,4 +29,4 @@ 'street4Raises': 0, 'tableName': u'Mart', 'texture': None, - 'tourneyId': None} + 'tourneyId': None} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Stud/Razz-USD-0.10-0.20-201012.Player6.listed.but.doesnt.act.txt.hands b/pyfpdb/regression-test-files/cash/FTP/Stud/Razz-USD-0.10-0.20-201012.Player6.listed.but.doesnt.act.txt.hands index 11b8ff39..6baeee78 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Stud/Razz-USD-0.10-0.20-201012.Player6.listed.but.doesnt.act.txt.hands +++ b/pyfpdb/regression-test-files/cash/FTP/Stud/Razz-USD-0.10-0.20-201012.Player6.listed.but.doesnt.act.txt.hands @@ -3,6 +3,7 @@ 'boardcard3': 0, 'boardcard4': 0, 'boardcard5': 0, + 'gameSessionId': 1, 'gametypeId': 1, 'importTime': None, 'maxSeats': 8, @@ -28,4 +29,4 @@ 'street4Raises': 0, 'tableName': u'Mart', 'texture': None, - 'tourneyId': None} + 'tourneyId': None} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/OnGame/Flop/NLHE-10max-USD-0.02-0.04-201102.Speed.table.BWin.txt.hands b/pyfpdb/regression-test-files/cash/OnGame/Flop/NLHE-10max-USD-0.02-0.04-201102.Speed.table.BWin.txt.hands index ae33fa94..6e318d22 100644 --- a/pyfpdb/regression-test-files/cash/OnGame/Flop/NLHE-10max-USD-0.02-0.04-201102.Speed.table.BWin.txt.hands +++ b/pyfpdb/regression-test-files/cash/OnGame/Flop/NLHE-10max-USD-0.02-0.04-201102.Speed.table.BWin.txt.hands @@ -3,6 +3,7 @@ 'boardcard3': 50, 'boardcard4': 49, 'boardcard5': 48, + 'gameSessionId': 1, 'gametypeId': 1, 'importTime': None, 'maxSeats': 10, @@ -28,4 +29,4 @@ 'street4Raises': 0, 'tableName': u'Dijon', 'texture': None, - 'tourneyId': None} + 'tourneyId': None} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-FLH-PM-0.50-1.00-HeroLoses18.txt.hands b/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-FLH-PM-0.50-1.00-HeroLoses18.txt.hands index 75cb4217..d490e517 100644 --- a/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-FLH-PM-0.50-1.00-HeroLoses18.txt.hands +++ b/pyfpdb/regression-test-files/cash/PacificPoker/Flop/888-FLH-PM-0.50-1.00-HeroLoses18.txt.hands @@ -3,6 +3,7 @@ 'boardcard3': 26, 'boardcard4': 9, 'boardcard5': 52, + 'gameSessionId': 1, 'gametypeId': 1, 'importTime': None, 'maxSeats': 10, @@ -28,4 +29,4 @@ 'street4Raises': 0, 'tableName': u'Jerusalem', 'texture': None, - 'tourneyId': None} + 'tourneyId': None} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Side.pot.Biggest.stack.loses.main.txt.hands b/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Side.pot.Biggest.stack.loses.main.txt.hands index ec2abc9c..969c33e1 100644 --- a/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Side.pot.Biggest.stack.loses.main.txt.hands +++ b/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Side.pot.Biggest.stack.loses.main.txt.hands @@ -3,6 +3,7 @@ 'boardcard3': 11, 'boardcard4': 51, 'boardcard5': 4, + 'gameSessionId': 1, 'gametypeId': 1, 'importTime': None, 'maxSeats': 9, @@ -16,7 +17,7 @@ 'sessionId': None, 'showdownPot': 0, 'siteHandNo': u'910116281298310000', - 'startTime': datetime.datetime(2011, 2, 21, 19, 12, 0, tzinfo=pytz.utc), + 'startTime': datetime.datetime(2011, 2, 21, 19, 12, tzinfo=pytz.utc), 'street0Raises': 3, 'street1Pot': 1370, 'street1Raises': 0, @@ -28,4 +29,4 @@ 'street4Raises': 0, 'tableName': u'Joue-les-Tours', 'texture': None, - 'tourneyId': None} + 'tourneyId': None} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/tour/FTP/Stud/Razz-USD-HUSNG-2-201102.Villain.allin.on.bringing.txt.hands b/pyfpdb/regression-test-files/tour/FTP/Stud/Razz-USD-HUSNG-2-201102.Villain.allin.on.bringing.txt.hands index 315dc468..b7b042d7 100644 --- a/pyfpdb/regression-test-files/tour/FTP/Stud/Razz-USD-HUSNG-2-201102.Villain.allin.on.bringing.txt.hands +++ b/pyfpdb/regression-test-files/tour/FTP/Stud/Razz-USD-HUSNG-2-201102.Villain.allin.on.bringing.txt.hands @@ -3,6 +3,7 @@ 'boardcard3': 0, 'boardcard4': 0, 'boardcard5': 0, + 'gameSessionId': 1, 'gametypeId': 1, 'importTime': None, 'maxSeats': 2, @@ -28,4 +29,4 @@ 'street4Raises': 0, 'tableName': u'220338000 1', 'texture': None, - 'tourneyId': 1} + 'tourneyId': 1} \ No newline at end of file