clean-up code to get playerId in gui-stats and gui-graphs
Conflicts: pyfpdb/GuiGraphViewer.py
This commit is contained in:
		
							parent
							
								
									241dc1e717
								
							
						
					
					
						commit
						fb7aae9186
					
				|  | @ -147,12 +147,10 @@ class GuiGraphViewer (threading.Thread): | |||
|             for site in sites: | ||||
|                 if sites[site] == True: | ||||
|                     sitenos.append(siteids[site]) | ||||
|                     c = self.db.get_cursor() | ||||
|                     _hname = Charset.to_utf8(heroes[site]) | ||||
|                     c.execute(self.sql.query['getPlayerId'], (_hname,)) | ||||
|                     result = c.fetchall() | ||||
|                     if len(result) == 1: | ||||
|                         playerids.append( int(result[0][0]) ) | ||||
|                     result = self.db.get_player_id(self.conf, site, _hname) | ||||
|                     if result is not None: | ||||
|                         playerids.append(int(result)) | ||||
| 
 | ||||
|             if not sitenos: | ||||
|                 #Should probably pop up here. | ||||
|  |  | |||
|  | @ -41,7 +41,7 @@ class GuiPlayerStats (threading.Thread): | |||
|         self.conf = config | ||||
|         self.main_window = mainwin | ||||
|         self.sql = querylist | ||||
| 
 | ||||
|          | ||||
|         self.liststore = []   # gtk.ListStore[]         stores the contents of the grids | ||||
|         self.listcols = []    # gtk.TreeViewColumn[][]  stores the columns in the grids | ||||
| 
 | ||||
|  | @ -189,13 +189,10 @@ class GuiPlayerStats (threading.Thread): | |||
|         for site in sites: | ||||
|             if sites[site] == True: | ||||
|                 sitenos.append(siteids[site]) | ||||
|                 # Nasty hack to deal with multiple sites + same player name -Eric | ||||
|                 que = self.sql.query['getPlayerId'] + " AND siteId=%d" % siteids[site] | ||||
|                 _hname = Charset.to_utf8(heroes[site]) | ||||
|                 self.cursor.execute(que, (_hname,)) | ||||
|                 result = self.db.cursor.fetchall() | ||||
|                 if len(result) == 1: | ||||
|                     playerids.append(result[0][0]) | ||||
|                 result = self.db.get_player_id(self.conf, site, _hname) | ||||
|                 if result is not None: | ||||
|                     playerids.append(int(result)) | ||||
| 
 | ||||
|         if not sitenos: | ||||
|             #Should probably pop up here. | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	Block a user