Merge branch 'sorrow' into chazdazzle

This commit is contained in:
Chaz Littlejohn 2011-03-30 03:51:08 +00:00
commit cb989b8570
19 changed files with 38 additions and 20 deletions

View File

@ -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

View File

@ -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}

View File

@ -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}

View File

@ -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}

View File

@ -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}

View File

@ -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}

View File

@ -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}

View File

@ -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}

View File

@ -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}

View File

@ -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}

View File

@ -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}

View File

@ -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}

View File

@ -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}

View File

@ -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}

View File

@ -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}

View File

@ -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}

View File

@ -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}

View File

@ -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}

View File

@ -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}