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 pass
else: else:
# Stats don't match. # 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. # Not an error. gametypeIds are dependent on the order added to the db.
#print "DEBUG: Skipping mismatched gamtypeId" #print "DEBUG: Skipping mismatched gamtypeId"
pass pass

View File

@ -3,6 +3,7 @@
'boardcard3': 0, 'boardcard3': 0,
'boardcard4': 5, 'boardcard4': 5,
'boardcard5': 29, 'boardcard5': 29,
'gameSessionId': 1,
'gametypeId': 1, 'gametypeId': 1,
'importTime': None, 'importTime': None,
'maxSeats': 10, 'maxSeats': 10,
@ -28,4 +29,4 @@
'street4Raises': 0, 'street4Raises': 0,
'tableName': u'Toulouse-2', 'tableName': u'Toulouse-2',
'texture': None, 'texture': None,
'tourneyId': None} 'tourneyId': None}

View File

@ -3,6 +3,7 @@
'boardcard3': 0, 'boardcard3': 0,
'boardcard4': 0, 'boardcard4': 0,
'boardcard5': 0, 'boardcard5': 0,
'gameSessionId': 1,
'gametypeId': 12, 'gametypeId': 12,
'importTime': None, 'importTime': None,
'maxSeats': 6, 'maxSeats': 6,
@ -28,4 +29,4 @@
'street4Raises': 0, 'street4Raises': 0,
'tableName': u"David's Draw", 'tableName': u"David's Draw",
'texture': None, 'texture': None,
'tourneyId': None} 'tourneyId': None}

View File

@ -3,6 +3,7 @@
'boardcard3': 0, 'boardcard3': 0,
'boardcard4': 0, 'boardcard4': 0,
'boardcard5': 0, 'boardcard5': 0,
'gameSessionId': 1,
'gametypeId': 1, 'gametypeId': 1,
'importTime': None, 'importTime': None,
'maxSeats': 6, 'maxSeats': 6,
@ -29,4 +30,4 @@
'street4Raises': 0, 'street4Raises': 0,
'tableName': u'Rocky Cliff', 'tableName': u'Rocky Cliff',
'texture': None, 'texture': None,
'tourneyId': None} 'tourneyId': None}

View File

@ -3,6 +3,7 @@
'boardcard3': 0, 'boardcard3': 0,
'boardcard4': 0, 'boardcard4': 0,
'boardcard5': 0, 'boardcard5': 0,
'gameSessionId': 1,
'gametypeId': 1, 'gametypeId': 1,
'importTime': None, 'importTime': None,
'maxSeats': 6, 'maxSeats': 6,
@ -28,4 +29,4 @@
'street4Raises': 0, 'street4Raises': 0,
'tableName': u'Shady Oak', 'tableName': u'Shady Oak',
'texture': None, 'texture': None,
'tourneyId': None} 'tourneyId': None}

View File

@ -3,6 +3,7 @@
'boardcard3': 0, 'boardcard3': 0,
'boardcard4': 0, 'boardcard4': 0,
'boardcard5': 0, 'boardcard5': 0,
'gameSessionId': 1,
'gametypeId': 117, 'gametypeId': 117,
'importTime': None, 'importTime': None,
'maxSeats': 6, 'maxSeats': 6,
@ -28,4 +29,4 @@
'street4Raises': 0, 'street4Raises': 0,
'tableName': u'Calla Lily', 'tableName': u'Calla Lily',
'texture': None, 'texture': None,
'tourneyId': None} 'tourneyId': None}

View File

@ -3,6 +3,7 @@
'boardcard3': 0, 'boardcard3': 0,
'boardcard4': 0, 'boardcard4': 0,
'boardcard5': 0, 'boardcard5': 0,
'gameSessionId': 1,
'gametypeId': 1, 'gametypeId': 1,
'importTime': None, 'importTime': None,
'maxSeats': 6, 'maxSeats': 6,
@ -28,4 +29,4 @@
'street4Raises': 0, 'street4Raises': 0,
'tableName': u'Axe Handle', 'tableName': u'Axe Handle',
'texture': None, 'texture': None,
'tourneyId': None} 'tourneyId': None}

