--- db/prgsrc/db.cgi	2003/08/29 21:52:25	1.124
+++ db/prgsrc/db.cgi	2004/02/08 00:35:29	1.129
@@ -93,6 +93,14 @@ my %TypeName=('children'=>'Д', 'game'=>'
               'chgk'=>'Ч', 'brain'=>'Б', 'beskrylka'=>'Л','ehruditka'=>'Э');
 
 
+sub countz {
+  my ($dbh,$type)=@_;
+  
+  my $sth=$dbh->prepare("select count(*) from Questions where Type LIKE '%$type%'");
+  $sth->execute();
+  my ($tmp)=$sth->fetchrow();
+  return $tmp;
+}
 
 my $all=param('all');
 $all=0 if lc $all eq 'no';
@@ -738,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;
@@ -966,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 {
@@ -1050,9 +1060,20 @@ sub PrintTournament {
 			};
 		}
 	} else {
-		my ($qnum) = GetQNum($dbh);
-		$output .= h2("Банк Вопросов: $qnum вопрос".&Suffix($qnum)) 
-                          . p . "\n";
+		my ($qnum) = GetQNum($dbh,0);
+		my ($qnum1) = GetQNum($dbh,1);
+		$output .= h2("База вопросов").
+                 h3("$qnum запис".&Suffix2($qnum).
+                 " (уникальных $qnum1)");
+
+#		 h4("<table>".
+#		 Tr(td("Из них:"), td("Вопросов ЧГК: ".countz($dbh,'Ч'))).		 
+#		 Tr(td("&nbsp;"), td("Вопросов для брейна: ".countz($dbh,'Б'))).		 
+#		 Tr(td("&nbsp;"), td("Вопросов для ЧГК и брейна: ".countz($dbh,'ЧБ'))).		 
+#		 Tr(td("&nbsp;"), td("Интернет-вопросов: ".countz($dbh,'И'))).		 
+#		 Tr(td("&nbsp;"), td("Бескрылок: ".countz($dbh,'Л'))).
+#		 Tr(td("&nbsp;"),td("Заданий для Своей Игры: ".countz($dbh,'Я'))).
+#		 Tr(td("&nbsp;"),td("Эрудиток: ".countz($dbh,'Э'))))."</table>"
 	}
 
 	for ($i = 0; $i <= $#Tours; $i++) {
@@ -1143,6 +1164,23 @@ sub Suffix {
 	return $suffix;
 }
 
+
+sub Suffix1 {
+	my ($qnum) = @_;
+	my ($suffix) = 'я' if $qnum =~ /[234]$/;
+       $suffix = 'е' if $qnum =~ /1$/;
+       $suffix = 'й' if $qnum =~ /[567890]$/ || $qnum =~ /1.$/;
+	return $suffix;
+}
+
+sub Suffix2 {
+	my ($qnum) = @_;
+	my ($suffix) = 'и' if $qnum =~ /[234]$/;
+       $suffix = 'ь' if $qnum =~ /1$/;
+       $suffix = 'ей' if $qnum =~ /[567890]$/ || $qnum =~ /1.$/;
+	return $suffix;
+}
+
 sub IsTour {
 	my ($dbh, $Id,$n) = @_;
 
@@ -1249,8 +1287,10 @@ sub PrintField {
 	    $value =~ s/<[\/\w]*?>//sg;
 	} else {
 	    $value =~ s/^\s+/<br>&nbsp;&nbsp;&nbsp;&nbsp;/mg;
+	    $value =~ s/(\s+)-+(\s+)/$1&#0150;$2/mg;
+	    $value =~ s/\s+\&#0150/&nbsp;\&#0150/mg 
+			if $value !~ /^\|/;
 	    $value =~ s/^\|([^\n]*)/<pre>$1<\/pre>/mg;
-	    $value =~ s/\s+-+\s+/&nbsp;&#0150; /mg;
 	    $value =~ s/(http:\/\/\S+[^\s\)\(\,\.])/<a href="$1">$1<\/a>/g if $header !~ /^Авто/;
 #	    $value =~ s/(http:\/\/(?:\w+.)+[\w\\\~]+(\?[^\s.]+)?)/<a href="$1">$1<\/a>/g if $header !~ /^Авто/;
 #	    $value =~ s/(\s)"/$1&#147;/mg;
@@ -1405,12 +1445,22 @@ qid=$qid"}, 'Близкие вопросы').p
 
 # Returns the total number of questions currently in the DB.
 sub GetQNum {
-	my ($dbh) = @_;
+	my ($dbh,$x) = @_;
 	my ($sth) = $dbh->prepare("SELECT COUNT(*) FROM Questions");
 	$sth->execute;
 	my $tmp=($sth->fetchrow)[0];
         $sth->finish;
- 	return $tmp;
+	($sth)=  $dbh -> prepare("select distinct count(first) FROM equalto");
+	           $sth -> execute;
+	my ($c)=$sth->fetchrow;
+
+#	           $i++  while ( my  ($first, $second)=$sth -> fetchrow)
+#                  {
+#                       $forbidden{$first}=1;
+#                  }
+                  $sth->finish;
+
+ 	return $tmp-($x?$c:0);
 }
 sub GetMaxQId {
 	my ($dbh) = @_;
@@ -1431,7 +1481,8 @@ sub Get12Random {
 	srand;
 	my $where=0;
 	my $r=int (rand(10000));
-
+	my $w1=$r<5000? "QuestionId<5000 ":"QuestionId>=5000";
+	$w1=1 if $type!~/Ч/;
 	foreach (split '', $type)
         {
  	   $where.= " OR (Type ='$_') OR (Type ='$_Д') ";
@@ -1441,7 +1492,7 @@ sub Get12Random {
 #   $q="select QuestionId, QuestionId/$r-floor(QuestionId/$r) as val 
 #       from Questions where $where order by val limit $num";
 # Когда на куличках появится mysql >=3.23 надо заменить на order by rand();
-   $q="select QuestionId from Questions where $where order by rand() limit $num";
+   $q="select QuestionId from Questions where ($w1) AND ($where) order by rand() limit $num";
 
 
    $sth=$dbh->prepare($q);
@@ -1876,7 +1927,7 @@ MAIN:
                 exit
 	}
 
-	if ($tour && (!param('answers')||!param('answers')<=1))
+	if ($tour && !param('qnumber') && (!param('answers')||(param('answers')<=1)))
 	{       
 	        my $n=param('tour');
 	        $n=~s/.txt$//;