diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py index 6ae9dab1..c8f86b4f 100755 --- a/pyfpdb/EverleafToFpdb.py +++ b/pyfpdb/EverleafToFpdb.py @@ -108,6 +108,8 @@ class Everleaf(HandHistoryConverter): def readHandInfo(self, hand): m = self.re_HandInfo.search(hand.string) + if(m == None): + print "DEBUG: re_HandInfo.search failed: '%s'" %(hand.string) hand.handid = m.group('HID') hand.tablename = m.group('TABLE') # These work, but the info is already in the Hand class - should be used for tourneys though. diff --git a/pyfpdb/GuiBulkImport.py b/pyfpdb/GuiBulkImport.py index 1ac5f701..b5e87755 100755 --- a/pyfpdb/GuiBulkImport.py +++ b/pyfpdb/GuiBulkImport.py @@ -223,6 +223,7 @@ if __name__ == '__main__': #Do something useful importer = fpdb_import.Importer(False,settings, config) importer.setDropIndexes("auto") + importer.setFailOnError(True) importer.addImportFile(options.filename) importer.setCallHud(False) importer.runImport() diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py index 3636ac89..cebfeea7 100644 --- a/pyfpdb/Hand.py +++ b/pyfpdb/Hand.py @@ -599,8 +599,11 @@ class Pot(object): return "Total pot $%.2f Main pot $%.2f. Side pot $%2.f." % (self.total, self.pots[0], self.pots[1]) elif len(self.pots) == 3: return "Total pot $%.2f Main pot $%.2f. Side pot-1 $%2.2f. Side pot-2 $%.2f." % (self.total, self.pots[0], self.pots[1], self.pots[2]) + elif len(self.pots) == 0: + # no small blind and walk in bb (hopefully) + return "Total pot $%.2f" % (self.total,) else: - return "maybe no pot.. or too many pots.. no small blind and walk in bb?." + return _("too many pots.. no small blind and walk in bb?. self.pots: %s" %(self.pots)) # I don't know stars format for a walk in the bb when sb doesn't post. # The thing to do here is raise a Hand error like fpdb import does and file it into errors.txt