Merge branch 'master' of git://git.assembla.com/free_poker_tools
Conflicts: pyfpdb/fpdb_save_to_db.py
This commit is contained in:
commit
93d2b50867
|
@ -532,7 +532,7 @@ class Config:
|
||||||
return paths
|
return paths
|
||||||
|
|
||||||
def get_frames(self, site = "PokerStars"):
|
def get_frames(self, site = "PokerStars"):
|
||||||
return self.supported_sites[site].use_frames == "True"
|
return self.supported_sites[site].use_frames == True
|
||||||
|
|
||||||
def get_default_colors(self, site = "PokerStars"):
|
def get_default_colors(self, site = "PokerStars"):
|
||||||
colors = {}
|
colors = {}
|
||||||
|
|
|
@ -73,8 +73,8 @@ def ring_holdem_omaha(config, backend, db, cursor, base, category, site_hand_no,
|
||||||
saveActions = False if import_options['saveActions'] == False else True
|
saveActions = False if import_options['saveActions'] == False else True
|
||||||
fastStoreHudCache = True if import_options['fastStoreHudCache'] == True else False
|
fastStoreHudCache = True if import_options['fastStoreHudCache'] == True else False
|
||||||
|
|
||||||
#print "DEBUG: saveActions = '%s' fastStoreHudCache = '%s'"%(saveActions, fastStoreHudCache)
|
# print "DEBUG: saveActions = '%s' fastStoreHudCache = '%s'"%(saveActions, fastStoreHudCache)
|
||||||
#print "DEBUG: import_options = ", import_options
|
# print "DEBUG: import_options = ", import_options
|
||||||
|
|
||||||
t0 = time()
|
t0 = time()
|
||||||
fpdb_simple.fillCardArrays(len(names), base, category, card_values, card_suits)
|
fpdb_simple.fillCardArrays(len(names), base, category, card_values, card_suits)
|
||||||
|
@ -114,8 +114,8 @@ def tourney_holdem_omaha(config, backend, db, cursor, base, category, siteTourne
|
||||||
"""stores a tourney holdem/omaha hand into the database"""
|
"""stores a tourney holdem/omaha hand into the database"""
|
||||||
|
|
||||||
import_options = config.get_import_parameters()
|
import_options = config.get_import_parameters()
|
||||||
saveActions = True if import_options['saveActions'] == 'True' else False
|
saveActions = True if import_options['saveActions'] == True else False
|
||||||
fastStoreHudCache = True if import_options['fastStoreHudCache'] == 'True' else False
|
fastStoreHudCache = True if import_options['fastStoreHudCache'] == True else False
|
||||||
|
|
||||||
fpdb_simple.fillCardArrays(len(names), base, category, card_values, card_suits)
|
fpdb_simple.fillCardArrays(len(names), base, category, card_values, card_suits)
|
||||||
fpdb_simple.fill_board_cards(board_values, board_suits)
|
fpdb_simple.fill_board_cards(board_values, board_suits)
|
||||||
|
@ -151,8 +151,8 @@ def tourney_stud(config, backend, db, cursor, base, category, siteTourneyNo, buy
|
||||||
#stores a tourney stud/razz hand into the database
|
#stores a tourney stud/razz hand into the database
|
||||||
|
|
||||||
import_options = config.get_import_parameters()
|
import_options = config.get_import_parameters()
|
||||||
saveActions = True if import_options['saveActions'] == 'True' else False
|
saveActions = True if import_options['saveActions'] == True else False
|
||||||
fastStoreHudCache = True if import_options['fastStoreHudCache'] == 'True' else False
|
fastStoreHudCache = True if import_options['fastStoreHudCache'] == True else False
|
||||||
|
|
||||||
fpdb_simple.fillCardArrays(len(names), base, category, cardValues, cardSuits)
|
fpdb_simple.fillCardArrays(len(names), base, category, cardValues, cardSuits)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user