--- db/prgsrc/db.cgi	2002/05/13 23:59:42	1.65
+++ db/prgsrc/db.cgi	2002/06/08 10:07:14	1.67
@@ -821,7 +821,8 @@ sub PrintTournament {
 		}
 	} else {
 		my ($qnum) = GetQNum($dbh);
-		$output .= h2("Банк Вопросов: $qnum вопросов") . p . "\n";
+		$output .= h2("Банк Вопросов: $qnum вопрос".&Suffix($qnum)) 
+                          . p . "\n";
 	}
 
 	for ($i = 0; $i <= $#Tours; $i++) {
@@ -1654,15 +1655,16 @@ $sstr=~s/[^йцукенгшщзхъфывапролджэячсмит
                     $sth->finish;
 		}
 		my $QuestionNumber=0;
-		if (my $qnum=param('qnumber')){
+		my $qnum;
+		if ($qnum=param('qnumber')){
       	          my ($sth) = $dbh->prepare("SELECT QuestionId FROM Questions
 		     WHERE ParentId=$tour AND Number=$qnum");
 		  $sth->execute;
 		  $QuestionNumber=($sth->fetchrow)[0]||0;
 	        }
 	        if ($QuestionNumber) {
-
-		  print &PrintQuestion($dbh, $QuestionNumber, param('answer'), 0, 1);
+		  print &PrintQuestion($dbh, $QuestionNumber, param('answer')||0, $qnum, 1);
+#                                        $dbh, $Id, $answer, $qnum, $title, $text
 		} else  {
   		   print &PrintTournament($dbh, $tour, param('answer'));
   		}