--- db/prgsrc/db.cgi 2001/10/22 20:12:29 1.25 +++ db/prgsrc/db.cgi 2010/09/24 09:05:48 1.161 @@ -1,54 +1,196 @@ -#!/usr/local/bin/perl -w +#!/usr/bin/perl -w use DBI; use CGI ':all'; -use Text::Query; -use strict; +#use strict; +use Encode; +my @softfields=("От Олега Степанова"); use Time::Local; +use Data::Dumper "Dumper"; +use URI::Escape; +my $proxyredirect=1; use POSIX qw(locale_h); use locale; -open STDERR, ">errors"; +use vars qw($opt_z); +use Getopt::Std; +#my ($dbuser,$dbname,$dbpass,$dbhost); +eval {require "dbdefs.pl";} ; +my $url=url||''; +my @used_stop=(); +my $showNearQuestions=0; +$dbuser||="piataev"; +$dbname||="chgk"; +$dbpass||=""; +$dbhost||="localhost"; +getopts('z'); +$opt_z||=param("makehtml"); +my $timestamp="_timestamp.tmp"; +my $usehash=0; +my $paramtour; +my $withanswers=param('answer')||param('answers'); +open STDERR, ">/var/tmp/errors1"; +my $newsurl='http://news.chgk.info/'; +my $reklama="../dimrub/db/reklama.html"; +my $footer="../dimrub/db/footer.html"; +$footer="../../chgk/footer.html" if $url=~/zaba/; +$reklama="../../chgk/reklama.html" if $url=~/zaba/; +my $datefooter="../dimrub/db/date"; +$datefooter="../../chgk/date" if $url=~/zaba/; + +my $fname; +$reklama="../reklama.html" if $opt_z; +$footer="../footer.html" if $opt_z; +$datefooter="../date" if $opt_z; +my $HTMLDIR="/znatoki/dimrub/db/baza/"; +$HTMLDIR="/files/"; +my $realHTMLDIR; +if ($^O =~ /win/i) { + $realHTMLDIR="/html/znatoki/baza/"; +} else +{ + $realHTMLDIR="/home/znatoki/chgk-db/public_html/dimrub/db/files/"; +} + + +my $usehtml=$opt_z||0; +$usehtml=1; +$usehtml=0 if $url=~/zaba/ || $url=~/localhost/; + +my $usewas=0; +my $cashednumber=500; +my $outputnumber=10; +my ($proxyptext,$proxysstr); my $printqueries=0; -my %fieldname= (0,'Question', 1, 'Answer', 2, 'Comments', 3, 'Authors', 4, 'Sources'); +my $qs=query_string; +my $globaloutput; +my %forbidden=(); +my $debug=0; #added by R7 +my $metod=param('metod')||''; +my $outputkvo=param('kvo') ||$outputnumber; +$outputkvo=100 if $outputkvo>100; + +if (param('debug')) {$debug=1; $printqueries=1} +*STDERR=*STDOUT if $debug; +if ($url!~ /\/\/db\// && $url !~ /db\.chgk\.info/ && $url !~ /localhost/ && $url !~ /bilbo/ && $url !~ /zaba/ && $url !~ /question\.chgk\.info/ ) { + my $u="http://db.chgk.info/cgi-bin/db.cgi?$qs"; + Redirect ($u); + exit; +} + +if ($proxyredirect && $metod=~/proxy/ && $url !~ /localhost/ && $url !~ /bilbo/ && $url !~ /zaba/) { + my $u="http://chgk.zaba.ru/cgi-bin/db.cgi?$qs"; + Redirect ($u); + exit; +} + +#if (!param('sstr') && param('all')) { +# my $destination='http://db.chgk.info/all.html'; +# Redirect($destination); +# exit; +#} +my $thislocale; +if ($^O =~ /win/i) { + $thislocale = "Russian_Russia.20866"; +} else { + $thislocale = "ru_RU.KOI8-R"; +} +POSIX::setlocale( &POSIX::LC_ALL, $thislocale ); + +if ((uc 'а') ne 'А') {print STDERR "Koi8-r locale not installed!\n"}; + +my %fieldname= (0,'Question', 1, 'Answer', 2, 'PassCriteria', 3, 'Comments', 4, 'Authors', 5, 'Sources'); +my %rusfieldname=('Question','Вопрос', 'Answer', 'Ответ', 'PassCriteria','Зачёт', + 'Comments', 'Комментарии', 'Authors', 'Автор', + 'Sources', 'Источник','old','Старый','rus','Новый', + 'chgk', 'ЧГК', 'brain', 'Брейн-ринг','game', 'Своя игра', + 'ehruditka', 'Эрудитка', 'beskrylka', 'Бескрылка', 'igp', 'Интернет' +); 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'=>'Я', 'igp'=>'И', + 'chgk'=>'Ч', 'brain'=>'Б', 'beskrylka'=>'Л','ehruditka'=>'Э'); -$searchin{'question'}=param('Question'); -$searchin{'answer'}=param('Answer'); -$searchin{'comment'}=param('Comment'); -$searchin{'authors'}=param('Authors'); -$searchin{'sources'}=param('Sources'); -$printqueries||=param('debug'); +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'; -my ($PWD) = `pwd`; -chomp $PWD; -my ($SRCPATH) = "$PWD/../dimrub/src"; -my ($ZIP) = "/home/piataev/bin/zip"; +my ($PWD) = `pwd` if $^O!~/win/i; +chomp $PWD if $PWD; +my ($SRCPATH) = "/home/db-chgk/public_html/dimrub/src"; +my ($ZIP) = "/usr/bin/zip"; my $DUMPFILE = "/tmp/chgkdump"; my ($SENDMAIL) = "/usr/sbin/sendmail"; +my ($TMPDIR) = "/var/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 { my ($a) = @_; my ($year, $month, $day) = split('-', $a); - + $month=1 if ($month<=0); + $day=1 if ($day<=0); return (time - timelocal(0, 0, 0, $day, $month -1, $year) < $TMSECS); } # Reads one question from the DB. Gets DB handler and Question ID. + +sub Redirect { +my ($destination) = @_; +print header.< +EndOfHTML +; +=head + +print < +Redirection + +

Redirection

+

It appears that your browser cannot handle redirections +automatically. You can proceed to the randomly-selected page +by clicking here.

