--- db/prgsrc/db.cgi	2001/10/18 19:53:17	1.24
+++ db/prgsrc/db.cgi	2002/05/14 00:12:35	1.66
@@ -1,26 +1,40 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl -w
 
 use DBI;
 use CGI ':all';
-use Text::Query;
+#use Text::Query;
 use strict;
 use Time::Local;
 use POSIX qw(locale_h);
 use locale;
-open STDERR, ">errors";
+open STDERR, ">errors1";
 my $printqueries=0;
-my %fieldname= (0,'Question', 1, 'Answer', 2, 'Comments');
+my %forbidden=();
+my $debug=0; #added by R7
+if (param('debug')) {$debug=1; $printqueries=1}
+*STDERR=*STDOUT if $debug;
+my %fieldname= (0,'Question', 1, 'Answer', 2, 'Comments', 3, 'Authors', 4, 'Sources');
+my %rusfieldname=('Question','Вопрос', 'Answer', 'Ответ', 
+                  'Comments', 'Комментарии', 'Authors', 'Автор', 
+                  'Sources', 'Источник','old','Старый','rus','Новый');
 my %searchin;
+my $rl=qr/[йцукенгшщзхъфывапролджэячсмитьбюё]/;
+my $RL=qr/[ЙЦУКЕНГШЩЗХЪЭЖДЛОРПАВЫФЯЧСМИТЬБЮЁ]/;
+my $RLrl=qr/(?:(?:${rl})|(?:${RL}))+/;
+my $l=qr/(?:(?:${RLrl})|(?:[\w\-]))+/;
+my $Ll=qr/(?:[A-Z])|(?:${RL})/;
+my %metodchar=('rus',1,'old',2);
 
 
 
 my $thislocale;
 
+$searchin{$_}=1 foreach param('searchin');
+my %TypeName=('children'=>'Д', 'game'=>'И',
+              'chgk'=>'Ч', 'brain'=>'Б', 'beskrylka'=>'Л','ehruditka'=>'Э');
+
+
 
-$searchin{'question'}=param('Question');
-$searchin{'answer'}=param('Answer');
-$searchin{'comment'}=param('Comment');
-$printqueries||=param('debug');
 my $all=param('all');
 $all=0 if lc $all eq 'no';
 my ($PWD) = `pwd`;
@@ -29,14 +43,18 @@ my ($SRCPATH) = "$PWD/../dimrub/src";
 my ($ZIP) = "/home/piataev/bin/zip";
 my $DUMPFILE = "/tmp/chgkdump";
 my ($SENDMAIL) = "/usr/sbin/sendmail";
+my ($TMPDIR) = "/tmp";
 my ($TMSECS) = 30*24*60*60;
-my (%RevMonths) = 
+my (%RevMonths) =
 	('Jan', '0', 'Feb', '1', 'Mar', '2', 'Apr', '3', 'May', '4', 'Jun', '5',
 	'Jul', '6', 'Aug', '7', 'Sep', '8', 'Oct', '9', 'Nov', '10',
 	'Dec', '11',
 	 'Янв', '0', 'Фев', 1, 'Мар', 2, 'Апр', 3, 'Май', '4',
-	 'Июн', '5', 'Июл', 6, 'Авг', '7', 'Сен', '8', 
+	 'Июн', '5', 'Июл', 6, 'Авг', '7', 'Сен', '8',
 	 'Окт', '9', 'Ноя', '19', 'Дек', '11');
+my @months=('000','Jan',"Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct",
+          "Nov","Dec");
+
 
 # Determine whether the given time is within 2 months from now.
 sub NewEnough {
@@ -61,7 +79,7 @@ sub GetTournament {
 	foreach $name (@{$sth->{NAME}}) {
 		$Tournament{$name} = $arr[$i++];
 	}
-
+        $sth->finish;
 	return %Tournament;
 }
 
@@ -82,6 +100,7 @@ sub GetQuestion {
 		$Question{$name} = $arr[$i++];
 	}
 
+        $sth->finish;
 	return %Question;
 }
 
