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

pyfpdb/FulltiltToFpdb.py

@@ -122,21 +122,10 @@ follow :  whether to tail -f the input"""
         hand.handid = m.group('HID')
         hand.tablename = m.group('TABLE')
         hand.starttime = time.strptime(m.group('DATETIME'), "%H:%M:%S ET - %Y/%m/%d")
-        
-        # attributes
-        # (deep 6)
-        # (6 max)
-        # 
-        # be goodd idea to log those what we don't know idea
         hand.maxseats = 8 # assume 8-max until we see otherwise
-        # stud tables are usually 8-max?
-        # 
-        atts = m.group('ATTRIBUTES')
-        if atts:
-            # TODO: parse these
-            pass
-        
-        
+        if m.group('TABLEATTRIBUTES'):
+            m2 = re.search("(\d+) max", m.group('TABLEATTRIBUTES'))
+            hand.maxseats = int(m2.group(1))
 # These work, but the info is already in the Hand class - should be used for tourneys though.
 #       m.group('SB')
 #       m.group('BB')

pyfpdb/GuiBulkImport.py

@@ -176,7 +176,10 @@ class GuiBulkImport():
 #    ComboBox - filter
         self.cbfilter = gtk.combo_box_new_text()
         self.cbfilter.append_text("passthrough")
-        self.cbfilter.append_text("Everleaf")
+        self.cbfilter.append_text("BetfairToFpdb")
+        self.cbfilter.append_text("EverleafToFpdb")
+        self.cbfilter.append_text("FulltiltToFpdb")
+        self.cbfilter.append_text("PokerStarsToFpdb")
         self.cbfilter.set_active(0)
         self.table.attach(self.cbfilter, 3, 4, 2, 3, xpadding = 10, ypadding = 0, yoptions=gtk.SHRINK)
         self.cbfilter.show()

pyfpdb/fpdb_save_to_db.py

@@ -28,7 +28,7 @@ SQLITE          = 4
 
 fastStoreHudCache = True   # set this to True to test the new storeHudCache routine
 
-saveActions = False    # set this to False to avoid storing action data
+saveActions = True  # set this to False to avoid storing action data
                     # Pros: speeds up imports
                     # Cons: no action data is saved, so you need to keep the hand histories
                     #       variance not available on stats page
@@ -70,8 +70,10 @@ def ring_holdem_omaha(config, backend, db, cursor, base, category, site_hand_no,
     """stores a holdem/omaha hand into the database"""
 
     import_options = config.get_import_parameters()
-    saveActions = True if import_options['saveActions'] == 'True' else False
-    fastStoreHudCache = True if import_options['fastStoreHudCache'] == 'True' else False
+    saveActions = False if import_options['saveActions'] == 'False' else True
+    fastStoreHudCache = False if import_options['fastStoreHudCache'] == 'False' else True
+
+    # print "DEBUG: saveActions = '%s' fastStoreHudCache = '%s'"%(saveActions, fastStoreHudCache)
 
     t0 = time()
     fpdb_simple.fillCardArrays(len(names), base, category, card_values, card_suits)

pyfpdb/fpdb_simple.py

@@ -29,6 +29,8 @@ MYSQL_INNODB    = 2
 PGSQL           = 3
 SQLITE          = 4
 
+DBTEST = False
+
 # Data Structures for index and foreign key creation
 # drop_code is an int with possible values:  0 - don't drop for bulk import
 #                                            1 - drop during bulk import
@@ -714,7 +716,7 @@ def filterCrap(site, hand, isTourney):
             hand[i] = False
         elif (hand[i].find(": ")!=-1 and site=="ftp" and hand[i].find("Seat ")==-1 and hand[i].find(": Table")==-1): #filter ftp chat
             hand[i] = False
-        if isTourney:
+        if isTourney and not hand[i] == False:
             if (hand[i].endswith(" is sitting out") and (not hand[i].startswith("Seat "))):
                 hand[i] = False
         elif hand[i]:
@@ -1511,11 +1513,18 @@ def storeActions(cursor, handsPlayersIds, actionTypes, allIns, actionAmounts, ac
 #stores into table hands_actions
     #print "start of storeActions, actionNos:",actionNos
     #print " action_amounts:",action_amounts
+    inserts = []
     for i in xrange(len(actionTypes)): #iterate through streets
         for j in xrange(len(actionTypes[i])): #iterate through names
             for k in xrange(len(actionTypes[i][j])): #iterate through individual actions of that player on that street
-                cursor.execute ("INSERT INTO HandsActions (handPlayerId, street, actionNo, action, allIn, amount) VALUES (%s, %s, %s, %s, %s, %s)"
-                               , (handsPlayersIds[j], i, actionNos[i][j][k], actionTypes[i][j][k], allIns[i][j][k], actionAmounts[i][j][k]))
+                if DBTEST == False:
+                    cursor.execute("INSERT INTO HandsActions (handPlayerId, street, actionNo, action, allIn, amount) VALUES (%s, %s, %s, %s, %s, %s)", (handsPlayersIds[j], i, actionNos[i][j][k], actionTypes[i][j][k], allIns[i][j][k], actionAmounts[i][j][k]))
+                else:
+                    # Add inserts into a list and let 
+                    inserts = inserts + [(handsPlayersIds[j], i, actionNos[i][j][k], actionTypes[i][j][k], allIns[i][j][k], actionAmounts[i][j][k])]
+
+    if DBTEST == True:
+        cursor.executemany("INSERT INTO HandsActions (handPlayerId, street, actionNo, action, allIn, amount) VALUES (%s, %s, %s, %s, %s, %s)", inserts)
 #end def storeActions
  
 def store_board_cards(cursor, hands_id, board_values, board_suits):