+ + +EndOfHTML +; +=cut +} + + + + sub GetTournament { my ($dbh, $Id) = @_; my (%Tournament, $field, @arr); @@ -63,10 +205,58 @@ sub GetTournament { foreach $name (@{$sth->{NAME}}) { $Tournament{$name} = $arr[$i++]; } - + $sth->finish; return %Tournament; } +sub fetchquestion { + my ($sth,$q,$WithTour)=@_; + if ($WithTour) { + ($$q{'QuestionId'}, $$q{'Question'},$$q{'Answer'},$$q{'PassCriteria'},$$q{'Comments'},$$q{'Authors'},$$q{'Sources'}, + $$q{'Number'}, + $$q{'Title'}, $$q{'TourTitle'}, $$q{'FileName'},$$q{'PlayedAt'},$$q{'TourNumber'},$$q{'PlayedAt2'}) = + $sth->fetchrow; + } else { + ($$q{'QuestionId'}, $$q{'Question'},$$q{'Answer'},$$q{'PassCriteria'},$$q{'Comments'},$$q{'Authors'},$$q{'Sources'}, + $$q{'Number'})= + $sth->fetchrow; + } +} + + + + +sub SelectQuestions { + my ($dbh,$q,$WithTour) = @_; + my %q=(); +# $_ = "QuestionId=$_" foreach @$q; +# my $where=join " OR ",@$q; + my $where=join ',',@$q; + $where &&= "QuestionId IN (".(join ',',$where).")"; + $where||=0; + $where="($where) AND Questions.ParentId=t1.Id AND t1.ParentId=t2.Id" + if $WithTour; + + my $query; + if ($WithTour) { + $query="SELECT QuestionId, Questions.Question, Answer, PassCriteria, Comments, Authors, Sources, + Questions.Number + , t2.Title, t1.Title, t2.FileName, t2.PlayedAt,t1.Number,t2.PlayedAt2 + from Questions,Tournaments as t1, Tournaments as t2 + WHERE $where"; + } else { + $query="SELECT QuestionId, Questions.Question, Answer, PassCriteria, Comments, Authors, Sources, + Questions.Number from Questions + WHERE $where"; + } + + my $sth; + $sth=$dbh->prepare($query); + $sth->execute; + return $sth; +} + + # Reads one question from the DB. Gets DB handler and Question ID. sub GetQuestion { my ($dbh, $QuestionId) = @_; @@ -84,16 +274,44 @@ sub GetQuestion { $Question{$name} = $arr[$i++]; } + $sth->finish; return %Question; } +sub tourhref { + my ($t,$a,$gr)=@_; + my $res; + if ($usehtml) { + $res=$t; + $res=~s/\-q$//; + $res=~s/\-a$//; + $res.=$a?"-a":"-q" unless $gr; + $res.=".html"; + $res=~s/(\#\d+)(.*)$/$2$1/; + my $t=$res; + $t=~s/\#.*$//; +# $res=~s/\.1// unless $gr ||$res=~/\.\d+$/;#-e "$realHTMLDIR$t"; + $t=$res; + $t=~s/\#.*$//; +# $res=~s/\.html/-q\.html/ unless -e "$realHTMLDIR$t"; + $res="$HTMLDIR$res" unless $opt_z; + return $res; + } else { + $res=$url; + $res.=$a?"?answers=1&":"?"; + $res.="tour=$t"; + + return $res; + } + +} + # Gets numbers of all the questions from the given tour. 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 order by Number"); $sth->execute; @@ -101,6 +319,7 @@ sub GetTourQuestions { push @Questions, $arr[0]; } + $sth->finish; return @Questions; } @@ -117,10 +336,161 @@ sub GetTours { while (@arr = $sth->fetchrow) { push @Tours, $arr[0]; } - + $sth->finish; return @Tours; } +sub count +{ + my ($dbh,$word)=@_; + $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; + $sth->finish; + $a[0]||0; +} + + +sub printform +{ + + my $qnumber=(" "x10)."Выводить по + "; +#textfield(-name=>'kvo', +# -default=>6, +# -size=>3, +# -maxlength=>5)." вопросов"; + my $sstr=param('sstr'); + my @df=keys %searchin; + my %checked; + $checked{lc $_}="" foreach ('Question','Answer','PassCriteria','Comments','Authors','Sources','old','rus', + 'chgk','brain','igp','game','ehruditka','beskrylka'); + @df=('Question', 'Answer') unless @df; + $checked{lc $_}="checked" foreach @df; + my $fields=checkbox_group('searchin',['Question','Answer','PassCriteria','Comments','Authors','Sources'], [@df], + 'false',\%rusfieldname); + @df=param('type'); + @df=('chgk','brain','igp','game','ehruditka','beskrylka') unless @df; + $checked{lc $_}="checked" foreach @df; + my $all=param('all') && param('all') eq 'yes'; + + $checked{'all'}=$all?"checked":""; + $checked{'any'}=$all?"":"checked"; + $checked{lc param('metod')}="checked"; + $checked{'rus'}=1 unless $checked{'rus'} || $checked{'old'}; + +################################################# +return +< +

Поиск в базе вопросов

+ + + $qnumber +

+ + + + + + + + + + + + + +
Вариант поиска: + + Простой (старый) + + "Что? Где? Когда?" + + "Брейн-Ринг" + + "Интернет" +
+ "Своя игра" + + "Эрудитка" + + "Бескрылка" +
Расширенный (с учетом грамматики, в вопросах всех типов) +
Искать: + +Все слова + +Любое слово +
Поля для поиска: + +Вопрос + +Ответ
+		 +Зачёт
+		 +Комментарии
+		 +Автор
+		 +Источник
+
+ + + +EOT +.endform +.hr + +} + +sub proxy +{ + my ($dbh,$ptext,$allnf)=@_; + my $sstr=makeproxysstr($dbh,$ptext,$allnf); + return russearch($dbh,$sstr,0,$allnf); +} + +sub makeproxysstr { + my ($dbh,$ptext)=@_; + my $text=$$ptext; + POSIX::setlocale( &POSIX::LC_ALL, $thislocale ); + $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 && length $_>2; + } + + $good{$words[$_]}=0 foreach 16..$#words; + + $sstr.=" $_" foreach grep {$good{$_}} @list; + $$ptext=$sstr; + return $sstr; +} + + sub russearch { my ($dbh, $sstr, $all,$allnf)=@_; my (@qw,@w,@tasks,$qw,@arr,$nf,$sth,@nf,$w,$where,$e,@where,%good,$i,%where,$from); @@ -137,19 +507,33 @@ sub russearch { my %relevance; my @blob; my %count; - + my %stop_word; + POSIX::setlocale( &POSIX::LC_ALL, $thislocale ); $sstr=~tr/йцукенгшщзхъфывапролджэячсмитьбю/ЙЦУКЕНГШЩЗХЪФЫВАПРОЛДЖЭЯЧСМИТЬБЮ/; - @qw=@w =split (' ', uc $sstr); +# @qw=@w =split (' ', uc $sstr); + my $ts=uc $sstr; + @qw=@w= $ts=~m/(?:(?:${RLrl})+)|(?:[A-Za-z0-9]+)/gom; + $query="select nf.word from nf where number>=50000"; + $sth=$dbh->prepare($query); + $sth->execute(); + %stop_word=(); + while (@arr = $sth->fetchrow) + { + $stop_word{$arr[0]}=1; + } + $sth->finish; + #----------- foreach $i (0..$#w) # заполняем массив @nf начальных форм # $nf[$i] -- ссылка на массив возможных # начальных форм словоформы $i - { + { + (push @used_stop, uc $w[$i]),next if $stop_word{uc $w[$i]}; $qw= $dbh->quote (uc $w[$i]); + $query=" select distinct w2 from nests where w1=$qw"; -print "$query",br if $printqueries; $sth=$dbh -> prepare($query); $sth -> execute; @{$nf[$i]}=(); @@ -157,9 +541,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) #есть неопознанные словоформы @@ -175,6 +561,7 @@ print "$query",br if $printqueries; } return () if ($all && @verybad); + my $kvo=0; push @$allnf, @{$_} foreach @nf; @@ -186,30 +573,10 @@ print "$query",br if $printqueries; - $_= " word2question.word=".$_. ' ' foreach @arr; + $_= " 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; - - - - - $query="select questions from word2question where". (join ' OR ', @arr); -print "$query\n",br if $printqueries; +# @arr=(0) unless @arr; + $query="select questions from word2question where (". (join ' OR ', @arr).") "; $sth=$dbh -> prepare($query); $sth->execute; @@ -219,8 +586,8 @@ 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); $sth->execute; @@ -228,8 +595,7 @@ print "$query\n",br if $printqueries; { $frequence[$i]+=$arr[0]; } - - + $sth->finish; if (@blob < 4) @@ -249,11 +615,11 @@ print "$query\n",br if $printqueries; { ($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 список @@ -269,17 +635,20 @@ print "$query\n",br if $printqueries; } } #foreach $i -print "keys tasksof", keys %tasksof if $printqueries; #Ищем пересечение или объединение списков вопросов (значений %tasksof) - foreach $sf (keys %tasksof) + foreach $sf (keys %tasksof) { - $count{$_}++ foreach keys %{$tasksof{$sf}}; + foreach (keys %{$tasksof{$sf}}) + { + next if $forbidden{$_}; + $count{$_}++ + } + } @tasks= ($all ? (grep {$count{$_}==$kvo} keys %count) : keys %count) ; -#print "\n\$#tasks=",$#tasks,br; ############ Сортировка найденных вопросов foreach (keys %wordsof) @@ -289,14 +658,9 @@ foreach (keys %wordsof) @tasks=sort {$relevance{$b}<=>$relevance{$a}} @tasks; - ############ -print "tasks=@tasks" if $printqueries;; -#print "$_ $relevance{$_} | " foreach @tasks; -#print br; -print "allnf=@$allnf",br if $printqueries; return @tasks; } @@ -347,88 +711,108 @@ 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); if ($metod eq 'rus') { - my @tasks=russearch($dbh,$sstr,$all,$allnf); + my @tasks; + @tasks = russearch($dbh,$sstr,$all,$allnf); + + return @tasks } + elsif ($metod eq 'proxy') + { + my @task=proxy($dbh,$s,$allnf); + 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 PassCriteria Sources Authors Comments/) { if (param($_)) { - push @fields, $_; + push @fields, $_; } - } - + } - @fields=(qw/Question Answer Sources Authors Comments/) unless scalar @fields; + @fields=(qw/Question Answer PassCriteria 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; $sth = $dbh->prepare($query); } else -###### +###### { - - foreach (qw/Question Answer Sources Authors Comments/) { - if (param($_)) { + foreach (param('searchin')) { +# if (param($_)) { push @fields, "IFNULL($_, '')"; - } +# } } - @sar = split " ", $sstr; for $i (0 .. $#sar) { $sar[$i] = $dbh->quote("%${sar[$i]}%"); } - + $_.=' ' foreach (@fields); # Это чтобы последнее слово поля + # не сливалось с первым словом + # следующего поля, R7 my($f) = "CONCAT(" . join(',', @fields) . ")"; if (param('all') eq 'yes') { $sstr = join " AND $f LIKE ", @sar; } else { $sstr = join " OR $f LIKE ", @sar; } + + my $query; + $query="SELECT QuestionId FROM Questions + WHERE ($f LIKE $sstr) AND (".&makewhere.") ORDER BY QuestionId"; -my $query="SELECT QuestionId FROM Questions - WHERE $f LIKE $sstr ORDER BY QuestionId"; -print $query if $printqueries; - $sth = $dbh->prepare($query) + $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; + return @Questions; } +sub makewhere { + my @type=param('type'); + my $type=''; + + $type .= ($_=$TypeName{$_}) foreach @type; + my $where=' 0 '; + foreach (@type) { + $where.= " OR (Type ='$_') OR (Type ='$_Д') OR (Type ='Д$_') "; + } + $where.= "OR (Type='ЧБ')" if ($type=~/Ч|Б/); + return $where; +} + # 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)) { @@ -438,22 +822,171 @@ sub NoCase { } } +sub PrintList { + my ($dbh,$Questions,$shablon,$was)=@_; + my $total_found = $totalfound||$#$Questions+1; + my $Output; + my $first=param('first') ||1; + $first=$first-($first-1)%$outputkvo; + my $fkvo=param('fkvo')||$total_found; + my $last=$first+$outputkvo-1; + $last=$fkvo if $fkvo<$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/; + if ($usewas) { + $qs=~s/\&was=[^\&]+//; + $qs.="&was=$was" if $was; + $qs.="&fkvo=$fkvo" if $was; + } + if ($first>$outputkvo*3+1) + { + $nav.= + (" "x4). + a({href=>$url."?".$qs."\&first=1"},"<<").(" "x4). + a({href=>($url."?".$qs."\&first=".($first-$outputkvo))},"<").(" "x4) + } + else {$nav.=' 'x15;} + + my ($fprint,$lprint); + my $llprint=$fkvo- ($fkvo)%$outputkvo+1; # + if ($fkvo<=$outputkvo*7) + { $fprint=1; + $lprint=$llprint; + } + elsif ($first>$outputkvo*3 && $fkvo-$first>$outputkvo*3) + { + $fprint=$first-$outputkvo*3; + $lprint=$first+$outputkvo*3; + } + elsif ($first<=$outputkvo*3) + { + $fprint=1; $lprint=6*$outputkvo+1; + } + else + { + $lprint=$llprint; + $fprint=$lprint-$outputkvo*6 + } + +# my $fprint=($first>$outputkvo*3) ? $first-$outputkvo*3 : 1; +# my $lprint=$#$Questions+1-$fprint>$outputkvo*7 ? $outputkvo*7 :$#$Questions+1; +# if ($lprint-$fprint<$outputkvo*6 && $fprint>1) +# { +# $fprint=$lprint-$outputkvo*6; +# $fprint=1 if ($fprint<=0) +# } + + + + for($f=$fprint; $f<=$lprint; $f+=$outputkvo) + { +# next if $first-$f>$outputkvo*3; + $l=$f+$outputkvo-1; + $l=$fkvo if $l>$fkvo+1; + if ($f==$first) {$nav.="[$f-$l] ";} + else { + $nav.= "[".a({href=>($url."?".$qs."\&first=$f")},"$f-$l")."] ";} + } + if ($lprint+$outputkvo<$fkvo) + { + $nav.= + (" "x4). + a({href=>($url."?".$qs."\&first=".($first+$outputkvo))},">").(" "x4). + a({href=>$url."?".$qs."\&first=$llprint"},">>").(" "x4) + } + $Output.= "$nav".br."\n"; + my @q; + if ($totalfound) { + @q = @$Questions; + } else { + @q=@$Questions[$first-1..$last-1]; + } + my %q=(); + my $sth=SelectQuestions($dbh,\@q,1); + my $qq; + my @Q; + for (0..$#q) { + %{$Q[$_]}=(); + fetchquestion($sth,$Q[$_],1); + $q{$Q[$_]{'QuestionId'}}=$Q[$_]; + } + + for my $i(0..$#q) { + my $q=$q{$q[$i]}; + my $output; + $output = &PrintQuestion($dbh, $q, 1, 0, 1,$text,1 ); +# if (param('metod') && (param('metod') eq 'rus' || param('metod') eq 'proxy')) + { + $output=~s/\b($shablon)\b/\$1\<\/strong\>/gi; + $output=~s/($shablon)/\$1\<\/strong\>/gi; + $output=~s/(href="[^"]*?)(?:<.*?>)+([^"]*?)(?:<\/.*?>)+([^"]*?")/!1 $1$2$3 2!/g;#!!!! + } + + $Output.= $output; + } + $sth->finish; + + $Output.= "$nav".br."\n"; + return $Output; +} + sub PrintSearch { - my ($dbh, $sstr, $metod) = @_; + my $Output=''; + my ($dbh, $sstr, $metod,$was) = @_; + my $t=time; + $Output.= printform; my @allnf; - my (@Questions) = &Search($dbh, $sstr,$metod,$all,\@allnf); - my ($output, $i, $suffix, $hits) = ('', 0, '', $#Questions + 1); + my @Questions; + $was=0 if $metod eq 'proxy'; + if ($usewas && $was && ($metod ne 'proxy')) + { + 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; + } + if (!$was || ($metod eq 'proxy') || (param('first')+$outputkvo>$cashednumber)) + { + @Questions=&Search($dbh, \$sstr,$metod,$all,\@allnf); + $cashednumber=$#Questions if $cashednumber>$#Questions; + my $tmp=$dbh->quote(pack("L*",@Questions[0..$cashednumber])); + my $qsstr=$dbh->quote($sstr); + my $nf=$dbh->quote(pack("L*", @allnf)); + my $ss=200; + if ($usewas) { + do + { + $was=int rand(32000); + } + while (--$ss && (!$dbh->do ("insert into lastqueries (id,sstr,questions,allnf) + values ($was, $qsstr,$tmp,$nf)"))); + $Output.= "Something is wrong...".br."\n" unless $ss; + } + } + - my $shablon; + $Output.= p. "Время поиска: " . (time-$t) ." сек.".p; + $_="\"$_\"" foreach @used_stop; + $Output.= p. (join ', ',@used_stop) ." ignored".p if @used_stop; + my ($output, $i, $suffix, $hits) = ('', 0, '', $#Questions + 1); + my $shablon; + $metod='rus' if $metod eq 'proxy'; if ($metod eq 'rus') { my $where='0'; $where.= " or w2=$_ " foreach @allnf; my $query="select w1 from nests where $where"; my $sth=$dbh->prepare($query); -print "$query" if $printqueries; $sth->execute; my @shablon; @@ -461,65 +994,91 @@ 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; - } + } + $hits=param("fkvo")||$hits; if ($hits =~ /1.$/ || $hits =~ /[5-90]$/) { $suffix = 'й'; } elsif ($hits =~ /1$/) { $suffix = 'е'; } else { - $suffix = 'я'; + $suffix = 'я'; } - - print p({align=>"center"}, "Результаты поиска на " . strong($sstr) + + $Output.= p({align=>"center"}, "Результаты поиска на " . strong($sstr) . " : $hits попадани$suffix."); if (param('word')) { $sstr = '[ \.\,:;]' . $sstr . '[ \.\,:\;]'; } - $sstr =~ s/(.)/&NoCase($1)/ge; +# $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/\$1\<\/strong\>/gi; - } else { - foreach (@sar) { - $output =~ s/$_/$&<\/strong>/gs; - }} - print $output; + my @sar; + if ($metod ne 'rus') + { + my $ss=$sstr; + (@sar) = split(' ', $ss); + s/(\W)/\\$1/g foreach (@sar); + $shablon=join "|",@sar; } + $Output.=PrintList($dbh,\@Questions,$shablon,$was); + return $Output; } sub PrintRandom { my ($dbh, $type, $num, $text) = @_; + my $razd=param('razd'); + 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 { $output .= h2({align=>"center"}, "$num случайных вопросов."); } - + my $sth=SelectQuestions($dbh,\@Questions,0); for ($i = 0; $i <= $#Questions; $i++) { - # Passing DB handler, question ID, print answer, question - # number, print title, print text/html - $output .= - &PrintQuestion($dbh, $Questions[$i], 1, $i + 1, 0, $text); + fetchquestion($sth,\%q,0); + $output .= + &PrintQuestion($dbh, \%q, $answer, $i + 1, 0, $text,1); + push @answers, $q{'Answer'}; } - return $output; + $sth->finish; + unless ($answer ) + { + $output.=$text?"\n".('-'x 20)."\nОтветы\n~~~~~~\n\n":h2('Ответы'); + $sth=SelectQuestions($dbh,\@Questions,0); + for ($i = 0; $i <= $#Questions; $i++) { +# fetchquestion($sth,\%q,0); +# $output .= +# &PrintQuestion($dbh, \%q, -1, $i + 1, 0, $text,1); + $output.=$text?("Ответ ". ($i+1).": $answers[$i]\n\n"): + b("Ответ ". ($i+1).": "). $answers[$i].p; + } + } + + return $output; +} + +sub PrintEditor { + my $t=shift; #ссылка на Хэш с полями + my $ed=$$t{'Editors'}||''; + my $edname=($ed=~/\,/ ) ? "Редакторы" : "Редактор" ; + return $ed? h4({align=>"center"},"$edname: $ed" ): ''; } sub PrintTournament { @@ -529,32 +1088,46 @@ sub PrintTournament { my ($output) = ''; %Tournament = &GetTournament($dbh, $Id) if ($Id); - - my ($URL) = $Tournament{'URL'}; + + my ($URL) = $Tournament{'URL'}||''; + $URL=~s/http:\/znatoki\/boris\/reports\//$newsurl/ if $url=~/kulichki/ || $url=~/db.chgk.info/; + $URL=~s/\/znatoki\/boris\/reports\//$newsurl/ if url=~/kulichki/ || $url=~/db.chgk.info/; my ($Info) = $Tournament{'Info'}; my ($Copyright) = $Tournament{'Copyright'}; - + my $fname=$Tournament{'FileName'}; @Tours = &GetTours($dbh, $Id); - + $list=''; + my $textid; + my $isGroup; if ($Id) { for ($Tournament{'Type'}) { /Г/ && do { - $output .= h2({align=>"center"}, + $output .= h2({align=>"center"}, "Группа: $Tournament{'Title'} ", - "$Tournament{'PlayedAt'}") . p . "\n"; + $Tournament{'PlayedAt'}||'') . + ($Tournament{'PlayedAt2'}?' – '. + $Tournament{'PlayedAt2'}:'') . + + p . "\n"; + $isGroup=1; last; }; /Ч/ && do { return &PrintTour($dbh, $Tours[0], $answer) if ($#Tours == 0); - + my $title="Пакет: $Tournament{'Title'}"; if ($Tournament{'PlayedAt'}) { $title .= " $Tournament{'PlayedAt'}"; } - $output .= h2({align=>"center"}, + if ($Tournament{'PlayedAt2'}) { + $title .= ' – '.$Tournament{'PlayedAt2'}; + } + + $output .= h2({align=>"center"}, "$title") . p . "\n"; + $output.=&PrintEditor(\%Tournament); last; }; /Т/ && do { @@ -562,13 +1135,25 @@ sub PrintTournament { }; } } else { - my ($qnum) = GetQNum($dbh); - $output .= h2("Банк Вопросов: $qnum вопросов") . p . "\n"; + my ($qnum) = GetQNum($dbh,0); + my ($qnum1) = GetQNum($dbh,1); + $output .= h2("База вопросов"). + h3("$qnum запис".&Suffix2($qnum). + " (уникальных $qnum1)"); + +# h4("". +# Tr(td("Из них:"), td("Вопросов ЧГК: ".countz($dbh,'Ч'))). +# Tr(td(" "), td("Вопросов для брейна: ".countz($dbh,'Б'))). +# Tr(td(" "), td("Вопросов для ЧГК и брейна: ".countz($dbh,'ЧБ'))). +# Tr(td(" "), td("Интернет-вопросов: ".countz($dbh,'И'))). +# Tr(td(" "), td("Бескрылок: ".countz($dbh,'Л'))). +# Tr(td(" "),td("Заданий для Своей Игры: ".countz($dbh,'Я'))). +# Tr(td(" "),td("Эрудиток: ".countz($dbh,'Э'))))."
" } - 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'}); @@ -581,7 +1166,8 @@ sub PrintTournament { } else { $qnum = ''; } - if ($Tournament{'Type'} =~ /Г/) { + if ($Tournament{'Type'} !~ /[ТЧ]/) { + $SingleTour=0; $imgsrc = "/icons/folder.gif"; $alt = "[*]"; } else { @@ -589,41 +1175,75 @@ sub PrintTournament { $alt = "[-]"; } - if ($SingleTour or $Tournament{'Type'} =~ /Т/) { + 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'}||"") . + ($Tournament{'PlayedAt2'}?' – '.$Tournament{'PlayedAt2'}:"") . + $qnum) . dl( dd("[" - . a({href=>url . "?tour=$Tournament{'Id'}&answer=0"}, + . a({href=>tourhref($textid,0)}, "вопросы") . "] [" - . a({href=>url . "?tour=$Tournament{'Id'}&answer=1"}, + . a({href=>tourhref($textid,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'}. " ". - $Tournament{'PlayedAt'}) . $qnum); + $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=>tourhref($textid,0,1)}, + $Tournament{'Title'}. " ". + ($Tournament{'PlayedAt'}||'')) . + ($Tournament{'PlayedAt2'}?' &ndash '. $Tournament{'PlayedAt2'}:''). $qnum); } } $output .= dl($list); if ($URL) { + if ($url=~/zaba\.ru/ && $URL=~/^\//){$URL="http://info.chgk.info$URL"} $output .= - p("Дополнительная информация об этом турнире - по адресу " . + p("Дополнительная информация об этом турнире - по адресу " . a({-'href'=>$URL}, $URL)); } - if ($Copyright) { $output .= p("Копирайт: " . $Copyright); } + + if ($Info) { $output .= p($Info); } + + + + $output.=p("XML"); + + if ($textid=$fname) + { + $textid=~s/\.txt//; + } + if (!$isGroup) { + $output .= center("[". + a({href=>"/v2/tour/$textid/print", target=>'_blank'}, 'версия для печати')."] [". + a({href=>"/v2/tour/$textid/fb2", target=>'_blank'}, 'fb2')."]".""); + } return $output; } @@ -636,12 +1256,41 @@ 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) = @_; - 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 @@ -653,58 +1302,85 @@ sub PrintTour { my (%Tour) = &GetTournament($dbh, $Id); my (@Tours) = &GetTours($dbh, $Tour{'ParentId'}); my (%Tournament) = &GetTournament($dbh, $Tour{'ParentId'}); + my %q; 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"}, - $Tournament{'PlayedAt'}, - "
", $Tour{"Title"} . + my ($suffix) = &Suffix($qnum); + + $output .= h2({align=>"center"}, $Tournament{"Title"}, + $Tournament{'PlayedAt'}||'', + $Tournament{'PlayedAt2'}?' – '.$Tournament{'PlayedAt2'}:'', + "
\n", $Tour{"Title"} . " ($qnum вопрос$suffix)\n") . p; + $output .=&PrintEditor(\%Tour); my (@Questions) = &GetTourQuestions($dbh, $Id); + my $sth=SelectQuestions($dbh,\@Questions,0); for ($q = 0; $q <= $#Questions; $q++) { - $output .= &PrintQuestion($dbh, $Questions[$q], $answer, 0); - } - + fetchquestion($sth,\%q,0); + $output .= &PrintQuestion($dbh, \%q, $answer, 0,0,$text,1); + } + $sth->finish; $output .= hr({-'align'=>'center', -'width'=>'80%'}); if ($Tournament{'URL'}) { - $output .= - p("Дополнительная информация об этом турнире - по адресу " . - a({-'href'=>$Tournament{'URL'}}, $Tournament{'URL'})); + $URL = $Tournament{'URL'}; + $URL=~s/http:\/znatoki\/boris\/reports\//$newsurl/ if $url=~/kulichki/ || $url=~/db.chgk.info/; + $URL=~s/\/znatoki\/boris\/reports\//$newsurl/ if url=~/kulichki/ || $url=~/db.chgk.info/; + + $output .= + p("Дополнительная информация об этом турнире - по адресу " . + a({-'href'=>$URL}, $URL)); } if ($Tournament{'Copyright'}) { $output .= p("Копирайт: " . $Tournament{'Copyright'}); } - if ($Tournament{'Info'}) { + if ($Tournament{'Info'} ) { $output .= p($Tournament{'Info'}); } - + if ($Tour{'Info'} && ($Tournament{'Info'} ne $Tour{'Info'})) { + $output .= "!!".p($Tour{'Info'}); + } + + $output.=p("XML"); + + my $n=$Tour{'Number'}; if ($answer == 0) { - $bottom .= - "[" . a({href=>url . "?tour=$Id&answer=1"}, "ответы") . "] " . br; + my $nn=".$n"; + $nn="" if ($n==1 && !&IsTour($dbh, $Tour{'ParentId'}, $n + 1)); + + $bottom .= + "[" . a({href=>tourhref("$fname$nn",1)}, + "ответы") . "] " } - if (&IsTour($dbh, $Id - 1)) { - $bottom .= - "[" . a({href=>url . "?tour=" . ($Id - 1) . "&answer=0"}, + $bottom .= "[".a({href=>"/v2/tour/$fname/print", target=>'_blank'}, 'версия для печати')."] [". + a({href=>"/v2/tour/$fname/fb2/", target=>'_blank'}, 'fb2')."]".br; + +# $bottom .= "[".a({href=>'/v2/print/'.$fname.'.'.$Tour{'Number'}, target=>'_blank'}, 'версия для печати')."]".br; + + if ($n>1) { + $bottom .= + "[" . a({href=>tourhref("$fname.".($n-1),0)}, "предыдущий тур") . "] "; - $bottom .= - "[" . a({href=>url . "?tour=" . ($Id - 1) . "&answer=1"}, - "предыдущий тур с ответами") . "] " . br; - } - if (&IsTour($dbh, $Id + 1)) { - $bottom .= - "[" . a({href=>url . "?tour=" . ($Id + 1) . "&answer=0"}, + $bottom .= + "[" . a({href=>tourhref("$fname.".($n-1),1)}, + "предыдущий тур с ответами") . "] " . br."\n"; + } + + if (&IsTour($dbh, $Tour{'ParentId'}, $n + 1)) { + $bottom .= + "[" . a({href=>tourhref("$fname.".($n+1),0)}, "следующий тур") . "] "; - $bottom .= - "[" . a({href=>url . "?tour=" . ($Id + 1) . "&answer=1"}, + $bottom .= + "[" . a({href=>tourhref("$fname.".($n+1),1)}, "следующий тур с ответами") . "] "; } @@ -714,53 +1390,185 @@ sub PrintTour { return $output; } + +sub escapeUrl { + my $uri = shift; + $uri=~s/<.*?>//g; + $uri =~ s/([Ю-Ъю-ъ]+)/URI::Escape::uri_escape_utf8(decode("koi8-r",$1))/eg; + return $uri; +} + sub PrintField { my ($header, $value, $text) = @_; if ($text) { - $value =~ s/<[\/\w]*>//sg; + $value =~ s/<[\/\w]*?>//sg; } else { - $value =~ s/^\s+/
    /mg; + if ($header=~/Комментар/) + { + $value=~s/^\s*$_[\.:]/p."\n".strong("$_").":\n"/me foreach @softfields; + } + + $value =~ s/^\s+/
\n    /mg; + $value =~ s/(\s+)-+(\s+)/$1–$2/mg; + $value =~ s/\s+\–/ \–/mg + if $value !~ /^\|/; $value =~ s/^\|([^\n]*)/

$1<\/pre>/mg;
+
+	    $value =~ s/(http:\/\/\S+[^\s\)\(\,\.\]])/a({href=>escapeUrl($1)},$1)/egm if $header !~ /^Авто/;#!!!
+
+	    $value =~ s/\.\.\.\]/!!!ZAKR!!!/g;
+	    $value =~ s/пропущено\]/!!!PROP!!!/g;
+	    $value =~ s/пропущены\]/!!!PROP2!!!/g;
+	    $value =~ s/\[Раздаточный материал:(.*?)\]\s*\n/
Раздаточный материал<\/div> $1<\/div>\n$2/sm;
+	    $value =~ s/<раздатка>(.*?)<\/раздатка>/
Раздаточный материал<\/div> $1<\/div>\n/sm;
+	    $value =~ s/!!!ZAKR!!!/\.\.\.\]/g;
+	    $value =~ s/!!!PROP!!!/пропущено\]/g;
+	    $value =~ s/!!!PROP2!!!/пропущены\]/g;
+
+
+#	    $value =~ s/(http:\/\/\S+[^\s\)\(\,\.])/make/eg if $header !~ /^Авто/;#!!!
+#	    $value =~ s/(http:\/\/\S+[^\s\)\(\,\.])/$1<\/a>/g if $header !~ /^Авто/;
+#	    $value =~ s/(http:\/\/(?:\w+.)+[\w\\\~]+(\?[^\s.]+)?)/$1<\/a>/g if $header !~ /^Авто/;
+#	    $value =~ s/(\s)"/$1“/mg;
+#	    $value =~ s/^"/“/mg;
+#	    $value =~ s/"/”/mg;
+	}
+
+	if ($value=~/^\s*()?\s*"50%"});
+	my $fname;
+	my (%Question);
+	if ($h) {
+	  %Question=%$Id;
+	} else {
+		%Question = &GetQuestion($dbh, $Id);
 		if ($title) {
 			my (%Tour) = GetTournament($dbh, $Question{'ParentId'});
 			my (%Tournament) = GetTournament($dbh, $Tour{'ParentId'});
+			$Question{'FileName'}=$Tournament{'FileName'};
+			$Question{'Title'}=$Tournament{'Title'};
+			$Question{'PlayedAt'}=$Tournament{'PlayedAt'};
+			$Question{'PlayedAt2'}=$Tournament{'PlayedAt2'};			
+			$Question{'TourNumber'}=$Tour{'Number'};
+			$Question{'TourTitle'}=$Tour{'Title'};
+		}
+
+        }
+		$qnum = $Question{'Number'}
+		if ($qnum == 0);
+	if (!$text) {
+		$output .= hr({width=>"50%"}) if $answer>=0;
+		if ($title) {
+			$fname=$Question{'FileName'};
+			$fname=~s/\.txt//;
 			$titles .=
 				dd(img({src=>"/icons/folder.open.gif"}) . " " .
-					 a({href=>url . "?tour=$Tournament{'Id'}"}, $Tournament{'Title'}, $Tournament{'PlayedAt'}));
+					 a({href=>tourhref($fname,0,1)}, 
+                               $Question{'Title'}, $Question{'PlayedAt'}||'',
+                               $Question{'PlayedAt2'}?' – '.$Question{'PlayedAt2'}:''));
 			$titles .=
 				dl(dd(img({src=>"/icons/folder.open.gif"}) . " " .
-					a({href=>url . "?tour=$Tour{'Id'}"}, $Tour{'Title'})));
+					a({href=>tourhref("$fname.$Question{'TourNumber'}#$qnum",1)}, 
+                          $Question{'TourTitle'})));
 		}
 		$output .= dl(strong($titles));
 	}
