From da83795e5a295f5814eec3d7dd01d090080bf78a Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Mon, 10 Nov 2008 23:29:49 +1000
Subject: [PATCH] Fix 'duh' error and grab button position

---
 pyfpdb/EverleafToFpdb.py       | 6 +++---
 pyfpdb/HandHistoryConverter.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index 61e32d85..5e702dbb 100644
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -61,7 +61,7 @@ class Everleaf(HandHistoryConverter):
 		self.setFileType("text")
 		self.rexx.setGameInfoRegex('.*Blinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+)')
 		self.rexx.setSplitHandRegex('\n\n\n\n')
-		self.rexx.setHandInfoRegex('.*#(?P<HID>[0-9]+)\n.*\nBlinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<GAMETYPE>.*) - (?P<YEAR>[0-9]+)/(?P<MON>[0-9]+)/(?P<DAY>[0-9]+) - (?P<HR>[0-9]+):(?P<MIN>[0-9]+):(?P<SEC>[0-9]+)\nTable (?P<TABLE>[ a-zA-Z]+)')
+		self.rexx.setHandInfoRegex('.*#(?P<HID>[0-9]+)\n.*\nBlinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<GAMETYPE>.*) - (?P<YEAR>[0-9]+)/(?P<MON>[0-9]+)/(?P<DAY>[0-9]+) - (?P<HR>[0-9]+):(?P<MIN>[0-9]+):(?P<SEC>[0-9]+)\nTable (?P<TABLE>[ a-zA-Z]+)\nSeat (?P<BUTTON>[0-9]+)')
 		self.rexx.compileRegexes()
 
         def readSupportedGames(self):
@@ -80,7 +80,7 @@ class Everleaf(HandHistoryConverter):
 	def readHandInfo(self, hand):
 		m =  self.rexx.hand_info_re.search(hand.string)
 		hand.handid = m.group('HID')
-		hand.tablename = m.group('GAMETYPE')
+		hand.tablename = m.group('TABLE')
 # These work, but the info is already in the Hand class - should be usecd for tourneys though.
 #		m.group('SB')
 #		m.group('BB')
@@ -94,7 +94,7 @@ class Everleaf(HandHistoryConverter):
 #TODO: Need some date functions to convert to different timezones (Date::Manip for perl rocked for this)
 		hand.starttime = "%d/%02d/%02d %d:%02d:%02d ET" %(int(m.group('YEAR')), int(m.group('MON')), int(m.group('DAY')),
 							  int(m.group('HR')), int(m.group('MIN')), int(m.group('SEC')))
-
+		hand.buttonpos = int(m.group('BUTTON'))
 
         def readPlayerStacks(self):
 		pass
diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py
index 9a8fd456..dbb3928c 100644
--- a/pyfpdb/HandHistoryConverter.py
+++ b/pyfpdb/HandHistoryConverter.py
@@ -129,7 +129,7 @@ class HandHistoryConverter:
 	def writeHand(self, file, hand):
 		"""Write out parsed data"""
 		print "%s Game #%s: %s (%d/%d) - %s" %(hand.sitename, hand.handid, "XXXXhand.gametype", hand.sb, hand.bb, hand.starttime)
-		print "Table '%s' %d-max Seat #%s is the button" %(hand.tablename, hand.maxseats, "XXXXhand.buttonpos")
+		print "Table '%s' %d-max Seat #%s is the button" %(hand.tablename, hand.maxseats, hand.buttonpos)
 #
 #		counter = 1
 #		for player in seating: