From 264b75b5b0b155efdfeeb59c57d61cddd3e40d37 Mon Sep 17 00:00:00 2001 From: sqlcoder Date: Sun, 31 Jan 2010 23:46:51 +0000 Subject: [PATCH] fix some sqlite and unicode issues (thanks to Gerko) --- pyfpdb/Filters.py | 3 ++- pyfpdb/GuiGraphViewer.py | 2 +- pyfpdb/SQL.py | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pyfpdb/Filters.py b/pyfpdb/Filters.py index 7f75cc4e..d5dec059 100644 --- a/pyfpdb/Filters.py +++ b/pyfpdb/Filters.py @@ -297,7 +297,8 @@ class Filters(threading.Thread): def __set_hero_name(self, w, site): _name = w.get_text() - _guiname = Charset.to_gui(_name) + # get_text() returns a str but we want internal variables to be unicode: + _guiname = unicode(_name) self.heroes[site] = _guiname # print "DEBUG: setting heroes[%s]: %s"%(site, self.heroes[site]) diff --git a/pyfpdb/GuiGraphViewer.py b/pyfpdb/GuiGraphViewer.py index ce9648ae..dcfa979c 100644 --- a/pyfpdb/GuiGraphViewer.py +++ b/pyfpdb/GuiGraphViewer.py @@ -319,7 +319,7 @@ class GuiGraphViewer (threading.Thread): winnings = self.db.cursor.fetchall() self.db.rollback() - if winnings == (): + if len(winnings) == 0: return (None, None, None) green = map(lambda x:float(x[1]), winnings) diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py index 43925c01..7a83ac99 100644 --- a/pyfpdb/SQL.py +++ b/pyfpdb/SQL.py @@ -2021,6 +2021,7 @@ class Sql: elif db_server == 'sqlite': self.query['playerDetailedStats'] = """ select AS hgametypeid + , AS pname ,gt.base ,gt.category AS category ,upper(gt.limitType) AS limittype @@ -2072,6 +2073,7 @@ class Sql: inner join Hands h on (h.id = hp.handId) inner join Gametypes gt on (gt.Id = h.gameTypeId) inner join Sites s on (s.Id = gt.siteId) + inner join Players p on (p.Id = hp.playerId) where hp.playerId in /*and hp.tourneysPlayersId IS NULL*/