X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Ffetch_group.cpp;h=bdaa0c9a9b309e469e24fde3db634eb51d983030;hp=ff719506d0479e61a17751014c3569950753dfd8;hb=07f65e88e6fd4ebbe8c055f3acd0385f9b64f238;hpb=a8f5648a4186b79c28c0c98f647802fc7ee36af8

diff --git a/bigscreen/fetch_group.cpp b/bigscreen/fetch_group.cpp
index ff71950..bdaa0c9 100644
--- a/bigscreen/fetch_group.cpp
+++ b/bigscreen/fetch_group.cpp
@@ -5,7 +5,8 @@ FetchGroup::FetchGroup(unsigned tournament, unsigned round, unsigned parallel, G
 	
 void FetchGroup::operator() (pqxx::transaction<> &t)
 {
-	pqxx::result res( t.exec("SELECT round,parallel,position,playmode,difficulty,songnumber,player,nick,song,title,artist,chosen,score FROM roundparticipation NATURAL JOIN players NATURAL JOIN scores NATURAL LEFT JOIN songs WHERE " 
+	// note: this _will_ break if any song has more than one short title!
+	pqxx::result res( t.exec("SELECT round,parallel,position,playmode,difficulty,songnumber,player,nick,song,title,COALESCE(shorttitle,title) AS shorttitle,artist,chosen,score FROM roundparticipation NATURAL JOIN players NATURAL JOIN scores NATURAL LEFT JOIN songs NATURAL LEFT JOIN songshorttitles WHERE " 
 		"tournament=" + pqxx::to_string(tournament) + " AND " +
 		"round=" + pqxx::to_string(round) + " AND " +
 		"parallel=" + pqxx::to_string(parallel) + " " +
@@ -39,8 +40,9 @@ void FetchGroup::operator() (pqxx::transaction<> &t)
 			so.id = -1;
 		} else {
 			so.id = i["song"].as(so.id);
-			so.title = i["song"].as(so.title);
-			so.artist = i["song"].as(so.artist);
+			so.title = i["title"].as(so.title);
+			so.artist = i["artist"].as(so.artist);
+			so.short_title = i["shorttitle"].as(so.short_title);
 		}
 	
 		sc.song = so;