Merge branch 'mainline-0.1' of /srv/git.sesse.net/private/ccbs into mainline-0.1

diff --git a/html/do-edit-scores.pl b/html/do-edit-scores.pl
index 9dc81ffa1bb7c8c0398b8ad89ea025db10dea008..d70a98c2596896b11c536e7f162994f615e7391c 100755 (executable)
--- a/html/do-edit-scores.pl
+++ b/html/do-edit-scores.pl
@@ -47,7 +47,7 @@ for my $p ($cgi->param()) {
                                # Fetch the name of the song if we can
                                $ref = $dbh->selectrow_hashref('SELECT title FROM songs WHERE song=?',
                                        undef, $cgi->param("song$1-$2"));
-                               ccbs::user_error(_("The song") . $ref->{'title'} _("doesn't have steps for ") .
+                               ccbs::user_error(_("The song") . $ref->{'title'} . _("doesn't have steps for ") .
                                        $cgi->param("playmode$1-$2") . " " . $cgi->param("difficulty$1-$2") . _(" on ").
                                        $tournamentdata->{'machinename'} . ".");
                        }

diff --git a/html/do-start-round.pl b/html/do-start-round.pl
index 6a9738d3c1b2620443130e60162cd23d815ef89c..fe4139a47275680feb39a96f539b669b7b07d827 100755 (executable)
--- a/html/do-start-round.pl
+++ b/html/do-start-round.pl
@@ -40,7 +40,7 @@ if ($round == 1) {
        # First of all, check that there are no null values!
        my $ref = $dbh->selectrow_hashref('SELECT COUNT(*) AS num_incomplete FROM scores WHERE tournament=? AND round=? AND (song IS NULL OR playmode IS NULL OR difficulty IS NULL OR chosen IS NULL or score IS NULL)', undef, $tournament, $round-1);
        if ($ref->{'num_incomplete'} != 0) {
-               ccbs::user_error(_("There's still") . $ref->{'num_incomplete'} . _("songs left in this round which don't have all data registered.");
+               ccbs::user_error(_("There's still") . $ref->{'num_incomplete'} . _("songs left in this round which don't have all data registered."));
        }
 
        # Find out how many people will go on from the _current_ group (ie. the one
@@ -118,7 +118,7 @@ for my $g (1..$num_groups) {
                my $ref = $dbh->selectrow_hashref('SELECT * FROM machinesongs NATURAL JOIN songratings WHERE song NOT IN ( SELECT song FROM randomsongsused ) AND machine=( SELECT machine FROM tournaments WHERE tournament=? ) AND playmode=\'single\' AND difficulty=\'expert\' ORDER BY random() LIMIT 1',
                        undef, $tournament);
                if (!defined($ref)) {
-                       ccbs::user_error(_("There aren't any songs left in the song selector!");
+                       ccbs::user_error(_("There aren't any songs left in the song selector!"));
                }
                $dbh->do('INSERT INTO randomsongsused (song) VALUES (?)',
                        undef, $ref->{'song'});

diff --git a/html/templates/show-tournament.tmpl b/html/templates/show-tournament.tmpl
index 80a103fc99c62928cb938d7913b7c5970ca253de..71fe1a6249ed1ecde7e3923de96f438d53f6dea7 100644 (file)
--- a/html/templates/show-tournament.tmpl
+++ b/html/templates/show-tournament.tmpl
@@ -91,7 +91,7 @@
 [% END %]
 
 [% FOR r = rounds %]
-[% IF r.locked || public %]
+[% IF r.locked || !public %]
   <h2><a name="round[% r.round %]">Runde [% r.round %]</a></h2>
 
   <div>

diff --git a/sql/ccbs.sql b/sql/ccbs.sql
index 4cdf07b9c32b3892c5dbda59a7bd2c345ac7f20e..0463f742014ea9517ae9195403497d0028c96bba 100644 (file)
--- a/sql/ccbs.sql
+++ b/sql/ccbs.sql
@@ -251,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
@@ -293,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;