From 36568075fe24f03df08a10d4fb7edb70d8355a10 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 21 Feb 2009 20:24:11 +0900
Subject: [PATCH 1/2] Add output line for main import code

Main import should probably read summary, meh
---
 pyfpdb/Hand.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index b902dd67..1bc222e3 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -424,6 +424,15 @@ Map the tuple self.gametype onto the pokerstars string describing it
             print >>fh, _("*** SHOW DOWN ***")
             print >>fh, "DEBUG: what do they show"
 
+        # Current PS format has the lines:
+        # s0rrow collected $5.15 from side pot
+        # stervels: shows [Ks Qs] (two pair, Kings and Queens)
+        # stervels collected $45.35 from main pot
+        # Immediately before the summary.
+        # The current importer uses those lines for importing winning rather than the summary
+        for name in self.collected:
+            print >>fh, _("%s collected $%s from x pot" %(name, self.collected[name]))
+
         print >>fh, _("*** SUMMARY ***")
         print >>fh, "%s | Rake $%.2f" % (self.pot, self.rake)
         #print >>fh, _("Total pot $%s | Rake $%.2f" % (self.totalpot, self.rake)) # TODO: side pots

From e8d90bd705c00aa60a70b06817b4f649a58844ef Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 21 Feb 2009 20:42:16 +0900
Subject: [PATCH 2/2] Fix for table names with '-' in them

---
 pyfpdb/EverleafToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index 28c75aaf..6ae9dab1 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -74,7 +74,7 @@ class Everleaf(HandHistoryConverter):
         
         self.re_GameInfo    = re.compile(r".*Blinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+)")
         self.re_SplitHands  = re.compile(r"\n\n+")
-        self.re_HandInfo    = re.compile(r".*#(?P<HID>[0-9]+)\n.*\nBlinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<GAMETYPE>.*) - (?P<DATETIME>\d\d\d\d/\d\d/\d\d - \d\d:\d\d:\d\d)\nTable (?P<TABLE>[ a-zA-Z]+)\nSeat (?P<BUTTON>[0-9]+)")
+        self.re_HandInfo    = re.compile(r".*#(?P<HID>[0-9]+)\n.*\nBlinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<GAMETYPE>.*) - (?P<DATETIME>\d\d\d\d/\d\d/\d\d - \d\d:\d\d:\d\d)\nTable (?P<TABLE>[- a-zA-Z]+)\nSeat (?P<BUTTON>[0-9]+)")
         self.re_PlayerInfo  = re.compile(r"^Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\s+(\$ (?P<CASH>[.0-9]+) USD|new player|All-in) \)", re.MULTILINE)
         self.re_Board       = re.compile(r"\[ (?P<CARDS>.+) \]")