p105 - commented import in Grapher as its not used yet, reverted bug i introduced in p90

pyfpdb/fpdb_simple.py

@@ -993,16 +993,14 @@ def recogniseGametypeID(cursor, topline, smallBlindLine, site_id, category, isTo
 	pos1=pos2+2
 	if isTourney:
 		pos1-=1	
-	if (site_id==2): #ftp
+	if (site_id==1): #ftp
 		pos2=topline.find(" ", pos1)
-	elif (site_id==1): #ps
+	elif (site_id==2): #ps
 		pos2=topline.find(")")
 	
 	if pos2<=pos1:
 		pos2=topline.find(")", pos1)
 	
-	#pos2-=1
-	
 	if isTourney:
 		big_bet=int(topline[pos1:pos2])
 	else:
@@ -1136,10 +1134,10 @@ def recogniseSite(line):
 #returns the ID of the given site
 def recogniseSiteID(cursor, site):
 	if (site=="ftp"):
-		return 2
+		return 1
 		#cursor.execute("SELECT id FROM Sites WHERE name = ('Full Tilt Poker')")
 	elif (site=="ps"):
-		return 1
+		return 2
 		#cursor.execute("SELECT id FROM Sites WHERE name = ('PokerStars')")
 	else:
 		raise FpdbError("invalid site in recogniseSiteID: "+site)