View File

@ -3,6 +3,7 @@
'boardcard3': 0, 'boardcard3': 0,
'boardcard4': 0, 'boardcard4': 0,
'boardcard5': 0, 'boardcard5': 0,
'gameSessionId': 1,
'gametypeId': 2, 'gametypeId': 2,
'importTime': None, 'importTime': None,
'maxSeats': 7, 'maxSeats': 7,
@ -28,4 +29,4 @@
'street4Raises': 0, 'street4Raises': 0,
'tableName': u'Laurelvale', 'tableName': u'Laurelvale',
'texture': None, 'texture': None,
'tourneyId': None} 'tourneyId': None}

View File

@ -3,6 +3,7 @@
'boardcard3': 52, 'boardcard3': 52,
'boardcard4': 17, 'boardcard4': 17,
'boardcard5': 29, 'boardcard5': 29,
'gameSessionId': 1,
'gametypeId': 99, 'gametypeId': 99,
'importTime': None, 'importTime': None,
'maxSeats': 9, 'maxSeats': 9,
@ -28,4 +29,4 @@
'street4Raises': 0, 'street4Raises': 0,
'tableName': u'Slaw', 'tableName': u'Slaw',
'texture': None, 'texture': None,
'tourneyId': None} 'tourneyId': None}

View File

@ -3,6 +3,7 @@
'boardcard3': 41, 'boardcard3': 41,
'boardcard4': 42, 'boardcard4': 42,
'boardcard5': 13, 'boardcard5': 13,
'gameSessionId': 1,
'gametypeId': 21, 'gametypeId': 21,
'importTime': None, 'importTime': None,
'maxSeats': 6, 'maxSeats': 6,
@ -28,4 +29,4 @@
'street4Raises': 0, 'street4Raises': 0,
'tableName': u'Vero', 'tableName': u'Vero',
'texture': None, 'texture': None,
'tourneyId': None} 'tourneyId': None}

View File

@ -3,6 +3,7 @@
'boardcard3': 0, 'boardcard3': 0,
'boardcard4': 0, 'boardcard4': 0,
'boardcard5': 0, 'boardcard5': 0,
'gameSessionId': 1,
'gametypeId': 7, 'gametypeId': 7,
'importTime': None, 'importTime': None,
'maxSeats': 6, 'maxSeats': 6,
@ -28,4 +29,4 @@
'street4Raises': 0, 'street4Raises': 0,
'tableName': u'Douai\u2013Lens', 'tableName': u'Douai\u2013Lens',
'texture': None, 'texture': None,
'tourneyId': None} 'tourneyId': None}

View File

@ -3,6 +3,7 @@
'boardcard3': 0, 'boardcard3': 0,
'boardcard4': 0, 'boardcard4': 0,
'boardcard5': 0, 'boardcard5': 0,
'gameSessionId': 1,
'gametypeId': 6, 'gametypeId': 6,
'importTime': None, 'importTime': None,
'maxSeats': 9, 'maxSeats': 9,
@ -28,4 +29,4 @@
'street4Raises': 0, 'street4Raises': 0,
'tableName': u'Flash', 'tableName': u'Flash',
'texture': None, 'texture': None,
'tourneyId': None} 'tourneyId': None}

View File

@ -3,6 +3,7 @@
'boardcard3': 8, 'boardcard3': 8,
'boardcard4': 51, 'boardcard4': 51,
'boardcard5': 5, 'boardcard5': 5,
'gameSessionId': 1,
'gametypeId': 8, 'gametypeId': 8,
'importTime': None, 'importTime': None,
'maxSeats': 6, 'maxSeats': 6,
@ -28,4 +29,4 @@
'street4Raises': 0, 'street4Raises': 0,
'tableName': u'Gaines', 'tableName': u'Gaines',
'texture': None, 'texture': None,
'tourneyId': None} 'tourneyId': None}

View File

