X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fccbs_bigscreen.cpp;h=09aa59cdedc504eeaddc30806e283f31a0f06789;hp=c9cb82d56f147efa3e2c6dc5fb868a7211c69f2c;hb=f7a9cb8d192aa0e7f02bb6a2c6a1c88dba2afa54;hpb=a7d8519f7daa4b16677b558e974ad04afb419fa8

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index c9cb82d..09aa59c 100644
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -30,51 +30,44 @@ public:
 	}
 };
 
+class Tournament {
+public:
+	int id;
+	std::string name;
+};
+
 /* A transactor that fetches the current tournament and some information about it. */
 class FetchCurrentTournament : public pqxx::transactor<> {
 private:
-	int id;
-	std::string name;
+	Tournament *tourn;
 
 public:
-	FetchCurrentTournament() {}
+	FetchCurrentTournament(Tournament *tourn) : tourn(tourn) {}
 	void operator() (pqxx::transaction<> &t)
 	{
 		pqxx::result res( t.exec("SELECT * FROM bigscreen.active_tournament NATURAL JOIN tournaments") );
 		try {
 			pqxx::result::tuple tournament = res.at(0);
 
-			id = tournament["tournament"].as(id);
-			name = tournament["tournament"].as(name);
+			tourn->id = tournament["tournament"].as(tourn->id);
+			tourn->name = tournament["tournamentname"].as(tourn->name);
 		} catch (PGSTD::out_of_range &e) {
-			std::fprintf(stderr, "foof\n");
-			
-			id = -1;
-			name = "";
+			tourn->id = -1;
+			tourn->name = "";
 		}
 	}
-
-	int get_tournament_id() const
-	{
-		return id;
-	}
-	
-	std::string get_tournament_name() const
-	{
-		return name;
-	}
 };
 
 void init(pqxx::connection &conn)
 {
-	FetchCurrentTournament fct;
-	conn.perform(fct);
+	Tournament tourn;
+	conn.perform(FetchCurrentTournament(&tourn));
 
-	if (fct.get_tournament_id() == -1) {
+	if (tourn.id == -1) {
 		std::fprintf(stderr, "No active tournament\n");
 	} else {
 		std::fprintf(stderr, "Current tournament is %d (name: '%s')\n",
-			fct.get_tournament_id(), fct.get_tournament_name().c_str());
+			tourn.id, tourn.name.c_str());
 	}
 }