From ff675fb3aea6282ba82eae564045e018996ac4a7 Mon Sep 17 00:00:00 2001 From: Matt Turnbull Date: Thu, 12 Mar 2009 03:15:34 +0000 Subject: [PATCH 1/2] import working? --- pyfpdb/Hand.py | 4 ---- pyfpdb/fpdb_import.py | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py index f77b9425..9591525e 100644 --- a/pyfpdb/Hand.py +++ b/pyfpdb/Hand.py @@ -102,10 +102,6 @@ If a player has None chips he won't be added.""" else: logging.error("markstreets didn't match") -#def addHoleCards -- to Holdem subclass - - - def checkPlayerExists(self,player): if player not in [p[1] for p in self.players]: print "checkPlayerExists", player, "fail" diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py index d86c4214..15c25ac8 100644 --- a/pyfpdb/fpdb_import.py +++ b/pyfpdb/fpdb_import.py @@ -252,9 +252,9 @@ class Importer: supp = conv.readSupportedGames() # Should this be done by HHC on init? #gt = conv.determineGameType() # TODO: Check that gt is in supp - error appropriately if not - conv.processFile() + #conv.processFile() if(conv.getStatus()): - (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(conv.getProcessedFile(), site) + (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(out_path, site) else: # conversion didn't work # TODO: appropriate response? From cd3d4ef835d90fb4d0f517b3d48dd2309e38206a Mon Sep 17 00:00:00 2001 From: Matt Turnbull Date: Thu, 12 Mar 2009 03:58:42 +0000 Subject: [PATCH 2/2] no longer 'safely' appends -- will now overwrite out_path. --- pyfpdb/HandHistoryConverter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py index 7ed679a4..a627766e 100644 --- a/pyfpdb/HandHistoryConverter.py +++ b/pyfpdb/HandHistoryConverter.py @@ -90,7 +90,7 @@ class HandHistoryConverter(threading.Thread): else: # TODO: out_path should be sanity checked before opening. Perhaps in fpdb_import? # I'm not sure what we're looking for, although we don't want out_path==in_path!='-' - self.out_fh = open(self.out_path, 'a') #TODO: append may be overly conservative. + self.out_fh = open(self.out_path, 'w') # doomswitch is now on :| self.sitename = sitename self.follow = follow self.compiledPlayers = set()