X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=sql%2Fccbs.sql;h=0463f742014ea9517ae9195403497d0028c96bba;hb=5f61b3659077f6dc7109aacbc802246c9afaf4dd;hp=cb440e8005016a1ebbf7f26025138fed90903f76;hpb=4c387786f5c01ee45c3b07709c27f6977c6ef8ab;p=ccbs

diff --git a/sql/ccbs.sql b/sql/ccbs.sql
index cb440e8..0463f74 100644
--- a/sql/ccbs.sql
+++ b/sql/ccbs.sql
@@ -123,6 +123,7 @@ CREATE TABLE rounds (
 	chosensongs INTEGER NOT NULL,
 	numqualifying INTEGER,
 
+	UNIQUE (tournament, player),
 	PRIMARY KEY (tournament, round)
 );
 
@@ -250,7 +251,7 @@ CREATE FUNCTION get_max_score_for_players(integer, integer, varchar) RETURNS SET
              )
              AND playmode=$3
              ORDER BY feetrating DESC LIMIT 1
-	  ) * 1000 AS max_score FROM tournamentparticipation;
+	  ) * 1000 AS max_score FROM tournamentparticipation WHERE tournament=$1;
 $$
     LANGUAGE SQL
     STABLE
@@ -292,7 +293,7 @@ BEGIN
 				IF ts.song IS NOT NULL THEN
 					ret.max_score := ret.max_score + ( SELECT max_score FROM get_max_score_for_songs($1, $4) WHERE song=ts.song );
 				ELSE
-					ret.max_score := ret.max_score + ( SELECT max_score FROM get_max_score_for_players($1, $4) WHERE song=tp.player );
+					ret.max_score := ret.max_score + ( SELECT max_score FROM get_max_score_for_players($1, $2, $4) WHERE song=tp.player );
 				END IF;
 			END IF;
 		END LOOP;
@@ -330,8 +331,8 @@ BEGIN
 	
 	FOR tp IN SELECT * FROM temp_minmax LOOP
 		ret.player = tp.player;
-		ret.best_rank = 1 + ( SELECT COUNT(*) FROM temp_minmax WHERE min_score >= tp.max_score AND player<>tp.player);
-		ret.worst_rank = 1 + ( SELECT COUNT(*) FROM temp_minmax WHERE max_score > tp.min_score AND player<>tp.player );
+		ret.best_rank = 1 + ( SELECT COUNT(*) FROM temp_minmax WHERE min_score > tp.max_score AND player<>tp.player);
+		ret.worst_rank = 1 + ( SELECT COUNT(*) FROM temp_minmax WHERE max_score >= tp.min_score AND player<>tp.player );
 
 		RETURN NEXT ret;
 	END LOOP;
@@ -342,4 +343,36 @@ END;
     LANGUAGE plpgsql
     VOLATILE    -- not really, but needed for the TEMPORARY TABLE
     RETURNS NULL ON NULL INPUT;
-    
+
+-- get_minmax_score_for_players(tournament, playmode)
+CREATE TYPE minmax_rank_entire_tournament AS (
+	round INTEGER,
+	parallel INTEGER,
+	player INTEGER,
+	best_rank INTEGER,
+	worst_rank INTEGER
+);
+CREATE FUNCTION get_minmax_rank_for_players(integer, varchar) RETURNS SETOF minmax_rank_entire_tournament
+    AS $$
+DECLARE
+	ret minmax_rank_entire_tournament;
+	tr record;
+	tp record;
+BEGIN
+	FOR tr IN SELECT * FROM groups WHERE tournament=$1 LOOP
+		ret.round = tr.round;
+		ret.parallel = tr.parallel;
+
+		FOR tp IN SELECT * FROM get_minmax_rank_for_players($1, tr.round, tr.parallel, $2) LOOP
+			ret.player = tp.player;
+			ret.best_rank = tp.best_rank;
+			ret.worst_rank = tp.worst_rank;
+			RETURN NEXT ret;
+		END LOOP;
+	END LOOP;
+	RETURN;
+END;
+    $$
+    LANGUAGE plpgsql
+    STABLE
+    RETURNS NULL ON NULL INPUT;