--- processmail/subroutines.pl	2013/10/11 15:39:35	3.2
+++ processmail/subroutines.pl	2013/10/30 19:28:30	3.3
@@ -1,7 +1,7 @@
 # В этот файл собраны процедуры, общие для всей системы
 # работы с ответами.
 #
-#$Id: subroutines.pl,v 3.2 2013/10/11 15:39:35 boris Exp $
+#$Id: subroutines.pl,v 3.3 2013/10/30 19:28:30 boris Exp $
 #
 sub readhash
 {
@@ -17,7 +17,7 @@ sub readhash
 	    {
 		print STDERR "\#$number. Score: $score\n",$answer;
 	    }
-	    if ($answer ne "" && $number >0)
+	    if ($answer ne "" && $number >= 0)
 	    {
 		$$answers[$number]->{$answer}->{score} = $score;
 		%{$$answers[$number]->{$answer}->{teams}} = ();
@@ -33,7 +33,7 @@ sub readhash
 	}
 	if (/^\s*\*\*\*\s*$/)
 	{
-	    if ($answer ne "" && $number >0)
+	    if ($answer ne "" && $number >= 0)
 	    {
 		$$answers[$number]->{$answer}->{score} = $score;
 	    }
@@ -73,8 +73,8 @@ sub readmail
 	    $$table{$team}->{'numletters'}++;
 	    if ($$table{$team}->{regnum} != $2)
 	    {
-		print STDERR "Warning: Team $team uses registration nos. ",
-		$$table{$team}->{regnum}, " and $2!\n";
+		print STDERR "Warning: Team $team uses registration numbers ",
+		      "'" . $$table{$team}->{regnum} . "'", " and '$2'!\n";
 	    }
 	    next;
 	}
@@ -129,7 +129,7 @@ sub canonize_answer
 sub collect_answers
 {
     my ($teams,$answers) = @_;
-    for ($i=1;$i<=$MAXQUEST;$i++)
+    for ($i=$MINQUEST;$i<=$MAXQUEST;$i++)
     {
 	foreach $team (keys %$teams)
 	{