-	
-	$qnum = $Question{'Number'}
-		if ($qnum == 0);
 
-	$output .= 
-		&PrintField("Вопрос $qnum", $Question{'Question'}, $text);
 
-	if ($answer) {
-		$output .= 
+	$output.= "" unless $text;
+
+	if ($answer>=0) {$output .=
+		&PrintField("Вопрос $qnum", $Question{'Question'}, $text);}
+	else {$output .="$qnum. "}
+	if ($answer==1|| $answer==-1) {
+		$output .=
 			&PrintField("Ответ", $Question{'Answer'}, $text);
+		if ($Question{'PassCriteria'} ) {
+		  $output .=
+			&PrintField("Зачёт", $Question{'PassCriteria'}, $text);
+                }
+
+		if ($Question{'Authors'} ) {
+                      my $q=$Question{'Authors'};
+###АВТОРА!!
+# 		      my $sth=$dbh->prepare("select Authors.CharId,Name, Surname, Nicks from Authors, A2Q
+#                                  where Authors.Id=Author And Question=$Id");
+#                       $sth->execute;
+#                       my ($AuthorId,$Name, $Surname,$other,$Nicks);
+#                      if (!$text) {
+#                       while ((($AuthorId,$Name, $Surname,$Nicks)=$sth->fetchrow),$AuthorId)
+#                       {
+#                          my ($firstletter)=$Name=~m/^./g;
+#                          $Name=~s/\./\\\./g;
+#                          $Name=~s/ё/[её]/g;
+#                          $Surname=~s/ё/[её]/g;
+#                           my $sha="(?:$Name\\s+$Surname)|(?:$Surname\\s+$Name)|(?:$firstletter\\.\\s*$Surname)|(?:$Surname\\s+$firstletter\\.)|(?:$Surname)";
+#                           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;
+#                           unless ($1) 
+#                             {   
+#                                 $q=~s/$Name/a({href=>url."?qofauthor=$AuthorId"},$1)/ei;
+#                             }
+#                       }
+#                      }
+			$output .= &PrintField("Автор(ы)", $q, $text);
+
+		}
 
+		if ($Question{'Sources'}) {
+			$output .= &PrintField("Источник(и)", $Question{'Sources'}, $text);
+		}
+
+		if ($Question{'Comments'}) {
+			$output .= &PrintField("Комментарии", $Question{'Comments'}, $text);
+		}
+	}
+	elsif ($answer==2) {
+	  my $text=$Question{'Answer'};
+	  $text=~s/\n/

+	  "
+
 	}
+	$output=~s/\(pic: ([^\)]*)\)/
<\/p>/g unless $text;
+	$output=~s/\(aud: ([^\)]*)\)//g unless $text;
+
+	$output=~s/⌡/\ï/g;
+	$output=~s/⌠/\Ï/g;
+
+	$paramtour||=param("tour");
+	$fname=$fname.".$Question{'TourNumber'}" if $fname && $Question{'TourNumber'};
+$fname||=param('tour');
+	my $qid=$fname ? ($fname.".$Question{'Number'}" ): '';
+
+	$output.=br."\n".a({href=> "/search/"."?metod=proxy&
+qid=$qid"}, 'Близкие вопросы').p
+             if $answer>0 && !$text && $qid && $showNearQuestions;
 	return $output;
 }
 
 # 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;
- 	return ($sth->fetchrow)[0];
+	my $tmp=($sth->fetchrow)[0];
+        $sth->finish;
+	($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) = @_;
 	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
@@ -794,37 +1636,53 @@ 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));
+	my $w1=$r<5000? "QuestionId<50000 ":"QuestionId>=50000";
+	$w1=1 if $url=~/zaba/;
+	$w1=1 if $type!~/Ч/;
+	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();
+   $q="select QuestionId from Questions where ($w1) AND ($where) order by rand() limit $num";
+
+
+   $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;
 }
 
 sub Include_virtual {
 	my ($fn, $output) = (@_, '');
-
+	return "\n\n" if ($opt_z);
 	open F , $fn
-		or return; #die "Can't open the file $fn: $!\n";
-	
+		or return ""; #die "Can't open the file $fn: $!\n";
+
 	while () {
 		if (//&Include_virtual($1)/e;
+			s//&Include_virtual($1)/e;
 		}
 		if (//`$1`/e;
 		}
 		$output .= $_;
 	}
-	return $output;
+	return $output||"";
 }
 
 sub PrintArchive {
@@ -833,36 +1691,53 @@ 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 $SingleTour = $#Tours == 0;
+
+	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"},
-      $Tournament{'Title'}) ." " . $Tournament{'PlayedAt'} . " $New");
+      " " . a({href=>tourhref($textid,0,!$SingleTour)},
+      $Tournament{'Title'}) ." " . ($Tournament{'PlayedAt'}||'') . 
+      ($Tournament{'PlayedAt2'}?' – '.$Tournament{'PlayedAt2'}:'') . 
+      " $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);
 	}
