From 3a6b0002bddecee7988b343bf8ae783791a1372b Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Mon, 23 Aug 2010 13:22:40 +0800
Subject: [PATCH 1/3] Remove Table viewer options from settings hash

---
 pyfpdb/GuiBulkImport.py      | 1 -
 pyfpdb/GuiRingPlayerStats.py | 1 -
 2 files changed, 2 deletions(-)

diff --git a/pyfpdb/GuiBulkImport.py b/pyfpdb/GuiBulkImport.py
index dc023e01..943a81fd 100755
--- a/pyfpdb/GuiBulkImport.py
+++ b/pyfpdb/GuiBulkImport.py
@@ -378,7 +378,6 @@ def main(argv=None):
     else:               settings['os'] = 'linuxmac'
 
     settings.update(config.get_db_parameters())
-    settings.update(config.get_tv_parameters())
     settings.update(config.get_import_parameters())
     settings.update(config.get_default_paths())
 
diff --git a/pyfpdb/GuiRingPlayerStats.py b/pyfpdb/GuiRingPlayerStats.py
index 081e1b70..ef519290 100644
--- a/pyfpdb/GuiRingPlayerStats.py
+++ b/pyfpdb/GuiRingPlayerStats.py
@@ -69,7 +69,6 @@ class GuiRingPlayerStats (GuiPlayerStats.GuiPlayerStats):
 
         settings = {}
         settings.update(self.conf.get_db_parameters())
-        settings.update(self.conf.get_tv_parameters())
         settings.update(self.conf.get_import_parameters())
         settings.update(self.conf.get_default_paths())
 

From bc755f3e5f2736435c1552c8cf4127bf1eb29a8e Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Mon, 23 Aug 2010 13:23:39 +0800
Subject: [PATCH 2/3] OnGame: Fix re_CollectPot

So that it actually finds the player that has won money
---
 pyfpdb/OnGameToFpdb.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/OnGameToFpdb.py b/pyfpdb/OnGameToFpdb.py
index 088920d3..ee281c1d 100755
--- a/pyfpdb/OnGameToFpdb.py
+++ b/pyfpdb/OnGameToFpdb.py
@@ -132,8 +132,8 @@ class OnGame(HandHistoryConverter):
             self.re_ShowdownAction = re.compile('(?P<PNAME>.*) shows \[ (?P<CARDS>.+) \]')
 
             # TODO: read SUMMARY correctly for collected pot stuff.
-            #Uchilka, bets $11.75, collects $23.04, net $11.29
-            self.re_CollectPot = re.compile('(?P<PNAME>.*), bets.+, collects \$(?P<POT>\d*\.?\d*), net.* ')
+            # Main pot: 6.75 won by player3 (6.45)
+            self.re_CollectPot = re.compile('Main pot: (?P<POT>\d*\.?\d*) won by %(PLYR)s' % subst)
             self.re_sitsOut    = re.compile('(?P<PNAME>.*) sits out')
 
     def readSupportedGames(self):

From ce5d029d0b70583dc11e1f50c7f792a64037daff Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Mon, 23 Aug 2010 13:29:41 +0800
Subject: [PATCH 3/3] OnGame: Make NLHE parse

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

diff --git a/pyfpdb/OnGameToFpdb.py b/pyfpdb/OnGameToFpdb.py
index ee281c1d..a2320e74 100755
--- a/pyfpdb/OnGameToFpdb.py
+++ b/pyfpdb/OnGameToFpdb.py
@@ -78,7 +78,7 @@ class OnGame(HandHistoryConverter):
             Start\shand:\s(?P<DATETIME>.*)
             Table:\s(?P<TABLE>[\'\w\s]+)\s\[\d+\]\s\(
             (
-            (?P<LIMIT>No\sLimit|Limit|LIMIT|Pot\sLimit)\s
+            (?P<LIMIT>NO_LIMIT|Limit|LIMIT|Pot\sLimit)\s
             (?P<GAME>TEXAS_HOLDEM|RAZZ)\s
             (?P<SB>[.0-9]+)/
             (?P<BB>[.0-9]+)