--- db/prgsrc/db.cgi 2003/12/19 01:44:47 1.126 +++ db/prgsrc/db.cgi 2004/02/08 00:35:29 1.129 @@ -746,7 +746,7 @@ sub makewhere { $type .= ($_=$TypeName{$_}) foreach @type; my $where=' 0 '; foreach (@type) { - $where.= " OR (Type ='$_') OR (Type ='$_Д') "; + $where.= " OR (Type ='$_') OR (Type ='$_Д') OR (Type ='Д$_') "; } $where.= "OR (Type='ЧБ')" if ($type=~/Ч|Б/); return $where; @@ -974,9 +974,11 @@ sub PrintRandom { my %q; my $answer=$razd?0:1; my @answers; +#my $t=time; my (@Questions) = &Get12Random($dbh, $type, $num); - my ($output, $i) = ('', 0); + my ($output, $i) = ('', 0); +#$output.="time=".(time-$t).p; if ($text) { $output .= " $num случайных вопросов.\n\n"; } else { @@ -1062,7 +1064,7 @@ sub PrintTournament { my ($qnum1) = GetQNum($dbh,1); $output .= h2("База вопросов"). h3("$qnum запис".&Suffix2($qnum). - " (не повторяется $qnum1)"); + " (уникальных $qnum1)"); # h4("