More fixing of import options.

This commit is contained in:
Ray 2009-03-18 12:32:34 -04:00
parent e67f715f27
commit 8009281e5a
2 changed files with 17 additions and 34 deletions

View File

@ -32,6 +32,13 @@ import shutil
import xml.dom.minidom
from xml.dom.minidom import Node
def fix_tf(x):
if x == "1" or x == 1 or string.lower(x) == "true" or string.lower(x) == "t":
return True
if x == "0" or x == 0 or string.lower(x) == "false" or string.lower(x) == "f":
return False
return False
class Layout:
def __init__(self, node):
@ -206,11 +213,11 @@ class Import:
self.callFpdbHud = node.getAttribute("callFpdbHud")
self.hhArchiveBase = node.getAttribute("hhArchiveBase")
if node.hasAttribute("saveActions"):
self.saveActions = node.getAttribute("saveActions")
self.saveActions = fix_tf(node.getAttribute("saveActions"))
else:
self.saveActions = True
if node.hasAttribute("fastStoreHudCache"):
self.fastStoreHudCache = node.getAttribute("fastStoreHudCache")
self.fastStoreHudCache = fix_tf(node.getAttribute("fastStoreHudCache"))
else:
self.fastStoreHudCache = False

View File

@ -40,14 +40,8 @@ def ring_stud(config, backend, db, cursor, base, category, site_hand_no, gametyp
,seatNos):
import_options = config.get_import_parameters()
if import_options['saveActions'] == 'True':
saveActions = True
else:
saveActions = False
if import_options['fastStoreHudCache'] == 'True':
fastStoreHudCache = True
else:
fastStoreHudCache = False
saveActions = import_options['saveActions']
fastStoreHudCache = import_options['fastStoreHudCache']
fpdb_simple.fillCardArrays(len(names), base, category, card_values, card_suits)
@ -74,14 +68,8 @@ def ring_holdem_omaha(config, backend, db, cursor, base, category, site_hand_no,
"""stores a holdem/omaha hand into the database"""
import_options = config.get_import_parameters()
if import_options['saveActions'] == 'True':
saveActions = True
else:
saveActions = False
if import_options['fastStoreHudCache'] == 'True':
fastStoreHudCache = True
else:
fastStoreHudCache = False
saveActions = import_options['saveActions']
fastStoreHudCache = import_options['fastStoreHudCache']
t0 = time()
fpdb_simple.fillCardArrays(len(names), base, category, card_values, card_suits)
@ -121,14 +109,8 @@ def tourney_holdem_omaha(config, backend, db, cursor, base, category, siteTourne
"""stores a tourney holdem/omaha hand into the database"""
import_options = config.get_import_parameters()
if import_options['saveActions'] == 'True':
saveActions = True
else:
saveActions = False
if import_options['fastStoreHudCache'] == 'True':
fastStoreHudCache = True
else:
fastStoreHudCache = False
saveActions = import_options['saveActions']
fastStoreHudCache = import_options['fastStoreHudCache']
fpdb_simple.fillCardArrays(len(names), base, category, card_values, card_suits)
fpdb_simple.fill_board_cards(board_values, board_suits)
@ -164,14 +146,8 @@ def tourney_stud(config, backend, db, cursor, base, category, siteTourneyNo, buy
#stores a tourney stud/razz hand into the database
import_options = config.get_import_parameters()
if import_options['saveActions'] == 'True':
saveActions = True
else:
saveActions = False
if import_options['fastStoreHudCache'] == 'True':
fastStoreHudCache = True
else:
fastStoreHudCache = False
saveActions = import_options['saveActions']
fastStoreHudCache = import_options['fastStoreHudCache']
fpdb_simple.fillCardArrays(len(names), base, category, cardValues, cardSuits)