From e6fd3afbba04bf28e20b0223f527b9e3a74a6d70 Mon Sep 17 00:00:00 2001 From: steffen123 Date: Mon, 21 Jun 2010 16:45:15 +0200 Subject: [PATCH] renamed totalRebuys/AddOns to totalRebuyCount/AddOnCount --- pyfpdb/AlchemyTables.py | 4 ++-- pyfpdb/FulltiltToFpdb.py | 4 ++-- pyfpdb/SQL.py | 22 +++++++++++----------- pyfpdb/Tourney.py | 13 +++++++------ 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/pyfpdb/AlchemyTables.py b/pyfpdb/AlchemyTables.py index 0aa5ad85..003716b6 100644 --- a/pyfpdb/AlchemyTables.py +++ b/pyfpdb/AlchemyTables.py @@ -356,8 +356,8 @@ tourneys_table = Table('Tourneys', metadata, Column('tourneyName', String(40)), # varchar(40) # Mask use : 1=Positionnal Winnings|2=Match1|4=Match2|...|pow(2,n)=Matchn Column('matrixIdProcessed',SmallInteger, default=0), # TINYINT UNSIGNED DEFAULT 0 - Column('totalRebuys', Integer, default=0), # INT DEFAULT 0 - Column('totalAddons', Integer, default=0), # INT DEFAULT 0 + Column('totalRebuyCount', Integer, default=0), # INT DEFAULT 0 + Column('totalAddOnCount', Integer, default=0), # INT DEFAULT 0 Column('comment', Text), # TEXT Column('commentTs', DateTime), # DATETIME mysql_charset='utf8', diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py index 2c6370e6..1503e10d 100755 --- a/pyfpdb/FulltiltToFpdb.py +++ b/pyfpdb/FulltiltToFpdb.py @@ -582,8 +582,8 @@ class Fulltilt(HandHistoryConverter): "PRIZEPOOL" : "prizepool", "REBUY_AMOUNT" : "rebuyAmount", "ADDON_AMOUNT" : "addOnAmount", - "REBUY_TOTAL" : "totalRebuys", - "ADDONS_TOTAL" : "totalAddOns", + "REBUY_TOTAL" : "totalRebuyCount", + "ADDONS_TOTAL" : "totalAddOnCount", "REBUY_CHIPS" : "rebuyChips", "ADDON_CHIPS" : "addOnChips", "STARTTIME" : "starttime", diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py index 33c247cb..ae6be545 100644 --- a/pyfpdb/SQL.py +++ b/pyfpdb/SQL.py @@ -423,8 +423,8 @@ class Sql: endTime DATETIME, tourneyName varchar(40), matrixIdProcessed TINYINT UNSIGNED DEFAULT 0, /* Mask use : 1=Positionnal Winnings|2=Match1|4=Match2|...|pow(2,n)=Matchn */ - totalRebuys INT DEFAULT 0, - totalAddons INT DEFAULT 0, + totalRebuyCount INT DEFAULT 0, + totalAddOnCount INT DEFAULT 0, comment TEXT, commentTs DATETIME) ENGINE=INNODB""" @@ -439,8 +439,8 @@ class Sql: endTime timestamp without time zone, tourneyName varchar(40), matrixIdProcessed SMALLINT DEFAULT 0, /* Mask use : 1=Positionnal Winnings|2=Match1|4=Match2|...|pow(2,n)=Matchn */ - totalRebuys INT DEFAULT 0, - totalAddons INT DEFAULT 0, + totalRebuyCount INT DEFAULT 0, + totalAddOnCount INT DEFAULT 0, comment TEXT, commentTs timestamp without time zone)""" elif db_server == 'sqlite': @@ -454,8 +454,8 @@ class Sql: endTime REAL, tourneyName TEXT, matrixIdProcessed INT UNSIGNED DEFAULT 0, /* Mask use : 1=Positionnal Winnings|2=Match1|4=Match2|...|pow(2,n)=Matchn */ - totalRebuys INT DEFAULT 0, - totalAddons INT DEFAULT 0, + totalRebuyCount INT DEFAULT 0, + totalAddOnCount INT DEFAULT 0, comment TEXT, commentTs REAL)""" ################################ @@ -3598,8 +3598,8 @@ class Sql: t.endTime, t.tourneyName, t.matrixIdProcessed, - t.totalRebuys, - t.totalAddons, + t.totalRebuyCount, + t.totalAddOnCount, t.comment FROM Tourneys t INNER JOIN TourneyTypes tt ON (t.tourneyTypeId = tt.id) @@ -3609,7 +3609,7 @@ class Sql: self.query['insertTourney'] = """INSERT INTO Tourneys (tourneyTypeId, siteTourneyNo, entries, prizepool, startTime, endTime, tourneyName, matrixIdProcessed, - totalRebuys, totalAddons, comment, commentTs) + totalRebuyCount, totalAddOnCount, comment, commentTs) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) """ @@ -3622,8 +3622,8 @@ class Sql: endTime = %s, tourneyName = %s, matrixIdProcessed = %s, - totalRebuys = %s, - totalAddons = %s, + totalRebuyCount = %s, + totalAddonCount = %s, comment = %s, commentTs = %s WHERE id=%s diff --git a/pyfpdb/Tourney.py b/pyfpdb/Tourney.py index 281a6710..5cc5d03a 100644 --- a/pyfpdb/Tourney.py +++ b/pyfpdb/Tourney.py @@ -1,4 +1,5 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- #Copyright 2009 Stephane Alessio #This program is free software: you can redistribute it and/or modify @@ -73,10 +74,10 @@ class Tourney(object): self.subTourneyFee = None self.rebuyChips = 0 self.addOnChips = 0 - self.rebuyAmount = 0 - self.addOnAmount = 0 - self.totalRebuys = 0 - self.totalAddOns = 0 + self.rebuyAmount = 0 + self.addOnAmount = 0 + self.totalRebuyCount = 0 + self.totalAddOnCount = 0 self.koBounty = 0 self.tourneyComment = None self.players = [] @@ -121,8 +122,8 @@ class Tourney(object): ("ADDON CHIPS", self.addOnChips), ("REBUY AMOUNT", self.rebuyAmount), ("ADDON AMOUNT", self.addOnAmount), - ("TOTAL REBUYS", self.totalRebuys), - ("TOTAL ADDONS", self.totalAddOns), + ("TOTAL REBUYS", self.totalRebuyCount), + ("TOTAL ADDONS", self.totalAddOnCount), ("KO BOUNTY", self.koBounty), ("TOURNEY COMMENT", self.tourneyComment) )