diff --git a/pyfpdb/GuiGraphViewer.py b/pyfpdb/GuiGraphViewer.py index d0d328a9..612ac2ff 100644 --- a/pyfpdb/GuiGraphViewer.py +++ b/pyfpdb/GuiGraphViewer.py @@ -20,7 +20,7 @@ import pygtk pygtk.require('2.0') import gtk import os -import pokereval +#import pokereval try: from matplotlib.figure import Figure @@ -49,12 +49,12 @@ class GuiGraphViewer (threading.Thread): site=self.siteTBuffer.get_text(self.siteTBuffer.get_start_iter(), self.siteTBuffer.get_end_iter()) if site=="PS": - site=1 - elif site=="FTP": site=2 + elif site=="FTP": + site=1 else: print "invalid text in site selection in graph, defaulting to PS" - site=1 + site=2 self.fig = Figure(figsize=(5,4), dpi=100) diff --git a/pyfpdb/fpdb_simple.py b/pyfpdb/fpdb_simple.py index 0d5eb749..dadeba99 100644 --- a/pyfpdb/fpdb_simple.py +++ b/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)