p69 - added position to PrintPlayerHudData and removed the existing .expected file as its useless basically. updated it to include new fields.

docs/known-bugs-and-planned-features.txt

@@ -2,19 +2,16 @@ todolist (db=database, imp=importer, tv=tableviewer)
 Everything is subject to change and the order does not indicate priority. Patches for any of these or other features are very welcome, see readme-overview.txt for contacts.
 Please also see db-todo.txt
 
-alpha2 (release 22Aug)
-======
-seperate and improve instructions for update
-update website for dropping profile subfolder
-
 alpha3 (release by 31Aug)
 ======
+update website for dropping profile subfolder and add dedicated update page
+update status or make a support matrix table for website
+add instructions for mailing list to contacts
+
 anonymiser script to generate testdata without making a dozen find&replace all... remember to replace hand no with running no
 update PrintPlayerHudData to take position and all the new fields into account
 specify NOT NULL on almost all table columns
 ebuild: symlink doesnt work, USE gtk, more automation, update install-in-gentoo.txt, set permissions in it, copy docs to correct place, use games eclass or whatever to get games group notice, print notice about install-in-gentoo.txt and mysql --config
-update status or make a support matrix table for website
-add instructions for mailing list to contacts
 auto import only runs on one file per start
 make windows use correct language version of Appdata, e.g. Anwendungdaten
 make 3 default HUD configs (easy (4-5 fields), advanced (10ish fields), crazy (20 or so))

docs/release-notes.txt

@@ -1,16 +1,18 @@
 alpha2
 ======
 Hi everyone,
-we are proud to announce the second alpha release of fpdb, the free/libre open source poker tracker. The biggest highlight is the HUD for Linux made by Ray (and perhaps Mac, not sure). But for everyone fpdb now also supports PS tournaments (SnG and MTT) and FTP ring games. There is also a new auto-importer though it currently only runs on one file per instance (though you can open multiple instances of fpdb).
+we are proud to announce the second alpha release of fpdb, the free/libre open source poker tracker. The biggest highlight is the HUD for Linux made by Ray (and perhaps Mac, not sure). But for everyone fpdb now also supports PS tournaments (SnG and MTT) and FTP ring games. There is also a new auto-importer though it currently only runs on one file per instance (but you can open multiple instances of fpdb).
 Fpdb also parses alot of new situations into the cache table for the HUD, most of which are already available through the Linux HUD. There have also been a large number of bugfixes for all kinds of things. For full details of the changes see the git commit comments.
 
-The website will be updated shortly but in the meantime please note that the configuration file now resides in ~/.fpdb/default.conf on Linux/Mac and in C:\Documents and Settings\Application Data\fpdb\default.conf on Windows (you have to translate the Documents and Settings, but not the Application data bit). Apart from that just follow the instructions on the site. I will be updating/improving the fpdb ebuild for Gentoo next week, please send me a PM or email if you would like a package for another Linux/BSD.
+You can download fpdb at https://sourceforge.net/project/showfiles.php?group_id=226872
+
+Our website at http://fpdb.sourceforge.net/ will be updated shortly but in the meantime please note that the configuration file now resides in ~/.fpdb/default.conf on Linux/Mac and in C:\Documents and Settings\Application Data\fpdb\default.conf on Windows (on non-English Windows you have to translate the Documents and Settings, but not the Application data bit). Apart from that just follow the instructions on the site. I will be updating/improving the fpdb ebuild for Gentoo next week, please send me a PM or email if you would like a package for another Linux/BSD.
 
 To use the HUD in Linux simply run the auto importer whilst having the table open. You will also have to rename HUD_config.xml.example to HUD_config.xml and edit the database parameters in there in addition to what is written in the install guide.
 
 If you've been using fpdb alpha1 just delete the fpdb folder, follow the installation guide except for installing the dependencies, then run fpdb and run recreate tables. Note that you will have to reimport ALL your history files.
 
-For external devs (in particular Youre Toast): The table design has gone through some changes, though most of it was just renaming to make a consistent naming scheme and to make it more flexible towards stud/razz type games. I do not expect to having to make any future changes to the existing fields but I cannot yet guarantee that. There will be some additional fields in particular in the HudCache table. Please let me know if you need any further fields.
+For external devs (in particular Youre Toast): The table design has gone through some changes, though most of it was just renaming to make a consistent naming scheme and to make it more flexible towards stud/razz type games. I do not expect to having to make any future changes to the existing fields but I cannot yet guarantee that. There will be some additional fields in particular in the HudCache table. Please let me know if you need any further fields. I realise my naming breaks the "database designer's convention" but for this project I feel ignoring this convention for the benefit of consistent naming between Python and SQL is ok.
 
 
 Any questions and comments please post here, send me a PM or email, post a feature request or bug report on sourceforge or use any of the other means of contact listed on our webpage.
@@ -20,6 +22,8 @@ The fpdb team
 
 PS: I personally will be away Sun-Tue so I probably won't be responding to anything but feel free to message me anyways, but if you post here or at SF someone else might be able to help.
 
+PPS: If you wanna know EXACTLY how this project is moving along follow the git tree over at [url]http://www.assembla.com/spaces/fpdb/trac_git_tool[/url]
+
 
 alpha1
 ======

regression-test/PrintPlayerHudData.py

