Merge branch 'master' of git://git.assembla.com/mctfpdb

Conflicts:

	pyfpdb/EverleafToFpdb.py
	pyfpdb/FulltiltToFpdb.py

pyfpdb/FulltiltToFpdb.py

@@ -32,7 +32,7 @@ class FullTilt(HandHistoryConverter):
     re_PlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\$(?P<CASH>[.0-9]+)\)\n')
     re_Board        = re.compile(r"\[(?P<CARDS>.+)\]")
 
-    def __init__(self, in_path = '-', out_path = '-', follow = False):
+    def __init__(self, in_path = '-', out_path = '-', follow = False, autostart=True):
         """\
 in_path   (default '-' = sys.stdin)
 out_path  (default '-' = sys.stdout)
@@ -41,7 +41,8 @@ follow :  whether to tail -f the input"""
         logging.info("Initialising FullTilt converter class")
         self.filetype = "text"
         self.codepage = "cp1252"
-        self.start()
+        if autostart:
+            self.start()
 
     def compilePlayerRegexs(self, players):
         if not players <= self.compiledPlayers: # x <= y means 'x is subset of y'
@@ -172,7 +173,7 @@ follow :  whether to tail -f the input"""
     def readBringIn(self, hand):
         m = self.re_BringIn.search(hand.handText,re.DOTALL)
         logging.debug("Player bringing in: %s for %s" %(m.group('PNAME'),  m.group('BRINGIN')))
-
+        
         hand.addBringIn(m.group('PNAME'),  m.group('BRINGIN'))
 
     def readButton(self, hand):
@@ -187,7 +188,7 @@ follow :  whether to tail -f the input"""
             hand.hero = m.group('PNAME')
             # "2c, qh" -> set(["2c","qc"])
             # Also works with Omaha hands.
-            cards = m.group('CARDS')
+            cards = m.group('NEWCARDS')
             cards = [c.strip() for c in cards.split(' ')]
             hand.addHoleCards(cards, m.group('PNAME'))