@ -3,6 +3,7 @@
'boardcard3': 0, 'boardcard3': 0,
'boardcard4': 0, 'boardcard4': 0,
'boardcard5': 0, 'boardcard5': 0,
'gameSessionId': 1,
'gametypeId': 5, 'gametypeId': 5,
'importTime': None, 'importTime': None,
'maxSeats': 8, 'maxSeats': 8,
@ -28,4 +29,4 @@
'street4Raises': 0, 'street4Raises': 0,
'tableName': u'Mart', 'tableName': u'Mart',
'texture': None, 'texture': None,
'tourneyId': None} 'tourneyId': None}

View File

@ -3,6 +3,7 @@
'boardcard3': 0, 'boardcard3': 0,
'boardcard4': 0, 'boardcard4': 0,
'boardcard5': 0, 'boardcard5': 0,
'gameSessionId': 1,
'gametypeId': 1, 'gametypeId': 1,
'importTime': None, 'importTime': None,
'maxSeats': 8, 'maxSeats': 8,
@ -28,4 +29,4 @@
'street4Raises': 0, 'street4Raises': 0,
'tableName': u'Mart', 'tableName': u'Mart',
'texture': None, 'texture': None,
'tourneyId': None} 'tourneyId': None}

View File

@ -3,6 +3,7 @@
'boardcard3': 50, 'boardcard3': 50,
'boardcard4': 49, 'boardcard4': 49,
'boardcard5': 48, 'boardcard5': 48,
'gameSessionId': 1,
'gametypeId': 1, 'gametypeId': 1,
'importTime': None, 'importTime': None,
'maxSeats': 10, 'maxSeats': 10,
@ -28,4 +29,4 @@
'street4Raises': 0, 'street4Raises': 0,
'tableName': u'Dijon', 'tableName': u'Dijon',
'texture': None, 'texture': None,
'tourneyId': None} 'tourneyId': None}

View File

@ -3,6 +3,7 @@
'boardcard3': 26, 'boardcard3': 26,
'boardcard4': 9, 'boardcard4': 9,
'boardcard5': 52, 'boardcard5': 52,
'gameSessionId': 1,
'gametypeId': 1, 'gametypeId': 1,
'importTime': None, 'importTime': None,
'maxSeats': 10, 'maxSeats': 10,
@ -28,4 +29,4 @@
'street4Raises': 0, 'street4Raises': 0,
'tableName': u'Jerusalem', 'tableName': u'Jerusalem',
'texture': None, 'texture': None,
'tourneyId': None} 'tourneyId': None}

View File

@ -3,6 +3,7 @@
'boardcard3': 11, 'boardcard3': 11,
'boardcard4': 51, 'boardcard4': 51,
'boardcard5': 4, 'boardcard5': 4,
'gameSessionId': 1,
'gametypeId': 1, 'gametypeId': 1,
'importTime': None, 'importTime': None,
'maxSeats': 9, 'maxSeats': 9,
@ -16,7 +17,7 @@
'sessionId': None, 'sessionId': None,
'showdownPot': 0, 'showdownPot': 0,
'siteHandNo': u'910116281298310000', '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, 'street0Raises': 3,
'street1Pot': 1370, 'street1Pot': 1370,
'street1Raises': 0, 'street1Raises': 0,
@ -28,4 +29,4 @@
'street4Raises': 0, 'street4Raises': 0,
'tableName': u'Joue-les-Tours', 'tableName': u'Joue-les-Tours',
'texture': None, 'texture': None,
'tourneyId': None} 'tourneyId': None}

View File

@ -3,6 +3,7 @@
'boardcard3': 0, 'boardcard3': 0,
'boardcard4': 0, 'boardcard4': 0,
'boardcard5': 0, 'boardcard5': 0,
'gameSessionId': 1,
'gametypeId': 1, 'gametypeId': 1,
'importTime': None, 'importTime': None,
'maxSeats': 2, 'maxSeats': 2,
@ -28,4 +29,4 @@
'street4Raises': 0, 'street4Raises': 0,
'tableName': u'220338000 1', 'tableName': u'220338000 1',
'texture': None, 'texture': None,
'tourneyId': 1} 'tourneyId': 1}