Added a "parallel" argument to the min/max stored procedures.

[ccbs] / sql / ccbs.sql

diff --git a/sql/ccbs.sql b/sql/ccbs.sql
index ab682cdcacfa6b5dbe749b6722024e84328f834f..cb440e8005016a1ebbf7f26025138fed90903f76 100644 (file)
--- a/sql/ccbs.sql
+++ b/sql/ccbs.sql
@@ -270,29 +270,29 @@ CREATE TYPE minmax_score AS (
        max_score INTEGER
 );
 
--- get_minmax_score_for_players(tournament, round, playmode)
-CREATE FUNCTION get_minmax_score_for_players(integer, integer, varchar) RETURNS SETOF minmax_score
+-- get_minmax_score_for_players(tournament, round, parallel, playmode)
+CREATE FUNCTION get_minmax_score_for_players(integer, integer, integer, varchar) RETURNS SETOF minmax_score
     AS $$
 DECLARE
        ret minmax_score;
        tp RECORD;
        ts RECORD;
 BEGIN
-       FOR tp IN SELECT player FROM roundparticipation WHERE tournament=$1 AND round=$2 LOOP
+       FOR tp IN SELECT player FROM roundparticipation WHERE tournament=$1 AND round=$2 AND parallel=$3 LOOP
                ret.player := tp.player;
                ret.min_score := 0;
                ret.max_score := 0;
 
-               FOR ts IN SELECT song,score FROM scores WHERE tournament=$1 and round=$2 and player=tp.player LOOP
+               FOR ts IN SELECT song,score FROM scores WHERE tournament=$1 AND round=$2 AND parallel=$3 AND player=tp.player LOOP
                        IF ts.score IS NOT NULL THEN
                                -- score is already given
                                ret.min_score := ret.min_score + ts.score;
                                ret.max_score := ret.max_score + ts.score;
                        ELSE
                                IF ts.song IS NOT NULL THEN
-                                       ret.max_score := ret.max_score + ( SELECT max_score FROM get_max_score_for_songs($1, $3) WHERE song=ts.song );
+                                       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, $3) WHERE song=tp.player );
+                                       ret.max_score := ret.max_score + ( SELECT max_score FROM get_max_score_for_players($1, $4) WHERE song=tp.player );
                                END IF;
                        END IF;
                END LOOP;
@@ -313,14 +313,21 @@ CREATE TYPE minmax_rank AS (
        worst_rank INTEGER
 );
 
--- get_minmax_score_for_players(tournament, round, playmode)
-CREATE FUNCTION get_minmax_rank_for_players(integer, integer, varchar) RETURNS SETOF minmax_rank
+-- get_minmax_score_for_players(tournament, round, parallel, playmode)
+CREATE TABLE temp_minmax (
+       player INTEGER,
+       min_score INTEGER,
+       max_score INTEGER
+);
+
+CREATE FUNCTION get_minmax_rank_for_players(integer, integer, integer, varchar) RETURNS SETOF minmax_rank
     AS $$
 DECLARE
        ret minmax_rank;
        tp RECORD;
 BEGIN
-       CREATE TEMPORARY TABLE temp_minmax AS SELECT * FROM get_minmax_score_for_players($1, $2, $3);
+       INSERT INTO temp_minmax SELECT * FROM get_minmax_score_for_players($1, $2, $3, $4);
+       
        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);
@@ -328,7 +335,7 @@ BEGIN
 
                RETURN NEXT ret;
        END LOOP;
-       DROP TABLE temp_minmax; 
+       TRUNCATE temp_minmax;
        RETURN;
 END;
     $$