@@ -871,7 +1746,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);
@@ -890,63 +1765,500 @@ sub PrintDates {
 		next
 			if (!$array[0]);
 		%Tournament = &GetTournament($dbh, $array[0]);
+	         my $textid;
+		 if ($textid=$Tournament{'FileName'})
+		 {
+		   $textid=~s/\.txt//;
+		 }
+		 elsif ($textid=$Tournament{'Number'})
+		 {
+		      $fname=~s/\.txt//;
+		      $textid="$fname.$textid";
+		 }
+	         else {$textid=$Tournament{'Id'}};
       $list .= dd(img({src=>"/icons/folder.gif", alt=>"[*]"}) .
-      " " . a({href=>url . "?tour=$Tournament{'Id'}&answer=0"},
-      $Tournament{'Title'}, $Tournament{'PlayedAt'}));
+      " " . a({href=>tourhref($textid,0,1)},
+      $Tournament{'Title'}, $Tournament{'PlayedAt'}||'', 
+      $Tournament{'PlayedAt2'}?' – '.$Tournament{'PlayedAt2'}:''));
 	}
+        $sth->finish;
 	$output .= dl($list);
 	return $output;
 }
 
+sub PrintQOfAuthor
+{
+
+    my ($dbh, $id) = @_;
+    my $Output='';
+    unless ($id=~/^\d+$/) {
+      $id=$dbh->quote($id);
+      my $sth =  $dbh->prepare("SELECT Id FROM Authors WHERE CharId=$id");
+      $sth->execute;
+      ($id)=$sth->fetchrow;
+      $sth->finish;
+    }
+    $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 = 'я';
+	}
+	$Output.= printform;
+	$Output.= 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;
+#	}
+        $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.="";
+
+
+     $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) {
+              } else
+           {
+             my $add=Tr(td([a({href=>$url."?qofauthor=$id"},"$name $surname"), $kvo]))."\n";
+             $output.=$add;
+           }
+     }
+     $output.="
";
+     $sth->finish;
+     return $output;
+}
+
+
+sub WriteFile {
+  my ($dbh,$fname) = @_;
+  $fname=~s/\s+$//;
+  $fname=~s/^\s+//;
+  $fname=~s/\.txt$//;
+  $fname=~s/.*\/(\w+)/$1/;
+
+  my $query= "SELECT Id, Title, Copyright, Info, URL, 
+                      Editors, EnteredBy, PlayedAt, CreatedAt, PlayedAt2
+                     from Tournaments where FileName=
+                     '$fname' OR 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, $PlayedAt2)=
+      $sth->fetchrow;
+  return -1 unless $Id;
+  open (OUT, ">$TMPDIR/$fname.txt") || print STDERR "Error in $fname.txt\n";
+  print OUT "Чемпионат:\n$Title\n\n";
+  my $date=$PlayedAt||'00-00-00';
+  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);
+  if ($PlayedAt2) {
+    my ($year,$month,$day)=split /-/, $date;
+    $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);
+	$i=0;
+	$qnumber++;
+	foreach $name (@{$sth1->{NAME}}) {
+	        if ($arr[$i]) {
+  	           $arr[$i]=~s/^(.*?)\s*$/$1/;
+		   $Question{$tourid}[$qnumber]{$name} = $arr[$i];
+		} else {
+  	            $Question{$tourid}[$qnumber]{$name} = 
+                   ''}
+                $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]{'PassCriteria'}."\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;
+
+
+
+}
+
+sub Bottom
+{
+	my $output.=&Include_virtual("$footer")||"";
+	$output.=p."
Обновление: ".&Include_virtual("$datefooter")."
";
+	$output.=<
+function toggle(e) {
+  if (e.style.display == "none") {
+     e.style.display="";
+  } else {
+     e.style.display = "none";
+ }
+}
+
+EEE
+;
+	$output.=end_html;
+	return $output;
+}
+
+
 MAIN:
 {
+        
 	setlocale(LC_CTYPE,'russian');
+	POSIX::setlocale( &POSIX::LC_ALL, $thislocale );
 	my($i, $tour);
 	my($text) = (param('text')) ? 1 : 0;
-	my($dbh) = DBI->connect("DBI:mysql:chgk", "piataev", "")
+	$tour = (param('tour')) ? param('tour') : 0;
+	my $texttour=$tour;
+	my ($sth,$dbh);
+	my($dsn) = "DBI:mysql:database=$dbname;host=$dbhost";
+        $dbh = DBI->connect($dsn, $dbuser, $dbpass)
+#	$dbh = DBI->connect("DBI:mysql:$dbname", $username, $dbpass)
 		or do {
-			print h1("Временные проблемы") . "База данных временно не
+			print header.h1("Временные проблемы") . "База вопросов временно не
 			работает. Заходите попозже.";
-			print &Include_virtual("../dimrub/db/reklama.html");
+			print &Include_virtual("$reklama") if $url!~/localhost/;
 		    print end_html;
 			die "Can't connect to DB chgk\n";
 		};
+        $dbh->do("set names koi8r");
+
+	if (param('qid') && (param('qid')=~/^\d+$/) || $tour && $tour=~/^\d+$/) {
+#	   my $destination='http://chgk.zaba.ru/search.html';
+#		print header (-'Content-Type' => 'text/html',
+#                -'Location:'=> 'http:\\db.chgk.info');
+		Redirect($destination);
+                exit
+	}
+
+	if (0 && $tour && !param('qnumber') && (!param('answers')||(param('answers')<=1)))
+	{       
+	        my $n=param('tour');
+	        $n=~s/.txt$//;        
+		my $gr=($n=~/^[A-Z]/) || (-e "$realHTMLDIR$n.html");
+		my $destination=tourhref($tour,param('answers')||0,$gr);
+		my $d=$destination;
+		$d=~s/$HTMLDIR/$realHTMLDIR/;
+#		print header.$destination;
+#                print header."$d|".(-e "$realHTMLDIR$n.html");
+                if (-e $d) {
+			Redirect($destination);
+			exit
+		}
+		$d=~s/\.\d+//;
+		$destination=~s/\.\d+//;
+                if (-e $d) {
+			Redirect($destination);
+			exit
+		}
+
+	}
+
+	if ($tour !~ /^[0-9]*$/) {	    
+		    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' OR t1.FileName='$fname')
+                        AND t1.Id=t2.ParentId AND t2.Number=$n");
+		    }	
+		    else 
+		        {
+                          $sth = $dbh->prepare("SELECT Id FROM Tournaments
+			             WHERE FileName = '$tour.txt' OR 
+                                       FileName = '$tour'");
+			}
+		    $sth->execute;
+	            $tour = ($sth->fetchrow)[0];
+                    $sth->finish;
+	}
+
+
+	if ($text && !param ('comp')) {
+		print header('text/plain');
+	} elsif (!param('comp')) {
+		print header(-charset =>'koi8-r')}
+	  my $sstr=param('sstr');
+          $opt_z||=param("makehtml");
+	  if (param('qid')) {
+	      my $sth;
+	      my $qid=param('qid');
+#		if ($qid !~ /^[0-9]+$/) 
+                {
+                    my ($fname,$t,$n)= split /\./ , $qid;
+                    $n=$t,$t='' unless $n;
+                    $t||=1;
+		    if ($t)
+		    {
+	                $sth = $dbh->prepare(
+                       "SELECT t2.Id FROM Tournaments as t1, 
+                        Tournaments as t2 
+			WHERE (t1.FileName = '$fname.txt' OR t1.FileName='$fname')
+                        AND t1.Id=t2.ParentId AND t2.Number=$t");
+		    }	
+#		    else 
+#		        {
+#                          $sth = $dbh->prepare("SELECT Id FROM Tournaments
+#			             WHERE FileName = '$fname.txt' OR FileName = '$fname'" );
+#			}
+		    $sth->execute;
+	            $tour = ($sth->fetchrow)[0];
+                    $sth->finish;
+	            $sth = $dbh->prepare(
+                       "SELECT QuestionId FROM 
+                        Questions 
+			WHERE ParentId=$tour AND 
+                        Questions.Number=$n");
+		        $sth->execute;
+	                $qid = ($sth->fetchrow)[0];
+              	     my $query="SELECT Question, Answer from Questions where QuestionId=$qid";
+	      	     $sth=$dbh->prepare($query);
+	      	     $sth->execute;
+	      	     $sstr= join ' ',$sth->fetchrow;
+              	     $sth->finish;
+	      	     $searchin{'Question'}=1;
+	      	     $searchin{'Answer'}=1;
+              	     $sstr=~tr/ёЁ/еЕ/;
+              	     $sstr=~s/[^йцукенгшщзхъфывапролджэячсмитьбюЙЦУКЕНГШЩЗХЪФЫВАПРОЛДЖЭЯЧСМИТЬБЮa-zA-Z0-9]/ /gi;
+              	     $proxysstr=$sstr;
+              	     $proxysstr=makeproxysstr($dbh,\$proxysstr);
+              } 
+              
+ 	}
+
+
 	if (!param('comp') and !param('sqldump') and !$text) {
-	   print header;
-	   print start_html(-"title"=>'Database of the questions',
+	   my $title="Результаты поиска на \"". ($proxysstr||$sstr) .'"' 
+                                                    if ($proxysstr||$sstr);
+           $title||="База вопросов";
+	   $globaloutput.=start_html(-"title"=>$title,
 	           -author=>'dimrub@icomverse.com',
 	           -bgcolor=>'#fff0e0',
-				  -vlink=>'#800020');
-		print &Include_virtual("../dimrub/db/reklama.html");
-	}
+				  -vlink=>'#800020');#}
+$globaloutput.="\n";
+
+		$globaloutput.=&Include_virtual("$reklama")||'';
+	}
+
+       if ($usehash && !$opt_z && length ($qs)<=255 && $qs !~ /(sstr)|(rand)|(comp)|(all=)/i) {
+        	my $sth=$dbh->prepare("SELECT page,times,t from hash where query=".$dbh->quote($qs));
+        	$sth->execute();
+        	my ($p,$times,$t)=$sth->fetchrow();
+        	$sth->finish;
+        	if ($p) {
+			print ".$p";
+			$dbh->disconnect;
+			exit ;
+		}
+       }
 
-if ($^O =~ /win/i) {
-	$thislocale = "Russian_Russia.20866";
-} else {
-	$thislocale = "ru_RU.KOI8-R";
-}
-POSIX::setlocale( &POSIX::LC_ALL, $thislocale );
 
-if ((uc 'а') ne 'А') {print "Koi8-r locale not installed!\n"};
 
 
-	if ($text) {
-		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 <do("delete from lastqueries where
+                      (TO_DAYS(NOW()) - TO_DAYS(t) >= 2) OR
+		           (time_to_sec(now())-time_to_sec(t) >3600)") if $usewas && random(30)==0;
+	} 
+	  elsif (param('qid')) {
+ 	      $globaloutput.=&PrintSearch($dbh, $sstr||'', 'proxy');
+ 	}
+ 	elsif (param('getfile')){
+           $globaloutput.=&writefile
+ 	} elsif (param('all')) {
+#	   my $destination='http://db.chgk.info/all.html';
+#		Redirect($destination);
+#                exit;
+		$globaloutput.=&PrintAll($dbh, 0);
 	} elsif (param('from_year') && param('to_year')) {
-		print &PrintDates($dbh);	
+		$globaloutput.=&PrintDates($dbh);
 	} elsif (param('comp')) {
-	    print header(
-			 -'Content-Type' => 'application/x-zip-compressed; name="db.zip"',
-			 -'Content-Disposition' => 'attachment; filename="db.zip"'
-			 );
-	    $tour = (param('tour')) ? param('tour') : 0;
+            print "Content-Type: application/octet-stream\n";
+            print  "Content-Type: application/force-download\n";
+            print  "Content-Type: application/download\n";
+            print  "Content-Type: application/x-zip-compressed; name=$texttour.zip\n";
+            print "Content-Disposition: attachment; filename=$texttour.zip \n\n";
+	    $tour ||= 0;
 	    my (@files) = &PrintArchive($dbh, $tour);
-	    open F, "$ZIP -j - $SRCPATH/COPYRIGHT @files |";
-	    print ();
+	    WriteFile($dbh,$_) foreach @files;
+	    open F, "$ZIP -j - @files |";
+	    binmode(F);
+	    binmode(STDOUT);
+	    print join "",;
 	    close F;
 	    $dbh->disconnect;
 	    exit;
@@ -988,19 +2323,94 @@ EOT
 	    $dbh->disconnect;
 	    exit;
 
-	} else {
-		$tour = (param('tour')) ? param('tour') : 0;
-		if ($tour !~ /^[0-9]*$/) {
-			my ($sth) = $dbh->prepare("SELECT Id FROM Tournaments
-			WHERE FileName = '$tour.txt'");
-			$sth->execute;
-			$tour = ($sth->fetchrow)[0];
-		}
-		print &PrintTournament($dbh, $tour, param('answer'));
-	}
+	} 
+        elsif (!$opt_z && !param("makehtml")) {
+		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) {
+		  $globaloutput.= &PrintQuestion($dbh, $QuestionNumber, $withanswers||0, $qnum, 1,$text,0);
+#                                        $dbh, $Id, $answer, $qnum, $title, $text
+		} else  {
+  		   $globaloutput.=&PrintTournament($dbh, $tour, $withanswers);
+  		}
+	}
+	else {
+	          $opt_z=1;
+	          $url="http://db.chgk.info/cgi-bin/db.cgi";
+	          open TS, $timestamp;
+	          my $d=$dbh->quote();
+	          close TS;
+		  open FF, ">${realHTMLDIR}index.html" or die "ERROR! - ${HTMLDIR}index.html\n";
+		       my $o=$globaloutput;
+		       $o.=&PrintTournament($dbh, 0, 0);
+		       $o.=&Bottom;
+		       print FF $o;
+		  close FF;
+		  open FF, ">${realHTMLDIR}all.html" or die "ERROR! - ${HTMLDIR}all.html\n";
+		       $o=$globaloutput;
+		       $o.=&PrintAll($dbh,0);
+		       $o.=&Bottom;
+		       print FF $o;
+		       close FF;
+
+
+#      	          my ($sth) = $dbh->prepare("SELECT t1.Id, t1.FileName, t1.Type, 
+#			count(t2.Id) 
+#                     FROM Tournaments as t1, Tournaments as t2
+#		     WHERE t1.CreatedAt>$d AND t2.ParentId=t1.Id GROUP BY t1.Id");
+my ($sth) = $dbh->prepare("SELECT t1.Id, t1.FileName, t1.Type, count(t2.Id)  FROM Tournaments as t1  LEFT JOIN Tournaments as t2 
+ ON t2.ParentId=t1.id WHERE t1.CreatedAt>=$d GROUP BY t1.Id");
+		  $sth->execute;
+		  my ($Id,$fname,$type,$c);
+		  while (($Id,$fname,$type,$c)=$sth->fetchrow,$Id) {
+		     next unless $fname;
+		     print "$fname\n";
+		     $fname=~s/\.txt$//;
+		     if ($type=~/Т/ || $c<=1)
+		     {
+		       open FF, ">$realHTMLDIR$fname-q.html" or die "ERROR! - $fname-q.html\n";
+		       my $o=$globaloutput;
+		       $paramtour=$fname;
+		       $o.=&PrintTournament($dbh, $Id, 0);
+		       $o.=&Bottom;
+		       print FF $o;
+		       close FF;
+		       open FF, ">$realHTMLDIR$fname-a.html";
+		       $o=$globaloutput;
+		       $o.=&PrintTournament($dbh, $Id, 1);
+		       $o.=&Bottom;
+		       print FF $o;
+		       close FF;
+		     }
+		     else {
+		       open FF, ">$realHTMLDIR$fname.html" or die "ERROR! - $fname-q.html\n";
+		       my $o=$globaloutput;
+		       $o.=&PrintTournament($dbh, $Id, 0);
+		       $o.=&Bottom;
+		       print FF $o;
+		       close FF;
+
+		     }
+                  }
+        }
 	if (!$text) {
-		print &Include_virtual("../dimrub/db/footer.html");
-		print end_html;
+		$globaloutput.=&Bottom;
 	}
+        if (!$opt_z){ 
+	  print $globaloutput;
+	  if (($qs!~ /(rand)|(sstr)|(comp)/i) && (length $qs<=255) && $usehash) {
+		$globaloutput=  $dbh->quote($globaloutput);
+		$dbh->do("insert into hash (query,page) values (".
+		$dbh->quote($qs).
+                    ",$globaloutput)");
+	  }
+	}
+
 	$dbh->disconnect;
 }