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

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

Browse Source 
Conflicts:
	pyfpdb/Database.py
This commit is contained in:
Worros
2009-09-04 12:45:49 +08:00
parent b52ceb3f90 91ebbe79e1
commit 4f98b29b26
8 changed files with 593 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pyfpdb/fpdb_parse_logic.py
+2 -1
View File
@@ -68,7 +68,8 @@ def mainParser(settings, siteID, category, hand, config, db = None, writeq = Non
tourneyStartTime= handStartTime #todo: read tourney start time
rebuyOrAddon = fpdb_simple.isRebuyOrAddon(hand[0])
tourneyTypeId = fpdb_simple.recogniseTourneyTypeId(db.get_cursor(), siteID, buyin, fee, knockout, rebuyOrAddon)
## The tourney site id has to be searched because it may already be in db with a TourneyTypeId which is different from the one automatically calculated (Summary import first)
tourneyTypeId = fpdb_simple.recogniseTourneyTypeId(db, siteID, siteTourneyNo, buyin, fee, knockout, rebuyOrAddon)
else:
siteTourneyNo = -1
buyin = -1