# HG changeset patch
# User Laman
# Date 2018-04-01 14:33:26
# Node ID 051ee2d1dbdd1d44e6d9ab270b252fa702ac532a
# Parent  1765f32cd4dcb727d1d9793f8d1acbca011616ea

tournamentAttendance rozšířena na rozsah let

diff --git a/queries.py b/queries.py
--- a/queries.py
+++ b/queries.py
@@ -153,21 +153,36 @@ def populationAge(year1,year2,country):
 		print("\t".join(str(res[age].get(y,0)) for y in range(year1,year2)))
 
 
-def tournamentAttendance(year):
+def _tournamentAttendance(year):
 	"""Návštěvnosti turnajů za daný rok, dělené podle země konání."""
 	date1=yearStart(year)
 	date2=yearStart(year+1)
 	query="""select country_code,sum(player_count) from tournaments where datum>=date(?) and datum<date(?) group by country_code"""
 
-	res=cursor.execute(query,(date1,date2))
-	print("kód země\tpočet hráčů na turnajích")
-	for rec in res:
-		print("\t".join([str(x) for x in rec]))
+	return cursor.execute(query,(date1,date2))
+
+
+def tournamentAttendance(year1,year2):
+	res=dict()
 
+	for year in range(year1,year2):
+		records=_tournamentAttendance(year)
+		for (country,attendance) in records:
+			if country not in res:
+				res[country]=dict()
+			res[country][year]=attendance
+		print("\r",year,end="",file=sys.stderr)
+	print("\r",end="",file=sys.stderr)
+
+	print("Návštěvnosti (počty hráčů) na turnajích podle let")
+	print("kód země\t"+"\t".join(str(y) for y in range(year1,year2)))
+	for country in sorted(res.keys()):
+		print(country,end="\t")
+		print("\t".join(str(res[country].get(y,0)) for y in range(year1,year2)))
 
 # playerYear("Kotowski Jaroslav",2017)
 # timeRank(2017,"CZ")
-# tournamentAttendance(2010)
 # yearsByCountry(2001,2018)
 # populationStrength(2001,2018,"RU")
 # populationAge(2001,2018,"RU")
+# tournamentAttendance(2001,2018)