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

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

Browse Source 
Conflicts:
	pyfpdb/GuiBulkImport.py
	pyfpdb/fpdb_simple.py
This commit is contained in:
Ray 2009-03-28 13:04:48 -04:00
commit fca0de81d7
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pyfpdb/GuiBulkImport.py
View File

@ -236,7 +236,6 @@ def main(argv=None):
if os.name == 'nt': settings['os'] = 'windows' if os.name == 'nt': settings['os'] = 'windows'
else: settings['os'] = 'linuxmac' else: settings['os'] = 'linuxmac'
# settings.update(config.get_db_parameters('fpdb'))
settings.update(config.get_db_parameters()) settings.update(config.get_db_parameters())
settings.update(config.get_tv_parameters()) settings.update(config.get_tv_parameters())
settings.update(config.get_import_parameters()) settings.update(config.get_import_parameters())

2
pyfpdb/fpdb_db.py
View File

@ -59,7 +59,7 @@ class fpdb_db:
self.database=database self.database=database
if backend==self.MYSQL_INNODB: if backend==self.MYSQL_INNODB:
import MySQLdb import MySQLdb
self.db=MySQLdb.connect(host = host, user = user, passwd = password, db = database) self.db=MySQLdb.connect(host = host, user = user, passwd = password, db = database, use_unicode=True)
elif backend==self.PGSQL: elif backend==self.PGSQL:
import psycopg2 import psycopg2
# If DB connection is made over TCP, then the variables # If DB connection is made over TCP, then the variables

2
pyfpdb/fpdb_import.py
View File

@ -21,7 +21,7 @@
import os # todo: remove this once import_dir is in fpdb_import import os # todo: remove this once import_dir is in fpdb_import
import sys import sys
from time import time from time import time, strftime
import traceback import traceback
import math import math
import datetime import datetime

11
pyfpdb/fpdb_simple.py
View File

@ -1407,12 +1407,8 @@ def recogniseTourneyTypeId(cursor, siteId, buyin, fee, knockout, rebuyOrAddon):
# return result # return result
def recognisePlayerIDs(cursor, names, site_id): def recognisePlayerIDs(cursor, names, site_id):
names = [n.encode("utf-8") for n in names] q = "SELECT name,id FROM Players WHERE name=%s" % " OR name=".join(["%s" for n in names])
namestring = "name=%s" cursor.execute(q, names) # get all playerids by the names passed in
for x in xrange(len(names)-1):
namestring += " OR name=%s"
# print "names=", names, "\nnamestring=", namestring
cursor.execute("SELECT name,id FROM Players WHERE %s" % namestring , names) # get all playerids by the names passed in
ids = dict(cursor.fetchall()) # convert to dict ids = dict(cursor.fetchall()) # convert to dict
if len(ids) != len(names): if len(ids) != len(names):
notfound = [n for n in names if n not in ids] # make list of names not in database notfound = [n for n in names if n not in ids] # make list of names not in database
@ -1422,7 +1418,8 @@ def recognisePlayerIDs(cursor, names, site_id):
namestring += " OR name=%s" namestring += " OR name=%s"
# print "namestring=",namestring,"\nnotfound=", notfound # print "namestring=",namestring,"\nnotfound=", notfound
cursor.executemany("INSERT INTO Players (name, siteId) VALUES (%s, "+str(site_id)+")", (notfound)) cursor.executemany("INSERT INTO Players (name, siteId) VALUES (%s, "+str(site_id)+")", (notfound))
cursor.execute("SELECT name,id FROM Players WHERE %s" % namestring, notfound) # get their new ids q2 = "SELECT name,id FROM Players WHERE name=%s" % " OR name=".join(["%s" for n in notfound])
cursor.execute(q2, notfound) # get their new ids
tmp = dict(cursor.fetchall()) tmp = dict(cursor.fetchall())
for n in tmp: # put them all into the same dict for n in tmp: # put them all into the same dict
ids[n] = tmp[n] ids[n] = tmp[n]