From c4659ce5efa6d5940e7d8879deebd6387db231f8 Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 16 Jun 2009 09:55:23 -0400 Subject: [PATCH] Untangle settings and backend changes. --- pyfpdb/fpdb_parse_logic.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pyfpdb/fpdb_parse_logic.py b/pyfpdb/fpdb_parse_logic.py index 150707c1..2d93b69f 100644 --- a/pyfpdb/fpdb_parse_logic.py +++ b/pyfpdb/fpdb_parse_logic.py @@ -21,7 +21,8 @@ import fpdb_simple import fpdb_save_to_db #parses a holdem hand -def mainParser(backend, db, cursor, siteID, category, hand, config): +def mainParser(settings, db, cursor, siteID, category, hand, config): + backend = settings['db-backend'] category = fpdb_simple.recogniseCategory(hand[0]) base = "hold" if category == "holdem" or category == "omahahi" or category == "omahahilo" else "stud" @@ -141,7 +142,7 @@ def mainParser(backend, db, cursor, siteID, category, hand, config): if base == "hold": result = fpdb_save_to_db.tourney_holdem_omaha( - config, backend, db, cursor, base, category, siteTourneyNo, buyin + config, settings, db, cursor, base, category, siteTourneyNo, buyin , fee, knockout, entries, prizepool, tourneyStartTime , payin_amounts, ranks, tourneyTypeId, siteID, siteHandNo , gametypeID, handStartTime, names, playerIDs, startCashes @@ -150,7 +151,7 @@ def mainParser(backend, db, cursor, siteID, category, hand, config): , actionNos, hudImportData, maxSeats, tableName, seatNos) elif base == "stud": result = fpdb_save_to_db.tourney_stud( - config, backend, db, cursor, base, category, siteTourneyNo + config, settings, db, cursor, base, category, siteTourneyNo , buyin, fee, knockout, entries, prizepool, tourneyStartTime , payin_amounts, ranks, tourneyTypeId, siteID, siteHandNo , gametypeID, handStartTime, names, playerIDs, startCashes @@ -162,7 +163,7 @@ def mainParser(backend, db, cursor, siteID, category, hand, config): else: if base == "hold": result = fpdb_save_to_db.ring_holdem_omaha( - config, backend, db, cursor, base, category, siteHandNo + config, settings, db, cursor, base, category, siteHandNo , gametypeID, handStartTime, names, playerIDs , startCashes, positions, cardValues, cardSuits , boardValues, boardSuits, winnings, rakes @@ -170,7 +171,7 @@ def mainParser(backend, db, cursor, siteID, category, hand, config): , hudImportData, maxSeats, tableName, seatNos) elif base == "stud": result = fpdb_save_to_db.ring_stud( - config, backend, db, cursor, base, category, siteHandNo, gametypeID + config, settings, db, cursor, base, category, siteHandNo, gametypeID , handStartTime, names, playerIDs, startCashes, antes , cardValues, cardSuits, winnings, rakes, actionTypes, allIns , actionAmounts, actionNos, hudImportData, maxSeats, tableName