@@ -90,8 +109,8 @@ sub GetTourQuestions {
 	my ($dbh, $ParentId) = @_;
 	my (@arr, @Questions);
 
-	my ($sth) = $dbh->prepare("SELECT QuestionId FROM Questions 
-		WHERE ParentId=$ParentId ORDER BY QuestionId");
+	my ($sth) = $dbh->prepare("SELECT QuestionId FROM Questions
+		WHERE ParentId=$ParentId");
 
 	$sth->execute;
 
@@ -99,6 +118,7 @@ sub GetTourQuestions {
 		push @Questions, $arr[0];
 	}
 
+        $sth->finish;
 	return @Questions;
 }
 
@@ -115,10 +135,116 @@ sub GetTours {
 	while (@arr = $sth->fetchrow) {
 		push @Tours, $arr[0];
 	}
-
+        $sth->finish;
 	return @Tours;
 }
 
+sub count
+{
+  my ($dbh,$word)=@_; 
+print "timeb=".time.br if $debug;
+  $word=$dbh->quote(uc $word);
+  my $query="SELECT number from nests,nf where $word=w1 AND w2=nf.id";
+  my $sth=$dbh->prepare($query);
+  $sth->execute;
+  my @a=$sth->fetchrow;
+print "timee0=".time.br if $debug;
+  $sth->finish;
+  $a[0]||0;
+}
+
+
+sub printform
+{
+
+  my $submit=submit(-value=>'Поиск');
+  my $inputstring=textfield(-name=>'sstr',
+                         -default=>param('sstr')||'',
+                         -size=>30,
+                         -maxlength=>50);
+  my $qnumber="Выводить по".br. textfield(-name=>'kvo',
+                         -default=>param('kvo')||'150',
+                         -size=>3,
+                         -maxlength=>5). br."вопросов";
+
+  my @df=keys %searchin;
+  @df=('Question', 'Answer') unless @df;
+  my $fields=checkbox_group('searchin',['Question','Answer','Comments','Authors','Sources'], [@df],
+             'false',\%rusfieldname);
+
+  my $metod=radio_group(-name=>'metod',-values=>['old','rus'],
+                       -default=>(param('metod')||'rus'),
+                       -labels=>\%rusfieldname);
+  my $all=radio_group(-name=>'all',-values=>['yes','no'],
+                       -default=>(param('all')||'no'),
+                       -labels=>{'yes'=>'Все','no'=>'Любое'});
+
+#################################################
+return   start_form(-method=>'get',
+                       -action=>url,
+                       -enctype=>
+                "application/x-www-form-urlencoded"
+).br.
+table(Tr
+(
+  td({-valign=>'TOP'},$inputstring.$submit.p."Метод: $metod".p."Слова: $all"),
+  td({-valign=>'TOP'},(' 'x 8).'Поля:'),
+  td({-valign=>'TOP'},$fields), td(" "x5),
+  td({-valign=>'TOP'},$qnumber)
+) 
+)
+ 
+#$fields.
+#$inputstring.$submit.br.$metod.$all
+.endform
+.hr
+
+}
+
+sub proxy
+{
+#print "time0=".time.br if $debug;
+      my ($dbh,$ptext,$allnf)=@_;
+      my $text=$$ptext;
+      $text=~tr/ёЁ/еЕ/;
+      $text=~s/(${RLrl})p(${RLrl})/$1p$2/gom;
+      $text=~s/p(${RLrl})/р$1/gom;
+      $text=~s/(${RLrl})p/$1р/gom;
+      $text=~s/\s+/ /gmo;
+      $text=~s/[^йцукенгшщзхъфывапролджэячсмитьбюЙЦУКЕНГШЩЗХЪФЫВАПРОЛДЖЭЯЧСМИТЬБЮQWERTYUIOPASDFGHJKLZXCVBNM0-9]/ /g;
+      $text=uc $text;
+      my @list= $text=~m/(?:(?:${RLrl})+)|(?:[A-Za-z0-9]+)/gom;
+      my (%c, %good,$sstr);
+      foreach (@list)
+      {
+           $c{$_}=count($dbh,$_)||10000;
+      }
+      my @words=sort {$c{$a}<=> $c{$b}} @list;
+
+#      $good{$words[$_]}=1 foreach 0..4;
+
+      foreach (@words)
+      {
+         $good{$_}=1 if $c{$_}<200;
+      }
+
+      $good{$words[$_]}=0 foreach 16..$#words;
+
+#      foreach (@list)
+#      {
+#        if ($good{$_})
+#        {
+#           $good{$_}=0;
+#           $sstr.=" $_";
+#        }
+#      }
+      $sstr.=" $_" foreach grep {$good{$_}} @list;
+print "time05=".time.br if $debug;
+      $$ptext=$sstr;
+      return russearch($dbh,$sstr,0,$allnf);
+}
+
+
 sub russearch {
             my ($dbh, $sstr, $all,$allnf)=@_;
             my (@qw,@w,@tasks,$qw,@arr,$nf,$sth,@nf,$w,$where,$e,@where,%good,$i,%where,$from);
@@ -143,7 +269,7 @@ $sstr=~tr/йцукенгшщзхъфывапролджэячсмить
             foreach $i (0..$#w) # заполняем массив @nf начальных форм
                            # $nf[$i] -- ссылка на массив возможных
                            # начальных форм словоформы $i
-            {              
+            {
                 $qw= $dbh->quote (uc $w[$i]);
                 $query="  select distinct w2 from nests
                                 where w1=$qw";
@@ -155,9 +281,11 @@ print "$query",br if $printqueries;
 	        {
 	           push (@{$nf[$i]},$arr[0])
 	        }
+                $sth->finish;
             }
 
-            my @bad=grep {!$nf[$_]} 0..$#w; # @bad -- номера словоформ,
+
+            my @bad=grep {!@{$nf[$_]}} 0..$#w; # @bad -- номера словоформ,
                                            # которых нет в словаре
 
             if (@bad) #есть неопознанные словоформы
@@ -173,8 +301,10 @@ print "$query",br if $printqueries;
             }
             return () if ($all && @verybad);
 
+
             my $kvo=0;
             push @$allnf, @{$_} foreach @nf;
+	    print "nf=@$allnf" if $printqueries;
 
             foreach $i (0..$#w) #запросы в базу...
             {
@@ -186,28 +316,9 @@ print "$query",br if $printqueries;
 
               $_= " word2question.word=".$_. ' ' foreach @arr;
               $_= " nf.id=".$_. ' ' foreach @arr1;
-
-#              $_= " nests.w2=".$_. ' ' foreach @arr2;
-#              $query="select w1 from nests where". (join ' OR ', @arr2);
-#print $query if $printqueries;
-#    	      $sth=$dbh -> prepare($query);
-#              $sth->execute;
-#              while (@ar=$sth->fetchrow)
-#              {
-#                 $ar[0]=~s/(.)/&nocase($1)/ge;
-#                 push(@sf,'(?:'.$ar[0].')');
-#              }
-#              $selectshablon=join '|',@sf;
-
-#print $selectshablon,br if $printqueries;
-
-#              $selectshablon=qr/$selectshablon/i;
-
-
-
-
+#              @arr=(0) unless @arr;
               $query="select questions from word2question where". (join ' OR ', @arr);
-print "$query\n",br if $printqueries;
+print STDERR "!$query\n",br if $printqueries;
 
     	      $sth=$dbh -> prepare($query);
               $sth->execute;
@@ -217,6 +328,7 @@ print "$query\n",br if $printqueries;
               {
                 @blob=(@blob,unpack 'C*',$arr[0]);
               }
+              $sth->finish;
               $query="select number from nf where ".(join ' OR ', @arr1);
 print "$query\n",br if $printqueries;
     	      $sth=$dbh -> prepare($query);
@@ -226,8 +338,7 @@ print "$query\n",br if $printqueries;
               {
                 $frequence[$i]+=$arr[0];
               }
-
-
+              $sth->finish;
 
 
               if (@blob < 4)
@@ -245,13 +356,13 @@ print "$query\n",br if $printqueries;
                              # виде хэша, ключи которого -- номера вопросов,
                              # а значения -- списки номеров вхождений. Вот.
                  {
-                    ($field,$hi,$lo,$wordnumber)=@blob[$ii..($ii+3)];
+                    ($field,$lo,$hi,$wordnumber)=@blob[$ii..($ii+3)];
                     $ii+=4;
-                    $number=$lo+$hi*256;
-                    $field=$fieldname{$field};
-                    if ($searchin{lc $field})
+                    my $addnumber=($field >> 4) << 16;
+                    $number=(($field >> 4) << 16)+($hi << 8) + $lo;
+                    $field=$fieldname{$field & 0xF};
+                    if ($searchin{$field})
                     {
-
                       push @{$tasksof{$i}{$number}}, $wordnumber;
                                       # дополнили в хэше, висящем на
                                       # словоформе $i в %tasksof список
@@ -267,9 +378,9 @@ print "$query\n",br if $printqueries;
                }
             }    #foreach $i
 
-print "keys tasksof", keys %tasksof if $printqueries;
+#print "keys tasksof", join ' ', keys %{$tasksof{0}};
 #Ищем пересечение или объединение списков вопросов (значений %tasksof)
-           foreach $sf (keys %tasksof)
+       	    foreach $sf (keys %tasksof)
            {
               $count{$_}++ foreach keys %{$tasksof{$sf}};
            }
@@ -277,7 +388,7 @@ print "keys tasksof", keys %tasksof if $
                              keys %count) ;
 
 
-#print "\n\$#tasks=",$#tasks,br;
+print "\n\$#tasks=",$#tasks,br if $printqueries;
 ############ Сортировка найденных вопросов
 
 foreach (keys %wordsof)
@@ -290,7 +401,7 @@ foreach (keys %wordsof)
 
 ############
 
-print "tasks=@tasks" if $printqueries;;
+print "tasks=@tasks" if $printqueries;
 
 #print "$_ $relevance{$_} | " foreach @tasks;
 #print br;
@@ -345,55 +456,71 @@ if $$words{$first};
 
 # Returns list of QuestionId's, that have the search string in them.
 sub Search {
-	my ($dbh, $sstr,$metod,$all,$allnf) = @_;
+	my ($dbh, $s,$metod,$all,$allnf) = @_;
+	my $sstr=$$s;
 	my (@arr, @Questions, @fields);
-	my (@sar, $i, $sth,$where);
-
-#	push @fields, 'Question';
+	my (@sar, $i, $sth,$where,$query);
+#	my $ip=$ENV{'REMOTE_ADDR'};
 
+#        $ip=$dbh->quote($ip);
+#	$query=
+#          "INSERT into queries (query,metod,searchin,ip)
+#                    values (". $dbh->quote($sstr).', '.
+#                    $dbh->quote($metod) . ', ' .
+#                    $dbh->quote(join ' ', grep $searchin{$_}, keys %searchin)  . 
+#              ", $ip)";
+#print $query if $printqueries;
+#        $dbh -> do ($query);
 	if ($metod eq 'rus')
 	{
 	     my @tasks=russearch($dbh,$sstr,$all,$allnf);
 	     return @tasks
 	}
+	elsif ($metod eq 'proxy')
+	{
+#	  $searchin{'question'}=1;
+#	  $searchin{'answer'}=1;
+	  my @task=proxy($dbh,$s,$allnf);
+#	  $$s=$sstr;
+	  return @task
+	}
+
 
 
 ###Simple and advanced query processing. Added by R7
-	if ($metod eq 'simple' || $metod eq 'advanced') 
+	if ($metod eq 'simple' || $metod eq 'advanced')
 	{
-        foreach (qw/Question Answer Sources Authors Comments/) {
+          foreach (qw/Question Answer Sources Authors Comments/) {
 		if (param($_)) {
-			push @fields, $_; 
+			push @fields, $_;
 		}
-	}
-
+	   }
 
 	   @fields=(qw/Question Answer Sources Authors Comments/) unless scalar @fields;
 	   my $fields=join ",", @fields;
            my $q=new Text::Query($sstr,
-                 -parse => 'Text::Query::'. 
+                 -parse => 'Text::Query::'.
                    (($metod eq 'simple') ? 'ParseSimple':'ParseAdvanced'),
                  -solve => 'Text::Query::SolveSQL',
                  -build => 'Text::Query::BuildSQLMySQL',
                  -fields_searched => $fields);
 
            $where=	$$q{'matchexp'};
-           my $query= "SELECT Questionid FROM Questions
+           $query= "SELECT Questionid FROM Questions
                 WHERE $where";
-           print br."Query is: $query".br if $printqueries;
+           print br."Query is: $query".br if $debug;
 
            $sth = $dbh->prepare($query);
          } else
-######   
+######
          {
 
-
-	  foreach (qw/Question Answer Sources Authors Comments/) {
-		if (param($_)) {
+#	  foreach (qw/Question Answer Sources Authors Comments/) {
+	  foreach (param('searchin')) {
+#		if (param($_)) {
 			push @fields, "IFNULL($_, '')";
-		}
+#		}
 	  }
-
 	  @sar = split " ", $sstr;
 	  for $i (0 .. $#sar) {
 		$sar[$i] = $dbh->quote("%${sar[$i]}%");
@@ -406,27 +533,30 @@ sub Search {
 		$sstr = join " OR $f LIKE ", @sar;
     	  }
 
-my $query="SELECT QuestionId FROM Questions
+   my $query;
+               $query="SELECT QuestionId FROM Questions
 		WHERE $f LIKE $sstr ORDER BY QuestionId";
+
+
 print $query if $printqueries;
 	  $sth = $dbh->prepare($query)
-
 	} #else -- processing old-style query (R7)
 
 	$sth->execute;
 	while (@arr = $sth->fetchrow) {
-		push @Questions, $arr[0];
+		push @Questions, $arr[0] unless $forbidden{$arr[0]};
 	}
-	
+        $sth->finish;
+print "@Questions" if $printqueries;
 	return @Questions;
 }
 
  # Substitute every letter by a pair (for case insensitive search).
- my (@letters) = qw/аА бБ вВ гГ дД еЕ жЖ зЗ иИ йЙ кК лЛ мМ нН оО 
+ my (@letters) = qw/аА бБ вВ гГ дД еЕ жЖ зЗ иИ йЙ кК лЛ мМ нН оО
  пП рР сС тТ уУ фФ хХ цЦ чЧ шШ щЩ ьЬ ыЫ эЭ юЮ яЯ/;
- 
+
 sub NoCase {
-	my ($sstr) = shift;
+	my ($sstr) = shift;                   	
 	my ($res);
 
 	if (($res) = grep(/$sstr/, @letters)) {
@@ -436,15 +566,139 @@ sub NoCase {
 	}
 }
 
+sub PrintList {
+   my ($dbh,$Questions,$shablon,$was)=@_;
+
+	my $first=param('first') ||1;
+	my $kvo=param('kvo') ||150;
+
+	$first=$first-($first-1)%$kvo;
+	my $last=$first+$kvo-1;
+	$last=scalar @$Questions if scalar @$Questions <$last;
+        my($f,$l);
+        my $nav='';
+        my $qs=query_string;
+	$qs=~s/\;/\&/g;
+        $qs=~s/\&first\=[^\&]+//g;
+        my $sstr=param('sstr');
+        $qs=~s/sstr=[^\&]+/sstr=$sstr/;
+        $qs=~s/\&was=[^\&]+//;
+        $qs.="&was=$was";
+        if ($first>$kvo*3+1)
+        {
+           $nav.=
+            ("&nbsp;"x4).
+            a({href=>url."?".$qs."\&first=1"},"<<").("&nbsp;"x4).
+            a({href=>(url."?".$qs."\&first=".($first-$kvo))},"<").("&nbsp;"x4)
+	        }
+
+        else {$nav.='&nbsp;'x15;}
+
+     my ($fprint,$lprint);
+     my $llprint=$#$Questions- ($#$Questions+1)%$kvo+2;
+     if ($#$Questions+1<=$kvo*7)
+     {         $fprint=1;
+               $lprint=$llprint;
+     }
+     elsif ($first>$kvo*3 && $#$Questions+1-$first>$kvo*3)
+     {
+       $fprint=$first-$kvo*3;
+       $lprint=$first+$kvo*3;
+     } 
+     elsif  ($first<=$kvo*3)
+     {
+        $fprint=1; $lprint=6*$kvo+1;
+     }
+     else
+     { 
+           $lprint=$llprint;
+           $fprint=$lprint-$kvo*6
+     }
+         
+#        my $fprint=($first>$kvo*3) ? $first-$kvo*3 : 1;
+#        my $lprint=$#$Questions+1-$fprint>$kvo*7 ? $kvo*7 :$#$Questions+1;
+#        if ($lprint-$fprint<$kvo*6 && $fprint>1)
+#        {
+#            $fprint=$lprint-$kvo*6;
+#            $fprint=1 if ($fprint<=0) 
+#        }
+
+
+
+        for($f=$fprint; $f<=$lprint; $f+=$kvo)
+	{
+#	  next if $first-$f>$kvo*3;
+	  $l=$f+$kvo-1;
+	  $l=$#$Questions+1 if $l>$#$Questions+1;
+	  if ($f==$first) {$nav.="[$f-$l] ";}
+	  else {
+                  $nav.= "[".a({href=>(url."?".$qs."\&first=$f")},"$f-$l")."] ";}
+	}
+        if ($lprint+$kvo<$#$Questions)
+        {
+           $nav.=
+            ("&nbsp;"x4).
+            a({href=>(url."?".$qs."\&first=".($first+$kvo))},">").("&nbsp;"x4).
+            a({href=>url."?".$qs."\&first=$llprint"},">>").("&nbsp;"x4)
+        }
+
+
+	print "$nav".br."\n";
+	for (my $i = $first; $i <= $last; $i++) {
+		my $output = &PrintQuestion($dbh, $$Questions[$i-1], 1, 0, 1);
+                if (param('metod') eq 'rus' || param('metod') eq 'proxy')
+                {
+	             $output=~s/\b($shablon)\b/\<strong\>$1\<\/strong\>/gi;
+	        } else {
+	             $output=~s/($shablon)/\<strong\>$1\<\/strong\>/gi;
+		}
+		print $output;
+	}
+
+
+	print "$nav".br."\n";
+
+}
+
 sub PrintSearch {
-	my ($dbh, $sstr, $metod) = @_;
+	my ($dbh, $sstr, $metod,$was) = @_;
+	my $t=time;
+	print h2("Поиск в базе вопросов");
+	print printform;
 	my @allnf;
-        my (@Questions) = &Search($dbh, $sstr,$metod,$all,\@allnf);
-	my ($output, $i, $suffix, $hits) = ('', 0, '', $#Questions + 1);
+	my @Questions;
+	if ($was)
+	{
+	  my $sth=$dbh->prepare ("select sstr,questions,allnf from lastqueries where id=".param('was'));
+          $sth->execute;
+          my ($q,$nf);
+	  ($sstr, $q,$nf)=($sth->fetchrow);
+          @Questions=unpack 'L*',$q; 
+          @allnf=unpack 'L*',$nf;        
+          $sth->finish;
+        } else 
+        {
+             @Questions=&Search($dbh, \$sstr,$metod,$all,\@allnf);
+             my $tmp=$dbh->quote(pack("L*",@Questions));
+             my $qsstr=$dbh->quote($sstr);
+             my $nf=$dbh->quote(pack("L*", @allnf));
+             my $ss=200;
+             do 
+             {
+               $was=int rand(32000);
+             }
+             while (--$ss && (!$dbh->do ("insert into lastqueries (id,sstr,questions,allnf) 
+                         values ($was, $qsstr,$tmp,$nf)")));
+             print "Something is wrong...".br unless $ss;
+        }
 
-        my $shablon;
 
 
+	print p. "Время поиска: " . (time-$t) ." сек.".p;
+	my ($output, $i, $suffix, $hits) = ('', 0, '', $#Questions + 1);
+
+        my $shablon;
+        $metod='rus' if $metod eq 'proxy';
         if ($metod eq 'rus')
         {
            my $where='0';
@@ -459,11 +713,13 @@ print "$query" if $printqueries;
 	   {
 	     push @shablon,"(?:$arr[0])";
 	   }
-           $shablon= join "|", @shablon; 
+	   $sth->finish;
+           $shablon= join "|", @shablon;
            $shablon=~s/[её]/\[ЕЁ\]/gi;
 #           $shablon=~s/([йцукенгшщзхъфывапролджэячсмитьбюЙЦУКЕНГШЩЗХЪФЫВАПРОЛДЖЭЯЧСМИТЬБЮ])/&NoCase($1)/ge;
            $shablon=qr/$shablon/i;
            print "!$shablon!",br if $printqueries;
+
         }
 
 
@@ -473,9 +729,9 @@ print "$query" if $printqueries;
 	} elsif ($hits =~ /1$/) {
 		$suffix = 'е';
 	} else {
-		$suffix = 'я'; 
+		$suffix = 'я';
 	}
-	
+
 	print p({align=>"center"}, "Результаты поиска на " . strong($sstr)
 	. " : $hits попадани$suffix.");
 
@@ -485,18 +741,13 @@ print "$query" if $printqueries;
 
 	$sstr =~ s/(.)/&NoCase($1)/ge;
 
-	my(@sar) = split(' ', $sstr);
-	for ($i = 0; $i <= $#Questions; $i++) {
-		$output = &PrintQuestion($dbh, $Questions[$i], 1, $i + 1, 1);
-                if (param('metod') eq 'rus')
-                { 
-	             $output=~s/\b($shablon)\b/\<strong\>$1\<\/strong\>/gi;
-	        } else {
-		foreach  (@sar) {
-			$output =~ s/$_/<strong>$&<\/strong>/gs;
-		}}
-		print $output;
+	my @sar;
+	if ($metod ne 'rus') 
+	{
+	  (@sar) = split(' ', $sstr);
+	  $shablon=join "|",@sar;
 	}
+	PrintList($dbh,\@Questions,$shablon,$was);
 }
 
 sub PrintRandom {
@@ -514,10 +765,17 @@ sub PrintRandom {
 	for ($i = 0; $i <= $#Questions; $i++) {
 		# Passing DB handler, question ID, print answer, question
 		# number, print title, print text/html
-		$output .= 
+		$output .=
 			&PrintQuestion($dbh, $Questions[$i], 1, $i + 1, 0, $text);
 	}
-	return $output; 
+	return $output;
+}
+
+sub PrintEditor {
+       my $t=shift; #ссылка на Хэш с полями
+       my $ed=$$t{'Editors'};
+       my $edname=($ed=~/\,/ ) ? "Редакторы"  : "Редактор" ;
+       return $ed? h4({align=>"center"},"$edname: $ed" ): '';
 }
 
 sub PrintTournament {
@@ -527,17 +785,18 @@ sub PrintTournament {
 	my ($output) = '';
 
 	%Tournament = &GetTournament($dbh, $Id) if ($Id);
-	
+
 	my ($URL) = $Tournament{'URL'};
 	my ($Info) = $Tournament{'Info'};
 	my ($Copyright) = $Tournament{'Copyright'};
-
+	my $fname=$Tournament{'FileName'};
 	@Tours = &GetTours($dbh, $Id);
-
+	$list='';
+	my $textid;
 	if ($Id) {
 		for ($Tournament{'Type'}) {
 			/Г/ && do {
-				$output .= h2({align=>"center"}, 
+				$output .= h2({align=>"center"},
 					      "Группа: $Tournament{'Title'} ",
 					      "$Tournament{'PlayedAt'}") . p . "\n";
 				last;
@@ -545,14 +804,15 @@ sub PrintTournament {
 			/Ч/ && do {
 				return &PrintTour($dbh, $Tours[0], $answer)
 					if ($#Tours == 0);
-				
+
 				my $title="Пакет: $Tournament{'Title'}";
 				if ($Tournament{'PlayedAt'}) {
 				    $title .= " $Tournament{'PlayedAt'}";
 				}
 
-				$output .= h2({align=>"center"}, 
+				$output .= h2({align=>"center"},
 					"$title") . p . "\n";
+			       $output.=&PrintEditor(\%Tournament);
 				last;
 			};
 			/Т/ && do {
@@ -564,9 +824,9 @@ sub PrintTournament {
 		$output .= h2("Банк Вопросов: $qnum вопросов") . p . "\n";
 	}
 
-	for ($i = 0; $i <= $#Tours; $i++) { 
+	for ($i = 0; $i <= $#Tours; $i++) {
 		%Tournament = &GetTournament($dbh, $Tours[$i]);
-		
+
 		if ($Tournament{'Type'} =~ /Ч/) {
 			$SingleTour = 0;
 			my (@Tours) = &GetTours($dbh, $Tournament{'Id'});
@@ -580,6 +840,7 @@ sub PrintTournament {
 			$qnum = '';
 		}
 		if ($Tournament{'Type'} =~ /Г/) {
+		    $SingleTour=0;
 			$imgsrc = "/icons/folder.gif";
 			$alt = "[*]";
 		} else {
@@ -587,23 +848,36 @@ sub PrintTournament {
 			$alt = "[-]";
 		}
 
+		my $textid;
+		if ($textid=$Tournament{'FileName'})
+		{
+		   $textid=~s/\.txt//;
+		}
+		elsif ($textid=$Tournament{'Number'})
+		  {
+		      $fname=~s/\.txt//;
+		      $textid="$fname.$textid";
+		  }
+	       else {$textid=$Tournament{'Id'}};
+		
+
 		if ($SingleTour or $Tournament{'Type'} =~ /Т/) {
 			$list .= dd(img({src=>$imgsrc, alt=>$alt})
 				. " " . $Tournament{'Title'} . " " .
-				    $Tournament{'PlayedAt'} . $qnum) . 
+				    $Tournament{'PlayedAt'} . $qnum) .
 				dl(
 					dd("["
-						. a({href=>url .  "?tour=$Tournament{'Id'}&answer=0"},
+						. a({href=>url .  "?tour=$textid&answer=0"},
 						"вопросы") . "] ["
-                  . a({href=>url .  "?tour=$Tournament{'Id'}&answer=1"},
+                  . a({href=>url .  "?tour=$textid&answer=1"},
                   "вопросы + ответы") . "]")
 				);
 		} else {
-			$list .= dd(a({href=>url . "?tour=$Tournament{'Id'}&comp=1"}, 
-				img({src=>'/icons/compressed.gif', alt=>'[ZIP]', border=>1}))
-				. " " . img({src=>$imgsrc, alt=>$alt}) 
-				. " " . a({href=>url . "?tour=$Tournament{'Id'}&answer=0"}, 
-				$Tournament{'Title'}. " ". 
+			$list .= dd(#a({href=>url . "?tour=$textid&comp=1"},
+				#img({src=>'/icons/compressed.gif', alt=>'[ZIP]', border=>1})). " " . 
+                                img({src=>$imgsrc, alt=>$alt})
+				. " " . a({href=>url . "?tour=$textid&answer=0"},
+				$Tournament{'Title'}. " ".
 					  $Tournament{'PlayedAt'}) . $qnum);
 		}
 	}
@@ -611,7 +885,7 @@ sub PrintTournament {
 
 	if ($URL) {
 		$output .=
-		p("Дополнительная информация об этом турнире - по адресу " . 
+		p("Дополнительная информация об этом турнире - по адресу " .
 			a({-'href'=>$URL}, $URL));
 	}
 
@@ -619,10 +893,11 @@ sub PrintTournament {
 		$output .= p("Копирайт: " .   $Copyright);
 	}
 
+
+
 	if ($Info) {
 		$output .= p($Info);
 	}
-	
 	return $output;
 }
 
@@ -635,11 +910,23 @@ sub Suffix {
 }
 
 sub IsTour {
-	my ($dbh, $Id) = @_;
-	my ($sth) = $dbh->prepare("SELECT Type FROM Tournaments 
+	my ($dbh, $Id,$n) = @_;
+
+	my ($sth) ;
+        
+        if (defined $n) 
+        { $sth=$dbh->prepare ("select Id FROM Tournaments
+                           WHERE ParentId=$Id AND Number=$n");
+        }
+        else
+        {
+          $sth=$dbh->prepare("SELECT Id FROM Tournaments
 		WHERE Id=$Id");
+	}
 	$sth->execute;
-	return ($sth->fetchrow)[0] =~ /Т/;
+        my $a=($sth->fetchrow)[0];
+	$sth->finish;
+ 	return $a;
 }
 
 # Gets a DB handler (ofcourse) and a tour Id. Prints all the
@@ -655,24 +942,27 @@ sub PrintTour {
 	return 0
 		if ($Tour{'Type'} !~ /Т/);
 
+	my ($fname)=$Tournament{'FileName'};
+	$fname=~s/\.txt//;
 	my ($qnum) = $Tour{'QuestionsNum'};
-	my ($suffix) = &Suffix($qnum); 
-	
-	$output .= h2({align=>"center"}, $Tournament{"Title"}, 
+	my ($suffix) = &Suffix($qnum);
+
+	$output .= h2({align=>"center"}, $Tournament{"Title"},
 		      $Tournament{'PlayedAt'},
-		      "<br>", $Tour{"Title"} . 
+		      "<br>", $Tour{"Title"} .
 		" ($qnum вопрос$suffix)\n") . p;
+	$output .=&PrintEditor(\%Tour);
 
 	my (@Questions) = &GetTourQuestions($dbh, $Id);
 	for ($q = 0; $q <= $#Questions; $q++) {
 		$output .= &PrintQuestion($dbh, $Questions[$q], $answer, 0);
-	} 
+	}
 
 	$output .= hr({-'align'=>'center', -'width'=>'80%'});
 
 	if ($Tournament{'URL'}) {
 		$output .=
-		p("Дополнительная информация об этом турнире - по адресу " . 
+		p("Дополнительная информация об этом турнире - по адресу " .
 			a({-'href'=>$Tournament{'URL'}}, $Tournament{'URL'}));
 	}
 
@@ -683,26 +973,26 @@ sub PrintTour {
 	if ($Tournament{'Info'}) {
 		$output .= p($Tournament{'Info'});
 	}
-	
 
+	my $n=$Tour{'Number'};
 	if ($answer == 0) {
-		$bottom .= 
-			"[" . a({href=>url . "?tour=$Id&answer=1"}, "ответы") .  "] " . br;
+		$bottom .=
+			"[" . a({href=>url . "?tour=$fname.$n&answer=1"}, "ответы") .  "] " . br;
 	}
-	if (&IsTour($dbh, $Id - 1)) {
-		$bottom .= 
-			"[" . a({href=>url . "?tour=" . ($Id - 1) . "&answer=0"}, 
+	if ($n>1) {
+		$bottom .=
+			"[" . a({href=>url . "?tour=$fname." . ($n - 1) . "&answer=0"},
 			"предыдущий тур") . "] ";
-		$bottom .= 
-			"[" . a({href=>url . "?tour=" . ($Id - 1) . "&answer=1"}, 
+		$bottom .=
+			"[" . a({href=>url . "?tour=$fname." . ($n - 1) . "&answer=1"},
 			"предыдущий тур с ответами") . "] " . br;
 	}
-	if (&IsTour($dbh, $Id + 1)) {
-		$bottom .= 
-			"[" . a({href=>url . "?tour=" . ($Id + 1) . "&answer=0"}, 
+	if (&IsTour($dbh, $Tour{'ParentId'}, $n + 1)) {
+		$bottom .=
+			"[" . a({href=>url . "?tour=$fname." . ($n + 1) . "&answer=0"},
 			"следующий тур") . "] ";
-		$bottom .= 
-			"[" . a({href=>url . "?tour=" . ($Id + 1) . "&answer=1"}, 
+		$bottom .=
+			"[" . a({href=>url . "?tour=$fname." . ($n + 1) . "&answer=1"},
 			"следующий тур с ответами") . "] ";
 	}
 
@@ -715,49 +1005,88 @@ sub PrintTour {
 sub PrintField {
 	my ($header, $value, $text) = @_;
 	if ($text) {
-	    $value =~ s/<[\/\w]*>//sg;
+	    $value =~ s/<[\/\w]*?>//sg;
 	} else {
 	    $value =~ s/^\s+/<br>&nbsp;&nbsp;&nbsp;&nbsp;/mg;
 	    $value =~ s/^\|([^\n]*)/<pre>$1<\/pre>/mg;
+	    $value =~ s/\s+-+\s+/&nbsp;&#0150; /mg;
+#	    $value =~ s/(\s)"/$1&#147;/mg;
+#	    $value =~ s/^"/&#147;/mg;
+#	    $value =~ s/"/&#148;/mg;
 	}
-	return $text ? "$header:\n$value\n\n" : 
+
+
+	return $text ? "$header:\n$value\n\n" :
 		strong("$header: ") . $value . p . "\n";
 }
 
-# Gets a DB handler (ofcourse) and a question Id. Prints 
+# Gets a DB handler (ofcourse) and a question Id. Prints
 # that question, according to the options.
 sub PrintQuestion {
 	my ($dbh, $Id, $answer, $qnum, $title, $text) = @_;
 	my ($output, $titles) = ('', '');
-
 	my (%Question) = &GetQuestion($dbh, $Id);
+	$qnum = $Question{'Number'}
+		if ($qnum == 0);
 	if (!$text) {
 		$output .= hr({width=>"50%"});
 		if ($title) {
 			my (%Tour) = GetTournament($dbh, $Question{'ParentId'});
 			my (%Tournament) = GetTournament($dbh, $Tour{'ParentId'});
+			my $fname=$Tournament{'FileName'};
+			$fname=~s/\.txt//;
 			$titles .=
 				dd(img({src=>"/icons/folder.open.gif"}) . " " .
-					 a({href=>url . "?tour=$Tournament{'Id'}"}, $Tournament{'Title'}, $Tournament{'PlayedAt'}));
+					 a({href=>url . "?tour=$fname"}, $Tournament{'Title'}, $Tournament{'PlayedAt'}));
 			$titles .=
 				dl(dd(img({src=>"/icons/folder.open.gif"}) . " " .
-					a({href=>url . "?tour=$Tour{'Id'}"}, $Tour{'Title'})));
+					a({href=>url . "?tour=$fname.$Tour{Number}#$qnum"}, $Tour{'Title'})));
 		}
 		$output .= dl(strong($titles));
 	}
-	
-	$qnum = $Question{'Number'}
-		if ($qnum == 0);
 
-	$output .= 
+
+	$output.= "<a NAME=\"$qnum\">";
+
+	$output .=
 		&PrintField("Вопрос $qnum", $Question{'Question'}, $text);
 
 	if ($answer) {
-		$output .= 
+		$output .=
 			&PrintField("Ответ", $Question{'Answer'}, $text);
 
 		if ($Question{'Authors'}) {
-			$output .= &PrintField("Автор(ы)", $Question{'Authors'}, $text);
+                      my $q=$Question{'Authors'};
+
+#		      my $sth=$dbh->prepare("select Authors.Id,Name, Surname, Nicks from Authors, A2Q
+#                                 where Authors.Id=Author And Question=$Id");
+#                      $sth->execute;
+#                      my ($AuthorId,$Name, $Surname,$other,$Nicks);
+
+#                      while ((($AuthorId,$Name, $Surname,$Nicks)=$sth->fetchrow),$AuthorId)
+#                      {
+#                        my ($firstletter)=$Name=~m/^./g;
+#                         $Name=~s/\./\\\./g;
+#                          my $sha="(?:$Name\\s+$Surname)|(?:$Surname\\s+$Name)|(?:$firstletter\\.\\s*$Surname)|(?:$Surname\\s+$firstletter\\.)|(?:$Surname)|(?:$Name)";
+#                          if ($Nicks)
+#                          {
+#                            $Nicks=~s/^\|//;
+#                            foreach (split /\|/, $Nicks)
+#                            {
+#                              s/\s+/ /g;
+#                              s/\s+$//;
+#                              s/ /\\s+/g;
+#                              s/\./\\\./g;
+#                              if (s/>$//) {$sha="$sha|(?:$_)"}
+#                              else        {$sha="(?:$_)|$sha"}
+#                            }
+#                          }
+#                          $q=~s/($sha)/a({href=>url."?qofauthor=$AuthorId"},$1)/ei;
+#                      }
+
+			$output .= &PrintField("Автор(ы)", $q, $text);
+
+#                        $output.= &PrintField("Другие вопросы", $other);
 		}
 
 		if ($Question{'Sources'}) {
@@ -768,6 +1097,8 @@ sub PrintQuestion {
 			$output .= &PrintField("Комментарии", $Question{'Comments'}, $text);
 		}
 	}
+#	$output.=br.a({href=> url."?metod=proxy&qid=$Id"}, 'Близкие вопросы').p
+#             if $answer;
 	return $output;
 }
 
@@ -776,13 +1107,18 @@ sub GetQNum {
 	my ($dbh) = @_;
 	my ($sth) = $dbh->prepare("SELECT COUNT(*) FROM Questions");
 	$sth->execute;
- 	return ($sth->fetchrow)[0];
+	my $tmp=($sth->fetchrow)[0];
+        $sth->finish;
+ 	return $tmp;
 }
 sub GetMaxQId {
 	my ($dbh) = @_;
 	my ($sth) = $dbh->prepare("SELECT MAX(QuestionId) FROM Questions");
 	$sth->execute;
- 	return ($sth->fetchrow)[0];
+	my $tmp=($sth->fetchrow)[0];
+        $sth->finish;
+ 	return $tmp;
+
 }
 
 # Returns Id's of 12 random questions
@@ -792,18 +1128,32 @@ sub Get12Random {
 	my ($qnum) = &GetMaxQId($dbh);
 	my (%chosen);
 	srand;
-	
-   for ($i = 0; $i < $num; $i++) {
-       do {
-	   $q = int(rand($qnum));
-	   $sth = $dbh->prepare("SELECT Type FROM Questions
-				WHERE QuestionId=$q");
-	   $sth->execute;
-	   $t = ($sth->fetchrow)[0];
-       } until !$chosen{$q} && $t && $type =~ /[$t]/;
-       $chosen{$q} = 'y';
-       push @questions, $q;
+
+	my $where=0;
+	my $r=int (rand(10000));
+
+	foreach (split '', $type)
+        {
+ 	   $where.= " OR (Type ='$_') OR (Type ='$_Д') ";
+ 	}
+        $where.= "OR (Type='ЧБ')" if ($type=~/Ч|Б/);
+
+   $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();
+
+   $sth=$dbh->prepare($q);
+   $sth->execute;
+   while (($i)=$sth->fetchrow)
+   {
+      push @questions,$i;
    }
+   $sth->finish;
+    for ($i=@questions; --$i;){ 
+       my $j=rand ($i+1); 
+       @questions[$i,$j]=@questions[$j,$i] unless $i==$j;
+    }
    return @questions;
 }
 
@@ -812,7 +1162,7 @@ sub Include_virtual {
 
 	open F , $fn
 		or return; #die "Can't open the file $fn: $!\n";
-	
+
 	while (<F>) {
 		if (/<!--#include/o) {
 			s/<!--#include virtual="\/(.*)" -->/&Include_virtual($1)/e;
@@ -831,36 +1181,50 @@ sub PrintArchive {
 
 	my (%Tournament) = &GetTournament($dbh, $Id);
 	my (@Tours) = &GetTours($dbh, $Id);
-	
+
 	if ($Tournament{'Type'} =~ /Г/ || $Id == 0) {
 		for ($i = 0; $i <= $#Tours; $i++) {
 			push(@list ,&PrintArchive($dbh, $Tours[$i]));
 		}
 		return @list;
 	}
-	return "$SRCPATH/$Tournament{'FileName'} ";
+#	return "$SRCPATH/$Tournament{'FileName'} ";
+	return "$TMPDIR/$Tournament{'FileName'} ";
 }
 
 sub PrintAll {
-	my ($dbh, $Id) = @_;
+	my ($dbh, $Id,$fname) = @_;
 	my ($output, $list, $i);
 
 	my (%Tournament) = &GetTournament($dbh, $Id);
 	my (@Tours) = &GetTours($dbh, $Id);
-	my ($New) = ($Id and $Tournament{'Type'} eq 'Ч' and 
+	my ($New) = ($Id and $Tournament{'Type'} eq 'Ч' and
 		&NewEnough($Tournament{"CreatedAt"})) ?
 		img({src=>"/znatoki/dimrub/db/new-sml.gif", alt=>"NEW!"}) : "";
 
 	if ($Id == 0) {
 		$output = h3("Все турниры");
 	} else {
+	         my $textid;
+		 if ($textid=$Tournament{'FileName'})
+		 {
+		   $textid=~s/\.txt//;
+		 }
+		 elsif ($textid=$Tournament{'Number'})
+		 {
+		      $fname=~s/\.txt//;
+		      $textid="$fname.$textid";
+		 }
+	         else {$textid=$Tournament{'Id'}};
+
+
 		$output .= dd(img({src=>"/icons/folder.gif", alt=>"[*]"}) .
-      " " . a({href=>url . "?tour=$Tournament{'Id'}&answer=0"},
+      " " . a({href=>url . "?tour=$textid&answer=0"},
       $Tournament{'Title'}) ." " . $Tournament{'PlayedAt'} . " $New");
 	}
-	if ($Id == 0 or $Tournament{'Type'} =~ /Г/) {
+	if ($Id == 0 or $Tournament{'Type'} =~ /Г/ or $Tournament{'Type'} eq '') {
 		for ($i = 0; $i <= $#Tours; $i++) {
-			$list .= &PrintAll($dbh, $Tours[$i]);
+			$list .= &PrintAll($dbh, $Tours[$i],$Tournament{'FileName'});
 		}
 		$output .= dl($list);
 	}
@@ -869,7 +1233,7 @@ sub PrintAll {
 
 sub PrintDates {
 	my ($dbh) = @_;
-	my ($from) = param('from_year') . "-" . param('from_month') . 
+	my ($from) = param('from_year') . "-" . param('from_month') .
 		"-" .  param('from_day');
 	my ($to) = param('to_year') . "-" . param('to_month') . "-" .  param('to_day');
 	$from = $dbh->quote($from);
@@ -892,15 +1256,254 @@ sub PrintDates {
       " " . a({href=>url . "?tour=$Tournament{'Id'}&answer=0"},
       $Tournament{'Title'}, $Tournament{'PlayedAt'}));
 	}
+        $sth->finish;
 	$output .= dl($list);
 	return $output;
 }
 
+sub PrintQOfAuthor
+{
+
+    my ($dbh, $id) = @_;
+   $id=$dbh->quote($id);
+    my $sth =  $dbh->prepare("SELECT  Name, Surname FROM Authors WHERE Id=$id");
+    $sth->execute;
+    my ($name,$surname)=$sth->fetchrow;
+
+    $sth =  $dbh->prepare("SELECT Question FROM A2Q WHERE Author=$id");
+    $sth->execute;
+    my $q;
+    my @Questions;
+    while (($q)=$sth->fetchrow,$q)
+     {push @Questions,$q unless $forbidden{$q}}
+    $sth->finish;
+
+    my ($output, $i, $suffix, $hits) = ('', 0, '', $#Questions + 1);
+
+    if ($hits =~ /1.$/  || $hits =~ /[5-90]$/) {
+		$suffix = 'й';
+	} elsif ($hits =~ /1$/) {
+		$suffix = 'е';
+	} else {
+		$suffix = 'я';
+	}
+	print h2("Поиск в базе вопросов");
+	print printform;
+	print p({align=>"center"}, "Автор ".strong("$name $surname. ")
+	. " : $hits попадани$suffix.");
+
+
+#	for ($i = 0; $i <= $#Questions; $i++) {
+#		$output = &PrintQuestion($dbh, $Questions[$i], 1, $i + 1, 1);
+#		print $output;
+#	}
+        PrintList($dbh,\@Questions,'gdfgdfgdfgdfg');
+}
+
+
+sub PrintAuthors
+{
+     my ($dbh,$sort)=@_;
+     my($output,$out1,@array,$sth);
+     if ($sort eq 'surname')
+     {
+        $sth =
+             $dbh->prepare("SELECT Id, Name, Surname, QNumber FROM Authors order by Surname, Name");
+     }
+     elsif($sort eq 'name')
+     {
+        $sth =
+             $dbh->prepare("SELECT Id, Name, Surname, QNumber FROM Authors order by Name, Surname");
+     }
+     else
+     {
+        $sth =
+             $dbh->prepare("SELECT Id, Name, Surname, QNumber FROM Authors Order by QNumber DESC, Surname");
+     }
+
+     $output.=h2("Авторы вопросов")."\n";
+     $output.="<TABLE>";
+
+
+     $sth->execute;
+     $output.=Tr(th[a({href=>url."?authors=name"},"Имя")
+.", ".
+a({href=>url."?authors=surname"},"фамилия")
+     , a({href=>url."?authors=kvo"},"Количество вопросов")]);
+
+     $out1='';
+
+     my $ar=$sth->fetchall_arrayref;
+
+     $sth->finish;
+
+
+    foreach my $arr(@$ar)
+     {
+
+           my ($id,$name,$surname,$kvo)=@$arr;
+           if (!$name || !$surname) {#print "Opanki at $id\n"
+              } else
+           {
+             my $add=Tr(td([a({href=>url."?qofauthor=$id"},"$name $surname"), $kvo]))."\n";
+             print STDERR $add;
+             $output.=$add;
+           }
+     }
+     $output.="</TABLE>";
+     $sth->finish;
+     return $output;
+}
+
+
+sub WriteFile {
+  my ($dbh,$fname) = @_;
+  $fname=~s/\.txt$//;
+  $fname=~s/.*\/(\w+)/$1/;
+  my $query= "SELECT Id, Title, Copyright, Info, URL, 
+                      Editors, EnteredBy, PlayedAt, CreatedAt 
+                     from Tournaments where FileName=".$dbh->quote("$fname.txt");
+  my $sth=$dbh->prepare($query);
+  my (%Question,%editor,%qnumber,%copyright,%author,%vid,%tourtitle);
+  $sth->execute;
+  my ($Id, $Title, $Copyright, $Info, $URL, 
+   $Editors, $EnteredBy, $PlayedAt, $CreatedAt)=
+      $sth->fetchrow;
+  return -1 unless $Id;
+  open (OUT, ">$TMPDIR/$fname.txt");
+  print OUT "Чемпионат:\n$Title\n\n";
+  my $date=$PlayedAt;
+  my ($year,$month,$day)=split /-/, $date;
+#  $month=0,$date=0 if $year && $month==1 && $day==1;
+  my $pdate=sprintf("%02d-%3s-%4d",$day,$months[$month],$year);
+
+  print OUT "Дата:\n$pdate\n\n" if $date;
+
+  print OUT "URL:\n$URL\n\n" if $URL;
+
+  print OUT "Инфо:\n$Info\n\n" if $Info;
+
+  print OUT "Копирайт:\n$Copyright\n\n" if $Copyright;
+
+  print OUT "Редактор:\n$Editors\n\n" if $Editors;
+
+
+  $query= "SELECT Id, Title, Copyright, Editors from Tournaments where ParentId=$Id order by Id";
+  $sth=$dbh->prepare($query);
+  $sth->execute;
+  my ($tourid,$tourtitle,$cright,$editor,@tours,$vid,$author,$tourauthor);
+
+
+  while (($tourid,$tourtitle,$cright,$editor)=$sth->fetchrow,$tourid)
+  {
+#    $text{$tourid}="Тур:\n$tourtitle\n\n";
+    $query= "SELECT * from Questions where ParentId=$tourid order by QuestionId";
+    my $sth1=$dbh->prepare($query);
+    $sth1->execute;
+    push(@tours,$tourid);
+    $tourtitle{$tourid}=$tourtitle;
+    $copyright{$tourid}=$cright;
+    $editor{$tourid}=$editor;
+    $vid='';
+    my $author='';
+    my $eqauthor=1;
+    my $qnumber=0;
+    my @arr;
+    while ( @arr=$sth1->fetchrow, $arr[0])
+    {
+	my($i, $name) = 0;
+	$qnumber++;
+	foreach $name (@{$sth1->{NAME}}) {
+	        $arr[$i]=~s/^(.*?)\s*$/$1/;
+		$Question{$tourid}[$qnumber]{$name} = $arr[$i++];
+	}
+	if ($vid)
+        {
+          if ($vid ne $Question{$tourid}[$qnumber]{'Type'}) {print STDERR "Warning: Different types for Tournament $tourid\n"}
+        } else 
+        {
+            $vid=$Question{$tourid}[$qnumber]{'Type'};
+        } 
+
+	if ($author)
+        {
+          if ($author ne $Question{$tourid}[$qnumber]{'Authors'})  
+          {
+             $eqauthor=0;
+          }
+        } else 
+        {
+            $author=$Question{$tourid}[$qnumber]{'Authors'};
+            $eqauthor=0 unless $author;
+        } 
+    }
+    $vid{$tourid}=$vid;
+    $qnumber{$tourid}=$qnumber;
+    $author{$tourid}=$eqauthor ? $author : '';
+  }
+
+
+  $vid='';
+  my $eqvid=1;
+  my $eqauthor=1;
+  foreach (@tours)
+  {
+     $vid||=$vid{$_};
+     if ($vid{$_} ne $vid)
+     {
+        $eqvid=0;
+     }
+     $author||=$author{$_};
+     if (!$author{$_} || ($author{$_} ne $author))
+     {
+        $eqauthor=0;
+     }
+  }
+  
+  print OUT "Вид:\n$vid\n\n" if $eqvid;
+  print OUT "Автор:\n$author\n\n" if $eqauthor;
+
+  foreach my $tour(@tours)
+  {
+     print OUT "Тур:\n$tourtitle{$tour}\n\n";
+     print OUT "Вид:\n$vid{$tour}\n\n" if  !$eqvid;
+     print OUT "Копирайт:\n$copyright{$tour}\n\n" if $copyright{$tour} && ($copyright{$tour} ne $Copyright);
+     print OUT "Редактор:\n$editor{$tour}\n\n" if $editor{$tour} && ($editor{$tour} ne $Editors);
+     $tourauthor=0;
+     if (!$eqauthor && $author{$tour})
+     { 
+       print OUT "Автор:\n$author{$tour}\n\n";
+       $tourauthor=1;
+     }
+     foreach my $q(1..$qnumber{$tour})
+     {
+        print OUT "Вопрос $q:\n".$Question{$tour}[$q]{'Question'}."\n\n";
+	print OUT  "Ответ:\n".$Question{$tour}[$q]{'Answer'}."\n\n";
+	print OUT  "Автор:\n".$Question{$tour}[$q]{'Authors'}."\n\n" 
+               if !$tourauthor && !$eqauthor && $Question{$tour}[$q]{'Authors'};
+	print OUT  "Комментарий:\n".$Question{$tour}[$q]{'Comments'}."\n\n" 
+               if $Question{$tour}[$q]{'Comments'};
+	print OUT "Источник:\n".$Question{$tour}[$q]{'Sources'}."\n\n" 
+               if $Question{$tour}[$q]{'Sources'};
+	print OUT "Рейтинг:\n".$Question{$tour}[$q]{'Rating'}."\n\n" 
+               if $Question{$tour}[$q]{'Rating'};
+
+     }
+  }
+
+  close OUT;
+
+
+
+}
+
+
 MAIN:
 {
 	setlocale(LC_CTYPE,'russian');
 	my($i, $tour);
 	my($text) = (param('text')) ? 1 : 0;
+
 	my($dbh) = DBI->connect("DBI:mysql:chgk", "piataev", "")
 		or do {
 			print h1("Временные проблемы") . "База данных временно не
@@ -918,6 +1521,7 @@ MAIN:
 		print &Include_virtual("../dimrub/db/reklama.html");
 	}
 
+
 if ($^O =~ /win/i) {
 	$thislocale = "Russian_Russia.20866";
 } else {
@@ -932,19 +1536,31 @@ if ((uc 'а') ne 'А') {print "Koi8-r loca
 		print header('text/plain');
 	}
 
+        if (param('hideequal')) {
+	           my ($sth)=  $dbh -> prepare("select first, second FROM equalto");
+	           $sth -> execute;
+	           while ( my  ($first, $second)=$sth -> fetchrow)
+                  {
+                       $forbidden{$first}=1;
+                  }
+                  $sth->finish;
+        }
+
+
 	if (param('rand')) {
 		my ($type, $qnum) = ('', 12);
-		$type .= 'Б' if (param('brain'));
-		$type .= 'Ч' if (param('chgk'));
-		$qnum = param('qnum') if (param('qnum') =~ /^\d+$/);	
+		$type.=$TypeName{$_} foreach param('type');
+#		$type .= 'Б' if (param('brain'));
+#		$type .= 'Ч' if (param('chgk'));
+		$qnum = param('qnum') if (param('qnum') =~ /^\d+$/);
 		$qnum = 0 if (!$type);
-		if (param('email') && -x $SENDMAIL && 
-		open(F, "| $SENDMAIL -t -n")) {
-			my ($Email) = param('email');
+		my $Email;
+		if (($Email=param('email')) && -x $SENDMAIL &&
+		open(F, "| $SENDMAIL $Email")) {
 			my ($mime_type) = $text ? "plain" : "html";
 			print F <<EOT;
 To: $Email
-From: olegstemanov\@mail.ru
+From: olegstepanov\@mail.ru
 Subject: Sluchajnij Paket Voprosov "Chto? Gde? Kogda?"
 MIME-Version: 1.0
 Content-type: text/$mime_type; charset="koi8-r"
@@ -952,17 +1568,44 @@ Content-type: text/$mime_type; charset="
 EOT
 			print F &PrintRandom($dbh, $type, $qnum, $text);
 			close F;
-			print "Пакет случайно выбранных вопросов послан. Нажмите
+			print "Пакет случайно выбранных вопросов послан по адресу $Email. Нажмите
 			на <B>Reload</B> для получения еще одного пакета";
 		} else {
 			print &PrintRandom($dbh, $type, $qnum, $text);
 		}
-	} elsif (param('sstr')) {
-		&PrintSearch($dbh, param('sstr'), param('metod'));
-	} elsif (param('all')) {
+	}
+	  elsif (param('authors')){
+                print &PrintAuthors($dbh,param('authors'));
+        }
+          elsif (param('qofauthor')){
+                &PrintQOfAuthor($dbh,param('qofauthor'));
+        }
+          elsif (param('sstr')||param('was')) {
+		&PrintSearch($dbh, param('sstr'), param('metod'),param('was'));
+		$dbh->do("delete from lastqueries where
+                      (TO_DAYS(NOW()) - TO_DAYS(t) >= 2) OR
+		           (time_to_sec(now())-time_to_sec(t) >3600)")
+	} 
+	  elsif (param('qid')) {
+	      my $qid=param('qid');
+              my $query="SELECT Question, Answer from Questions where QuestionId=$qid";
+print $query if $printqueries;
+	      my $sth=$dbh->prepare($query);
+	      $sth->execute;
+	      my $sstr= join ' ',$sth->fetchrow;
+              $sth->finish;
+	      $searchin{'Question'}=1;
+	      $searchin{'Answer'}=1;
+      $sstr=~tr/ёЁ/еЕ/;
+$sstr=~s/[^йцукенгшщзхъфывапролджэячсмитьбюЙЦУКЕНГШЩЗХЪФЫВАПРОЛДЖЭЯЧСМИТЬБЮa-zA-Z0-9]/ /gi;
+#              print &PrintQuestion($dbh,$qid, 1, '!');
+ 	      &PrintSearch($dbh, $sstr, 'proxy');
+ 	}
+
+          elsif (param('all')) {
 		print &PrintAll($dbh, 0);
 	} elsif (param('from_year') && param('to_year')) {
-		print &PrintDates($dbh);	
+		print &PrintDates($dbh);
 	} elsif (param('comp')) {
 	    print header(
 			 -'Content-Type' => 'application/x-zip-compressed; name="db.zip"',
@@ -970,6 +1613,7 @@ EOT
 			 );
 	    $tour = (param('tour')) ? param('tour') : 0;
 	    my (@files) = &PrintArchive($dbh, $tour);
+	    WriteFile($dbh,$_) foreach @files;
 	    open F, "$ZIP -j - $SRCPATH/COPYRIGHT @files |";
 	    print (<F>);
 	    close F;
@@ -988,13 +1632,41 @@ EOT
 
 	} else {
 		$tour = (param('tour')) ? param('tour') : 0;
+		my $sth;
 		if ($tour !~ /^[0-9]*$/) {
-			my ($sth) = $dbh->prepare("SELECT Id FROM Tournaments
-			WHERE FileName = '$tour.txt'");
-			$sth->execute;
-			$tour = ($sth->fetchrow)[0];
+		    if ($tour=~/\./)
+		    {
+		        my ($fname,$n)= split /\./ , $tour;
+
+	                $sth = $dbh->prepare(
+                       "SELECT t2.Id FROM Tournaments as t1, 
+                        Tournaments as t2 
+			WHERE t1.FileName = '$fname.txt'
+                        AND t1.Id=t2.ParentId AND t2.Number=$n");
+		    }	
+		    else 
+		        {
+                          $sth = $dbh->prepare("SELECT Id FROM Tournaments
+			             WHERE FileName = '$tour.txt'");
+			}
+		    $sth->execute;
+	            $tour = ($sth->fetchrow)[0];
+                    $sth->finish;
 		}
-		print &PrintTournament($dbh, $tour, param('answer'));
+		my $QuestionNumber=0;
+		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, $qnum, 1);
+#                                        $dbh, $Id, $answer, $qnum, $title, $text
+		} else  {
+  		   print &PrintTournament($dbh, $tour, param('answer'));
+  		}
 	}
 	if (!$text) {
 		print &Include_virtual("../dimrub/db/footer.html");