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

PSS: PS summary import now supports non-ascii playernames in sqlite

Browse Source
This commit is contained in:
steffen123 2010-07-16 20:37:53 +02:00
parent 71f8fb5ef1
commit f6232004ad
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pyfpdb/Database.py
View File

@ -856,7 +856,7 @@ class Database:
def get_player_id(self, config, siteName, playerName): def get_player_id(self, config, siteName, playerName):
c = self.connection.cursor() c = self.connection.cursor()
siteNameUtf = Charset.to_utf8(siteName) siteNameUtf = Charset.to_utf8(siteName)
playerNameUtf = Charset.to_utf8(playerName) playerNameUtf = unicode(playerName)
#print "db.get_player_id siteName",siteName,"playerName",playerName #print "db.get_player_id siteName",siteName,"playerName",playerName
c.execute(self.sql.query['get_player_id'], (playerNameUtf, siteNameUtf)) c.execute(self.sql.query['get_player_id'], (playerNameUtf, siteNameUtf))
row = c.fetchone() row = c.fetchone()
@ -2040,9 +2040,9 @@ class Database:
setattr(hand, ev, resultDict[ev]) setattr(hand, ev, resultDict[ev])
elif getattr(hand, ev)!=None and resultDict[ev]==None:#object has this value but DB doesnt, so update DB elif getattr(hand, ev)!=None and resultDict[ev]==None:#object has this value but DB doesnt, so update DB
updateDb=True updateDb=True
elif ev=="startTime": #elif ev=="startTime":
if (resultDict[ev] < hand.startTime): # if (resultDict[ev] < hand.startTime):
hand.startTime=resultDict[ev] # hand.startTime=resultDict[ev]
if updateDb: if updateDb:
cursor.execute (self.sql.query['updateTourney'].replace('%s', self.sql.query['placeholder']), cursor.execute (self.sql.query['updateTourney'].replace('%s', self.sql.query['placeholder']),
(hand.entries, hand.prizepool, hand.startTime, hand.endTime, hand.tourneyName, (hand.entries, hand.prizepool, hand.startTime, hand.endTime, hand.tourneyName,

2
pyfpdb/TourneySummary.py
View File

@ -197,7 +197,7 @@ class TourneySummary(object):
for player in self.players: for player in self.players:
id=self.db.get_player_id(self.config, self.siteName, player) id=self.db.get_player_id(self.config, self.siteName, player)
if not id: if not id:
id=self.db.insertPlayer(player, self.siteId) id=self.db.insertPlayer(unicode(player), self.siteId)
self.playerIds.update({player:id}) self.playerIds.update({player:id})
#print "TS.insert players",self.players,"playerIds",self.playerIds #print "TS.insert players",self.players,"playerIds",self.playerIds