@@ -29,6 +29,7 @@ parser.add_option("-e", "--seats", default="7", type="int", help="number of acti
 parser.add_option("-g", "--gameType", default="ring", help="Whether its a ringgame (ring) or a tournament (tour)")
 parser.add_option("-l", "--limit", "--limitType", default="fl", help="Limit Type, one of: nl, pl, fl, cn, cp")
 parser.add_option("-n", "--name", "--playername", default="Player_1", help="Name of the player to print")
+parser.add_option("-o", "--position", default="B", help="Position, can be B, S, or a number  between 0 and 7")
 parser.add_option("-p", "--password", help="The password for the MySQL user")
 parser.add_option("-s", "--site", default="PokerStars", help="Name of the site (as written in the history files)")
 
@@ -52,7 +53,7 @@ gametypeId=cursor.fetchone()[0]
 cursor.execute("SELECT id FROM Players WHERE name=%s", (options.name,))
 playerId=cursor.fetchone()[0]
 
-cursor.execute("SELECT id FROM HudCache WHERE gametypeId=%s AND playerId=%s AND activeSeats=%s",(gametypeId, playerId, options.seats))
+cursor.execute("SELECT id FROM HudCache WHERE gametypeId=%s AND playerId=%s AND activeSeats=%s AND position=%s",(gametypeId, playerId, options.seats, options.position))
 hudDataId=cursor.fetchone()[0]
 
 print "siteId:", siteId, "gametypeId:", gametypeId, "playerId:", playerId, "hudDataId:", hudDataId
@@ -104,6 +105,52 @@ fields=cursor.fetchone()
 print "wonWhenSeenStreet1:",fields[0]
 print "wonAtSD:",fields[1]
 
+cursor.execute ("SELECT stealAttemptChance, stealAttempted, foldBbToStealChance, foldedBbToSteal, foldSbToStealChance, foldedSbToSteal FROM HudCache WHERE id=%s", (hudDataId,))
+fields=cursor.fetchone()
+print "stealAttemptChance:",fields[0]
+print "stealAttempted:",fields[1]
+print "foldBbToStealChance:",fields[2]
+print "foldedBbToSteal:",fields[3]
+print "foldSbToStealChance:",fields[4]
+print "foldedSbToSteal:",fields[5]
+
+cursor.execute ("SELECT street1CBChance, street1CBDone, street2CBChance, street2CBDone, street3CBChance, street3CBDone, street4CBChance, street4CBDone FROM HudCache WHERE id=%s", (hudDataId,))
+fields=cursor.fetchone()
+print "street1CBChance:",fields[0]
+print "street1CBDone:",fields[1]
+print "street2CBChance:",fields[2]
+print "street2CBDone:",fields[3]
+print "street3CBChance:",fields[4]
+print "street3CBDone:",fields[5]
+print "street4CBChance:",fields[6]
+print "street4CBDone:",fields[7]
+
+cursor.execute ("SELECT foldToStreet1CBChance, foldToStreet1CBDone, foldToStreet2CBChance, foldToStreet2CBDone, foldToStreet3CBChance, foldToStreet3CBDone, foldToStreet4CBChance, foldToStreet4CBDone FROM HudCache WHERE id=%s", (hudDataId,))
+fields=cursor.fetchone()
+print "foldToStreet1CBChance:",fields[0]
+print "foldToStreet1CBDone:",fields[1]
+print "foldToStreet2CBChance:",fields[2]
+print "foldToStreet2CBDone:",fields[3]
+print "foldToStreet3CBChance:",fields[4]
+print "foldToStreet3CBDone:",fields[5]
+print "foldToStreet4CBChance:",fields[6]
+print "foldToStreet4CBDone:",fields[7]
+
+cursor.execute ("SELECT totalProfit FROM HudCache WHERE id=%s", (hudDataId,))
+fields=cursor.fetchone()
+print "totalProfit:",fields[0]
+
+cursor.execute ("SELECT street1CheckCallRaiseChance, street1CheckCallRaiseDone, street2CheckCallRaiseChance, street2CheckCallRaiseDone, street3CheckCallRaiseChance, street3CheckCallRaiseDone, street4CheckCallRaiseChance, street4CheckCallRaiseDone FROM HudCache WHERE id=%s", (hudDataId,))
+fields=cursor.fetchone()
+print "street1CheckCallRaiseChance:",fields[0]
+print "street1CheckCallRaiseDone:",fields[1]
+print "street2CheckCallRaiseChance:",fields[2]
+print "street2CheckCallRaiseDone:",fields[3]
+print "street3CheckCallRaiseChance:",fields[4]
+print "street3CheckCallRaiseDone:",fields[5]
+print "street4CheckCallRaiseChance:",fields[6]
+print "street4CheckCallRaiseDone:",fields[7]
+
 
 cursor.close()
 db.close()

regression-test/ps-flags-3hands.expected.txt

@@ -1,44 +0,0 @@
-Connected to MySQL on localhost. Print Player Flags Utility
-
-Basic Data
-==========
-bigblind: 2 category: holdem limitType: fl name: Player_1 gameType: ring site: PokerStars
-siteId: 2 gametypeId: 1 playerId: 1 hudDataId: 1
-
-HUD Raw Hand Counts
-===================
-HDs: 3
-street0VPI: 1
-street0Aggr: 0
-street0_3B4BChance: 1
-street0_3B4BDone: 0
-
-street1Seen: 1
-street2Seen: 1
-street3Seen: 1
-street4Seen: 0
-sawShowdown: 0
-
-street1Aggr: 0
-street2Aggr: 0
-street3Aggr: 0
-street4Aggr: 0
-
-otherRaisedStreet1: 1
-otherRaisedStreet2: 1
-otherRaisedStreet3: 1
-otherRaisedStreet4: 0
-foldToOtherRaisedStreet1: 0
-foldToOtherRaisedStreet2: 0
-foldToOtherRaisedStreet3: 1
-foldToOtherRaisedStreet4: 0
-
-wonWhenSeenStreet1: 0.0
-wonAtSD: 0.0
-
-stealAttemptChance: 0
-stealAttempted: 0
-foldBbToStealChance: 0
-foldedBbToSteal: 0
-foldSbToStealChance: 0
-foldedSbToSteal: 0