evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up handling of mixed games on FTP.

Browse Source
This commit is contained in:
Ray 2009-07-22 19:21:00 -04:00
parent 0291fcf489
commit 94a030922a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pyfpdb/FulltiltToFpdb.py
View File

@ -144,7 +144,6 @@ follow : whether to tail -f the input"""
def readHandInfo(self, hand): def readHandInfo(self, hand):
m = self.re_HandInfo.search(hand.handText,re.DOTALL) m = self.re_HandInfo.search(hand.handText,re.DOTALL)
print "m =", m.groupdict()
if(m == None): if(m == None):
logging.info("Didn't match re_HandInfo") logging.info("Didn't match re_HandInfo")
logging.info(hand.handText) logging.info(hand.handText)
@ -230,7 +229,7 @@ follow : whether to tail -f the input"""
logging.debug("Player bringing in: %s for %s" %(m.group('PNAME'), m.group('BRINGIN'))) logging.debug("Player bringing in: %s for %s" %(m.group('PNAME'), m.group('BRINGIN')))
hand.addBringIn(m.group('PNAME'), m.group('BRINGIN')) hand.addBringIn(m.group('PNAME'), m.group('BRINGIN'))
else: else:
logging.warning("No bringin found") logging.warning("No bringin found, handid =%s" % hand.handid)
def readButton(self, hand): def readButton(self, hand):
hand.buttonpos = int(self.re_Button.search(hand.handText).group('BUTTON')) hand.buttonpos = int(self.re_Button.search(hand.handText).group('BUTTON'))
@ -330,7 +329,6 @@ follow : whether to tail -f the input"""
if m == None: hand.mixed = None if m == None: hand.mixed = None
else: else:
hand.mixed = self.mixes[m.groupdict()['MIXED']] hand.mixed = self.mixes[m.groupdict()['MIXED']]
print "mixed =", hand.mixed
if __name__ == "__main__": if __name__ == "__main__":
parser = OptionParser() parser = OptionParser()

2
pyfpdb/Hand.py
View File

@ -880,6 +880,7 @@ class DrawHand(Hand):
hhc.getRake(self) hhc.getRake(self)
if self.maxseats == None: if self.maxseats == None:
self.maxseats = hhc.guessMaxSeats(self) self.maxseats = hhc.guessMaxSeats(self)
hhc.readOther(self)
elif builtFrom == "DB": elif builtFrom == "DB":
self.select("dummy") # Will need a handId self.select("dummy") # Will need a handId
@ -1047,6 +1048,7 @@ class StudHand(Hand):
hhc.getRake(self) hhc.getRake(self)
if self.maxseats == None: if self.maxseats == None:
self.maxseats = hhc.guessMaxSeats(self) self.maxseats = hhc.guessMaxSeats(self)
hhc.readOther(self)
elif builtFrom == "DB": elif builtFrom == "DB":
self.select("dummy") # Will need a handId self.select("dummy") # Will need a handId