Merge branch 'chazdazzle' of git://github.com/ChazDazzle/fpdb-chaz

pyfpdb/Database.py

@@ -1855,7 +1855,7 @@ class Database:
         hbulk.append( [ hdata['tableName'],
                         hdata['siteHandNo'],
                         hdata['tourneyId'],
-                        hdata['gameTypeId'],
+                        hdata['gametypeId'],
                         hdata['sessionId'],
                         hdata['gameSessionId'], 
                         hdata['startTime'],                

pyfpdb/Hand.py

@@ -102,7 +102,7 @@ class Hand(object):
         self.seating = []
         self.players = []
         self.posted = []
-        self.tourneysPlayersIds = []
+        self.tourneysPlayersIds = {}
 
         # Collections indexed by street names
         self.bets = {}
@@ -277,7 +277,7 @@ dealt   whether they were seen in a 'dealt to' line
         """ Function to insert Hand into database
             Should not commit, and do minimal selects. Callers may want to cache commits
             db: a connected Database object"""
-        self.hands['gameTypeId'] = self.dbid_gt
+        self.hands['gametypeId'] = self.dbid_gt
         self.hands['seats'] = len(self.dbid_pids)
         hbulk = db.storeHand(self.hands, hbulk, doinsert, printtest)
         return hbulk

pyfpdb/WinamaxToFpdb.py

@@ -52,7 +52,7 @@ class Winamax(HandHistoryConverter):
     siteId   = 14 # Needs to match id entry in Sites database
 
     mixes = { } # Legal mixed games
-    sym = {'USD': "\$", 'CAD': "\$", 'T$': "", "EUR": "\xe2\x82\xac", "GBP": "\xa3"}         # ADD Euro, Sterling, etc HERE
+    sym = {'USD': "\$", 'CAD': "\$", 'T$': "", "EUR": u"\xe2\x82\xac|\u20ac", "GBP": "\xa3"}         # ADD Euro, Sterling, etc HERE
     substitutions = {
                      'LEGAL_ISO' : "USD|EUR|GBP|CAD|FPP",     # legal ISO currency codes
                             'LS' : u"\$|\xe2\x82\xac|\u20ac|" # legal currency symbols - Euro(cp1252, utf-8)