Shape text using Pango and HarfBuzz; gives us nice ligatures and exotic scripts.

[ccbs] / sql / ccbs.sql

diff --git a/sql/ccbs.sql b/sql/ccbs.sql
index 99b67003306220af9b40e6ce7234d0ede634c4e7..0463f742014ea9517ae9195403497d0028c96bba 100644 (file)
--- 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;