From 3d6bd0eb46fbc8c319fa798521d937dffd9266f0 Mon Sep 17 00:00:00 2001
From: Ray <ray.barker@hughes.net>
Date: Mon, 9 Mar 2009 11:37:34 -0400
Subject: [PATCH] New query: get common cards for mucked card display.

---
 pyfpdb/Database.py | 19 +++++++++++++++++--
 pyfpdb/SQL.py      | 11 +++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 7b376944..ae011576 100755
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -129,13 +129,28 @@ class Database:
             cards[s_dict['seat_number']] = (self.convert_cards(s_dict))
         return cards
 
+    def get_common_cards(self, hand):
+        """Get and return the community cards for the specified hand."""
+        cards = {}
+        c = self.connection.cursor()
+        c.execute(self.sql.query['get_common_cards'], hand)
+        colnames = [desc[0] for desc in c.description]
+        for row in c.fetchall():
+            s_dict = {}
+            for name, val in zip(colnames, row):
+                s_dict[name] = val
+            cards['common'] = (self.convert_cards(s_dict))
+        return cards
+
     def convert_cards(self, d):
         ranks = ('', '', '2', '3', '4', '5', '6', '7', '8', '9', 'T', 'J', 'Q', 'K', 'A')
         cards = ""
         for i in range(1, 8):
-            if d['card' + str(i) + 'Value'] == None:
+            key = 'card' + str(i) + 'Value'
+            if not d.has_key(key): continue
+            if d[key] == None:
                 break
-            elif d['card' + str(i) + 'Value'] == 0:
+            elif d[key] == 0:
                 cards += "xx"
             else:
                 cards += ranks[d['card' + str(i) + 'Value']] + d['card' +str(i) + 'Suit']
diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index 162e68f0..2c67cb0a 100644
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@@ -361,6 +361,17 @@ class Sql:
                     order by seatNo
                 """
 
+            self.query['get_common_cards'] = """
+                    select 
+                        card1Value, card1Suit, 
+                        card2Value, card2Suit, 
+                        card3Value, card3Suit, 
+                        card4Value, card4Suit, 
+                        card5Value, card5Suit
+                    from BoardCards
+                    where handId = %s
+                """
+
             self.query['get_action_from_hand'] = """
                 SELECT street, Players.name, HandsActions.action, HandsActions.amount, actionno
                 FROM Players, HandsActions, HandsPlayers