--- db/prgsrc/db.cgi 2002/06/20 12:54:52 1.70 +++ db/prgsrc/db.cgi 2003/04/19 22:50:06 1.99 @@ -6,16 +6,50 @@ use strict; use Time::Local; use POSIX qw(locale_h); use locale; -open STDERR, ">>errors1"; +open STDERR, ">/var/tmp/errors1"; +my $newsurl='http://news.chgk.info/'; +my $usewas=0; +my $cashednumber=500; +my $outputnumber=10; +my ($proxyptext,$proxysstr); my $printqueries=0; +my $url=url; +my $qs=query_string; +my $globaloutput; my %forbidden=(); my $debug=0; #added by R7 +my $outputkvo=param('kvo') ||$outputnumber; +$outputkvo=100 if $outputkvo>100; + if (param('debug')) {$debug=1; $printqueries=1} *STDERR=*STDOUT if $debug; +if ($url !~ /db\.chgk\.info/ && $url !~ /(localhost)||(bilbo)/ ) { + my $u="http://db.chgk.info/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, 'Comments', 3, 'Authors', 4, 'Sources'); my %rusfieldname=('Question','Вопрос', 'Answer', 'Ответ', 'Comments', 'Комментарии', 'Authors', 'Автор', - 'Sources', 'Источник','old','Старый','rus','Новый'); + 'Sources', 'Источник','old','Старый','rus','Новый', + 'chgk', 'ЧГК', 'brain', 'Брейн-ринг','game', 'Своя игра', + 'ehruditka', 'Эрудитка', 'beskrylka', 'Бескрылка', 'igp', 'Интернет' +); my %searchin; my $rl=qr/[йцукенгшщзхъфывапролджэячсмитьбюё]/; my $RL=qr/[ЙЦУКЕНГШЩЗХЪЭЖДЛОРПАВЫФЯЧСМИТЬБЮЁ]/; @@ -26,23 +60,22 @@ my %metodchar=('rus',1,'old',2); -my $thislocale; $searchin{$_}=1 foreach param('searchin'); -my %TypeName=('children'=>'Д', 'game'=>'И', +my %TypeName=('children'=>'Д', 'game'=>'Я', 'igp'=>'И', 'chgk'=>'Ч', 'brain'=>'Б', 'beskrylka'=>'Л','ehruditka'=>'Э'); 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/piataev/public_html/dimrub/src"; +my ($ZIP) = "/usr/local/bin/zip"; my $DUMPFILE = "/tmp/chgkdump"; my ($SENDMAIL) = "/usr/sbin/sendmail"; -my ($TMPDIR) = "/tmp"; +my ($TMPDIR) = "/var/tmp"; my ($TMSECS) = 30*24*60*60; my (%RevMonths) = ('Jan', '0', 'Feb', '1', 'Mar', '2', 'Apr', '3', 'May', '4', 'Jun', '5', @@ -64,6 +97,29 @@ sub NewEnough { } # Reads one question from the DB. Gets DB handler and Question ID. + +sub Redirect { +my ($destination) = @_; +print < +Redirection + +

Redirection

+

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

+ + +EndOfHTML +; +} + + + + sub GetTournament { my ($dbh, $Id) = @_; my (%Tournament, $field, @arr); @@ -82,6 +138,52 @@ sub GetTournament { return %Tournament; } +sub fetchquestion { + my ($sth,$q,$WithTour)=@_; + if ($WithTour) { + ($$q{'Question'},$$q{'Answer'},$$q{'Comments'},$$q{'Authors'}, + $$q{'Sources'}, + $$q{'Number'}, + $$q{'Title'}, $$q{'TourTitle'}, $$q{'FileName'},$$q{'PlayedAt'},$$q{'TourNumber'}) = + $sth->fetchrow; + } else { + ($$q{'Question'},$$q{'Answer'},$$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; + $where||=1; + $where="($where) AND Questions.ParentId=t1.Id AND t1.ParentId=t2.Id" + if $WithTour; + + my $query; + if ($WithTour) { + $query="SELECT Questions.Question, Answer, Comments, Authors, Sources, + Questions.Number + , t2.Title, t1.Title, t2.FileName, t2.PlayedAt,t1.Number + from Questions,Tournaments as t1, Tournaments as t2 + WHERE $where"; + } else { + $query="SELECT Questions.Question, Answer, 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) = @_; @@ -107,7 +209,6 @@ sub GetQuestion { sub GetTourQuestions { my ($dbh, $ParentId) = @_; my (@arr, @Questions); - my ($sth) = $dbh->prepare("SELECT QuestionId FROM Questions WHERE ParentId=$ParentId order by Number"); @@ -141,13 +242,11 @@ sub GetTours { 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; } @@ -156,54 +255,104 @@ print "timee0=".time.br if $debug; 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 $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','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','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'=>'Любое'}); + @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 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 +return +< +

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

+ + + $qnumber +

+ + + + + + + + + + + + + +
Вариант поиска: + + Простой (старый) + + "Что? Где? Когда?" + + "Брейн-Ринг" + + "Интернет" +
+ "Своя игра" + + "Эрудитка" + + "Бескрылка" +
Расширенный (с учетом грамматики, в вопросах всех типов) +
Искать: + +Все слова + +Любое слово +
Поля для поиска: + +Вопрос + +Ответ
+		 +Комментарии
+		 +Автор
+		 +Источник
+
+ + +EOT .endform .hr } sub proxy -{ -#print "time0=".time.br if $debug; +{ my ($dbh,$ptext,$allnf)=@_; + my $sstr=makeproxysstr($dbh,$ptext,$allnf); + return russearch($dbh,$sstr,0,$allnf); +} + +sub makeproxysstr { + my ($dbh,$ptext)=@_; my $text=$$ptext; $text=~tr/ёЁ/еЕ/; $text=~s/(${RLrl})p(${RLrl})/$1p$2/gom; @@ -229,18 +378,9 @@ sub proxy $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); + return $sstr; } @@ -272,7 +412,6 @@ $sstr=~tr/йцукенгшщзхъфывапролджэячсмить $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]}=(); @@ -303,7 +442,6 @@ print "$query",br if $printqueries; my $kvo=0; push @$allnf, @{$_} foreach @nf; - print "nf=@$allnf" if $printqueries; foreach $i (0..$#w) #запросы в базу... { @@ -313,11 +451,10 @@ print "$query",br if $printqueries; - $_= " word2question.word=".$_. ' ' foreach @arr; + $_= " word2question.word=$_" foreach @arr; $_= " nf.id=".$_. ' ' foreach @arr1; # @arr=(0) unless @arr; - $query="select questions from word2question where". (join ' OR ', @arr); -print STDERR "!$query\n",br if $printqueries; + $query="select questions from word2question where (". (join ' OR ', @arr).") AND length(questions)<80000"; $sth=$dbh -> prepare($query); $sth->execute; @@ -329,7 +466,6 @@ print STDERR "!$query\n",br if $printque } $sth->finish; $query="select number from nf where ".(join ' OR ', @arr1); -print "$query\n",br if $printqueries; $sth=$dbh -> prepare($query); $sth->execute; @@ -377,7 +513,6 @@ print "$query\n",br if $printqueries; } } #foreach $i -#print "keys tasksof", join ' ', keys %{$tasksof{0}}; #Ищем пересечение или объединение списков вопросов (значений %tasksof) foreach $sf (keys %tasksof) { @@ -387,7 +522,6 @@ print "$query\n",br if $printqueries; keys %count) ; -print "\n\$#tasks=",$#tasks,br if $printqueries; ############ Сортировка найденных вопросов foreach (keys %wordsof) @@ -400,11 +534,7 @@ foreach (keys %wordsof) ############ -print "tasks=@tasks" if $printqueries; -#print "$_ $relevance{$_} | " foreach @tasks; -#print br; -print "allnf=@$allnf",br if $printqueries; return @tasks; } @@ -459,17 +589,6 @@ sub Search { my $sstr=$$s; my (@arr, @Questions, @fields); 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); @@ -477,10 +596,7 @@ sub Search { } elsif ($metod eq 'proxy') { -# $searchin{'question'}=1; -# $searchin{'answer'}=1; my @task=proxy($dbh,$s,$allnf); -# $$s=$sstr; return @task } @@ -507,7 +623,6 @@ sub Search { $where= $$q{'matchexp'}; $query= "SELECT Questionid FROM Questions WHERE $where"; - print br."Query is: $query".br if $debug; $sth = $dbh->prepare($query); } else @@ -524,20 +639,21 @@ sub Search { 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 ORDER BY QuestionId"; + WHERE ($f LIKE $sstr) AND (".&makewhere.") ORDER BY QuestionId"; -print $query if $printqueries; $sth = $dbh->prepare($query) } #else -- processing old-style query (R7) @@ -546,10 +662,23 @@ print $query if $printqueries; push @Questions, $arr[0] unless $forbidden{$arr[0]}; } $sth->finish; -print "@Questions" if $printqueries; + return @Questions; } +sub makewhere { + my @type=param('type'); + my $type=''; + + $type .= ($_=$TypeName{$_}) foreach @type; + my $where=' 0 '; + foreach (@type) { + $where.= " OR (Type ='$_') OR (Type ='$_Д') "; + } + $where.= "OR (Type='ЧБ')" if ($type=~/Ч|Б/); + return $where; +} + # Substitute every letter by a pair (for case insensitive search). my (@letters) = qw/аА бБ вВ гГ дД еЕ жЖ зЗ иИ йЙ кК лЛ мМ нН оО пП рР сС тТ уУ фФ хХ цЦ чЧ шШ щЩ ьЬ ыЫ эЭ юЮ яЯ/; @@ -567,106 +696,112 @@ sub NoCase { sub PrintList { my ($dbh,$Questions,$shablon,$was)=@_; - + my $Output; 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; + $first=$first-($first-1)%$outputkvo; + my $fkvo=param('fkvo')||($#$Questions+1); + 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'); + my $sstr=param('sstr')||''; $qs=~s/sstr=[^\&]+/sstr=$sstr/; - $qs=~s/\&was=[^\&]+//; - $qs.="&was=$was"; - if ($first>$kvo*3+1) + 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-$kvo))},"<").(" "x4) - } - + a({href=>(url."?".$qs."\&first=".($first-$outputkvo))},"<").(" "x4) + } else {$nav.=' 'x15;} my ($fprint,$lprint); - my $llprint=$#$Questions- ($#$Questions+1)%$kvo+2; - if ($#$Questions+1<=$kvo*7) + my $llprint=$fkvo- ($fkvo)%$outputkvo+1; # + if ($fkvo<=$outputkvo*7) { $fprint=1; $lprint=$llprint; } - elsif ($first>$kvo*3 && $#$Questions+1-$first>$kvo*3) + elsif ($first>$outputkvo*3 && $fkvo-$first>$outputkvo*3) { - $fprint=$first-$kvo*3; - $lprint=$first+$kvo*3; + $fprint=$first-$outputkvo*3; + $lprint=$first+$outputkvo*3; } - elsif ($first<=$kvo*3) + elsif ($first<=$outputkvo*3) { - $fprint=1; $lprint=6*$kvo+1; + $fprint=1; $lprint=6*$outputkvo+1; } else { $lprint=$llprint; - $fprint=$lprint-$kvo*6 + $fprint=$lprint-$outputkvo*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) +# 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-$kvo*6; +# $fprint=$lprint-$outputkvo*6; # $fprint=1 if ($fprint<=0) # } - for($f=$fprint; $f<=$lprint; $f+=$kvo) + for($f=$fprint; $f<=$lprint; $f+=$outputkvo) { -# next if $first-$f>$kvo*3; - $l=$f+$kvo-1; - $l=$#$Questions+1 if $l>$#$Questions+1; +# 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+$kvo<$#$Questions) + if ($lprint+$outputkvo<$fkvo) { $nav.= (" "x4). - a({href=>(url."?".$qs."\&first=".($first+$kvo))},">").(" "x4). + a({href=>(url."?".$qs."\&first=".($first+$outputkvo))},">").(" "x4). a({href=>url."?".$qs."\&first=$llprint"},">>").(" "x4) } - - - print "$nav".br."\n"; + $Output.= "$nav".br."\n"; + my @q=@$Questions[$first-1..$last-1]; + my %q=(); + my $sth=SelectQuestions($dbh,\@q,1); 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') + fetchquestion($sth,\%q,1); + my $output; + $output = &PrintQuestion($dbh, \%q, 1, 0, 1,0,1 ); + if (param('metod') && (param('metod') eq 'rus' || param('metod') eq 'proxy')) { $output=~s/\b($shablon)\b/\$1\<\/strong\>/gi; } else { $output=~s/($shablon)/\$1\<\/strong\>/gi; } - print $output; + $Output.= $output; } + $sth->finish; - - print "$nav".br."\n"; - + $Output.= "$nav".br."\n"; + return $Output; } sub PrintSearch { + my $Output=''; my ($dbh, $sstr, $metod,$was) = @_; my $t=time; - print h2("Поиск в базе вопросов"); - print printform; + $Output.= printform; my @allnf; my @Questions; - if ($was) + $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; @@ -675,25 +810,29 @@ sub PrintSearch { @Questions=unpack 'L*',$q; @allnf=unpack 'L*',$nf; $sth->finish; - } else + } + if (!$was || ($metod eq 'proxy') || (param('first')+$outputkvo>$cashednumber)) { @Questions=&Search($dbh, \$sstr,$metod,$all,\@allnf); - my $tmp=$dbh->quote(pack("L*",@Questions)); + $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; - do - { - $was=int rand(32000); - } - while (--$ss && (!$dbh->do ("insert into lastqueries (id,sstr,questions,allnf) + if ($usewas) { + 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; + $Output.= "Something is wrong...".br unless $ss; + } } - print p. "Время поиска: " . (time-$t) ." сек.".p; + $Output.= p. "Время поиска: " . (time-$t) ." сек.".p; my ($output, $i, $suffix, $hits) = ('', 0, '', $#Questions + 1); my $shablon; @@ -704,7 +843,6 @@ sub PrintSearch { $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; @@ -717,11 +855,10 @@ print "$query" if $printqueries; $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 = 'й'; @@ -731,26 +868,33 @@ print "$query" if $printqueries; $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; if ($metod ne 'rus') { - (@sar) = split(' ', $sstr); + my $ss=$sstr; + (@sar) = split(' ', $ss); + s/(\W)/\\$1/g foreach (@sar); $shablon=join "|",@sar; } - PrintList($dbh,\@Questions,$shablon,$was); + $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 (@Questions) = &Get12Random($dbh, $type, $num); my ($output, $i) = ('', 0); @@ -760,13 +904,27 @@ sub PrintRandom { $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 + fetchquestion($sth,\%q,0); $output .= - &PrintQuestion($dbh, $Questions[$i], 1, $i + 1, 0, $text); + &PrintQuestion($dbh, \%q, $answer, $i + 1, 0, $text,1); + push @answers, $q{'Answer'}; } + $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; } @@ -786,6 +944,8 @@ sub PrintTournament { %Tournament = &GetTournament($dbh, $Id) if ($Id); my ($URL) = $Tournament{'URL'}; + $URL=~s/http:\/znatoki\/boris\/reports\//$newsurl/ if url=~/kulichki/; + $URL=~s/\/znatoki\/boris\/reports\//$newsurl/ if url=~/kulichki/;; my ($Info) = $Tournament{'Info'}; my ($Copyright) = $Tournament{'Copyright'}; my $fname=$Tournament{'FileName'}; @@ -797,7 +957,7 @@ sub PrintTournament { /Г/ && do { $output .= h2({align=>"center"}, "Группа: $Tournament{'Title'} ", - "$Tournament{'PlayedAt'}") . p . "\n"; + $Tournament{'PlayedAt'}||'') . p . "\n"; last; }; /Ч/ && do { @@ -873,12 +1033,12 @@ sub PrintTournament { "вопросы + ответы") . "]") ); } else { - $list .= dd(#a({href=>url . "?tour=$textid&comp=1"}, - #img({src=>'/icons/compressed.gif', alt=>'[ZIP]', border=>1})). " " . + $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); + $Tournament{'PlayedAt'}||'') . $qnum); } } $output .= dl($list); @@ -939,6 +1099,7 @@ 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'} !~ /Т/); @@ -949,16 +1110,18 @@ sub PrintTour { my ($suffix) = &Suffix($qnum); $output .= h2({align=>"center"}, $Tournament{"Title"}, - $Tournament{'PlayedAt'}, + $Tournament{'PlayedAt'}||'', "
", $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,0,1); } - + $sth->finish; $output .= hr({-'align'=>'center', -'width'=>'80%'}); if ($Tournament{'URL'}) { @@ -1011,6 +1174,8 @@ sub PrintField { $value =~ s/^\s+/
    /mg; $value =~ s/^\|([^\n]*)/

$1<\/pre>/mg;
 	    $value =~ s/\s+-+\s+/ – /mg;
+	    $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;
@@ -1024,67 +1189,86 @@ sub PrintField {
 # 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 ($dbh, $Id, $answer, $qnum, $title, $text,$h) = @_;
 	my ($output, $titles) = ('', '');
-	my (%Question) = &GetQuestion($dbh, $Id);
-	$qnum = $Question{'Number'}
-		if ($qnum == 0);
-	if (!$text) {
-		$output .= hr({width=>"50%"});
+	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'});
-			my $fname=$Tournament{'FileName'};
+			$Question{'FileName'}=$Tournament{'FileName'};
+			$Question{'Title'}=$Tournament{'Title'};
+			$Question{'PlayedAt'}=$Tournament{'PlayedAt'};
+			$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) {
+			my $fname=$Question{'FileName'};
 			$fname=~s/\.txt//;
 			$titles .=
 				dd(img({src=>"/icons/folder.open.gif"}) . " " .
-					 a({href=>url . "?tour=$fname"}, $Tournament{'Title'}, $Tournament{'PlayedAt'}));
+					 a({href=>url . "?tour=$fname"}, $Question{'Title'}, $Question{'PlayedAt'}||''));
 			$titles .=
 				dl(dd(img({src=>"/icons/folder.open.gif"}) . " " .
-					a({href=>url . "?tour=$fname.$Tour{Number}#$qnum"}, $Tour{'Title'})));
+					a({href=>url . "?tour=$fname.$Question{TourNumber}#$qnum"}, $Question{'TourTitle'})));
 		}
 		$output .= dl(strong($titles));
 	}
 
 
-	$output.= "";
-
-	$output .=
-		&PrintField("Вопрос $qnum", $Question{'Question'}, $text);
+	$output.= "" unless $text;
 
-	if ($answer==1) {
+	if ($answer>=0) {$output .=
+		&PrintField("Вопрос $qnum", $Question{'Question'}, $text);}
+	else {$output .="$qnum. "}
+	if ($answer==1|| $answer==-1) {
 		$output .=
 			&PrintField("Ответ", $Question{'Answer'}, $text);
 
-		if ($Question{'Authors'}) {
+		if ($Question{'Authors'} ) {
                       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;
-                       }
- 
+# 		      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);
 
 		}
@@ -1126,11 +1310,16 @@ EOTT
 		}
 
 
+
 $output.=""
 
 	}
-	$output.=br.a({href=> url."?metod=proxy&qid=$Id"}, 'Близкие вопросы').p
-             if $answer;
+	$output=~s/\(pic: ([^\)]*)\)/
/g unless $text;
+	my $qid=param('tour') ? (param('tour').".$Question{'Number'}" ): '';
+
+	$output.=br.a({href=> url."?metod=proxy&
+qid=$qid"}, 'Близкие вопросы').p
+             if $answer>0 && !$text && $qid;
 	return $output;
 }
 
@@ -1160,7 +1349,6 @@ sub Get12Random {
 	my ($qnum) = &GetMaxQId($dbh);
 	my (%chosen);
 	srand;
-
 	my $where=0;
 	my $r=int (rand(10000));
 
@@ -1170,10 +1358,11 @@ sub Get12Random {
  	}
         $where.= "OR (Type='ЧБ')" if ($type=~/Ч|Б/);
 
-   $q="select QuestionId, QuestionId/$r-floor(QuestionId/$r) as val 
-       from Questions where $where order by val limit $num";
-
+#   $q="select QuestionId, QuestionId/$r-floor(QuestionId/$r) as val 
+#       from Questions where $where order by val limit $num";
 # Когда на куличках появится mysql >=3.23 надо заменить на order by rand();
+   $q="select QuestionId from Questions where $where order by rand() limit $num";
+
 
    $sth=$dbh->prepare($q);
    $sth->execute;
@@ -1213,7 +1402,6 @@ 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]));
@@ -1252,7 +1440,7 @@ sub PrintAll {
 
 		$output .= dd(img({src=>"/icons/folder.gif", alt=>"[*]"}) .
       " " . a({href=>url . "?tour=$textid&answer=0"},
-      $Tournament{'Title'}) ." " . $Tournament{'PlayedAt'} . " $New");
+      $Tournament{'Title'}) ." " . ($Tournament{'PlayedAt'}||'') . " $New");
 	}
 	if ($Id == 0 or $Tournament{'Type'} =~ /Г/ or $Tournament{'Type'} eq '') {
 		for ($i = 0; $i <= $#Tours; $i++) {
@@ -1286,7 +1474,7 @@ sub PrintDates {
 		%Tournament = &GetTournament($dbh, $array[0]);
       $list .= dd(img({src=>"/icons/folder.gif", alt=>"[*]"}) .
       " " . a({href=>url . "?tour=$Tournament{'Id'}&answer=0"},
-      $Tournament{'Title'}, $Tournament{'PlayedAt'}));
+      $Tournament{'Title'}, $Tournament{'PlayedAt'}||''));
 	}
         $sth->finish;
 	$output .= dl($list);
@@ -1297,7 +1485,16 @@ sub PrintQOfAuthor
 {
 
     my ($dbh, $id) = @_;
-   $id=$dbh->quote($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;
@@ -1319,9 +1516,8 @@ sub PrintQOfAuthor
 	} else {
 		$suffix = 'я';
 	}
-	print h2("Поиск в базе вопросов");
-	print printform;
-	print p({align=>"center"}, "Автор ".strong("$name $surname. ")
+	$Output.= printform;
+	$Output.= p({align=>"center"}, "Автор ".strong("$name $surname. ")
 	. " : $hits попадани$suffix.");
 
 
@@ -1329,7 +1525,7 @@ sub PrintQOfAuthor
 #		$output = &PrintQuestion($dbh, $Questions[$i], 1, $i + 1, 1);
 #		print $output;
 #	}
-        PrintList($dbh,\@Questions,'gdfgdfgdfgdfg');
+        $Output.=PrintList($dbh,\@Questions,'gdfgdfgdfgdfg');
 }
 
 
@@ -1374,11 +1570,10 @@ a({href=>url."?authors=surname"},"фамили
      {
 
            my ($id,$name,$surname,$kvo)=@$arr;
-           if (!$name || !$surname) {#print "Opanki at $id\n"
+           if (!$name || !$surname) {
               } else
            {
              my $add=Tr(td([a({href=>url."?qofauthor=$id"},"$name $surname"), $kvo]))."\n";
-             print STDERR $add;
              $output.=$add;
            }
      }
@@ -1390,8 +1585,11 @@ a({href=>url."?authors=surname"},"фамили
 
 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 
                      from Tournaments where FileName=".$dbh->quote("$fname.txt");
@@ -1402,9 +1600,9 @@ sub WriteFile {
    $Editors, $EnteredBy, $PlayedAt, $CreatedAt)=
       $sth->fetchrow;
   return -1 unless $Id;
-  open (OUT, ">$TMPDIR/$fname.txt");
+  open (OUT, ">$TMPDIR/$fname.txt") || print STDERR "Error in $fname.txt\n";
   print OUT "Чемпионат:\n$Title\n\n";
-  my $date=$PlayedAt;
+  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);
@@ -1441,13 +1639,19 @@ sub WriteFile {
     my $eqauthor=1;
     my $qnumber=0;
     my @arr;
-    while ( @arr=$sth1->fetchrow, $arr[0])
+    while ( (@arr=$sth1->fetchrow), $arr[0])
     {
-	my($i, $name) = 0;
+	my($i, $name);
+	$i=0;
 	$qnumber++;
 	foreach $name (@{$sth1->{NAME}}) {
-	        $arr[$i]=~s/^(.*?)\s*$/$1/;
-		$Question{$tourid}[$qnumber]{$name} = $arr[$i++];
+	        if ($arr[$i]) {
+  	           $arr[$i]=~s/^(.*?)\s*$/$1/;
+		   $Question{$tourid}[$qnumber]{$name} = $arr[$i];
+		} else {
+  	            $Question{$tourid}[$qnumber]{$name} = 
+                   ''}
+                $i++;
 	}
 	if ($vid)
         {
@@ -1532,41 +1736,107 @@ sub WriteFile {
 
 MAIN:
 {
+        
 	setlocale(LC_CTYPE,'russian');
 	my($i, $tour);
 	my($text) = (param('text')) ? 1 : 0;
+	if (param('qid') && (param('qid')=~/^\d+$/)) {
+	   my $destination='http://db.chgk.info/search.html';
+#		print header (-'Content-Type' => 'text/html',
+#                -'Location:'=> 'http:\\db.chgk.info');
+		Redirect($destination);
+                exit
+	}
 
+	if ($text) {
+		print header('text/plain');
+	} else {print header;}
 	my($dbh) = DBI->connect("DBI:mysql:chgk", "piataev", "")
 		or do {
-			print h1("Временные проблемы") . "База данных временно не
+			print h1("Временные проблемы") . "База вопросов временно не
 			работает. Заходите попозже.";
-			print &Include_virtual("../dimrub/db/reklama.html");
+			print &Include_virtual("../dimrub/db/reklama.html") if $url!~/localhost/;
 		    print end_html;
 			die "Can't connect to DB chgk\n";
 		};
+	  my $sstr=param('sstr');
+	  if (param('qid')) {
+	      my $sth;
+	      my $qid=param('qid');
+#		if ($qid !~ /^[0-9]+$/) 
+                {
+                    my ($fname,$t,$n)= split /\./ , $qid;
+                    $n=$t,$t='' unless $n;
+		    if ($t)
+		    {
+	                $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=$t");
+		    }	
+		    else 
+		        {
+                          $sth = $dbh->prepare("SELECT Id FROM Tournaments
+			             WHERE FileName = '$fname.txt'");
+			}
+		    $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");
-	}
-
-
-if ($^O =~ /win/i) {
-	$thislocale = "Russian_Russia.20866";
-} else {
-	$thislocale = "ru_RU.KOI8-R";
-}
-POSIX::setlocale( &POSIX::LC_ALL, $thislocale );
+$globaloutput.="\n";
+
+		$globaloutput.=&Include_virtual("../dimrub/db/reklama.html");
+	}
+
+       if (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 ((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");
@@ -1577,6 +1847,29 @@ if ((uc 'а') ne 'А') {print "Koi8-r loca
                   }
                   $sth->finish;
         }
+		$tour = (param('tour')) ? param('tour') : 0;
+		my $sth;
+		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'
+                        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 (param('rand')) {
@@ -1600,54 +1893,49 @@ Content-type: text/$mime_type; charset="
 EOT
 			print F &PrintRandom($dbh, $type, $qnum, $text);
 			close F;
-			print "Пакет случайно выбранных вопросов послан по адресу $Email. Нажмите
+			$globaloutput.= "Пакет случайно выбранных вопросов послан по адресу $Email. Нажмите
 			на Reload для получения еще одного пакета";
 		} else {
-			print &PrintRandom($dbh, $type, $qnum, $text);
+			$globaloutput.= &PrintRandom($dbh, $type, $qnum, $text);
 		}
 	}
 	  elsif (param('authors')){
-                print &PrintAuthors($dbh,param('authors'));
+                $globaloutput.= &PrintAuthors($dbh,param('authors'));
         }
           elsif (param('qofauthor')){
-                &PrintQOfAuthor($dbh,param('qofauthor'));
+                $globaloutput.= &PrintQOfAuthor($dbh,param('qofauthor'));
         }
           elsif (param('sstr')||param('was')) {
-		&PrintSearch($dbh, param('sstr'), param('metod'),param('was'));
+		$globaloutput.=&PrintSearch($dbh, $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)")
+		           (time_to_sec(now())-time_to_sec(t) >3600)") if $usewas && random(30)==0;
 	} 
 	  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');
+ 	      $globaloutput.=&PrintSearch($dbh, $sstr||'', 'proxy');
  	}
-
-          elsif (param('all')) {
-		print &PrintAll($dbh, 0);
+ 	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;
+            $globaloutput.="Content-Type: application/octet-stream\n";
+            $globaloutput.="Content-Type: application/force-download\n";
+            $globaloutput.="Content-Type: application/download\n";
+            $globaloutput.="Content-Type: application/x-zip-compressed; name=db.zip\n";
+            $globaloutput.="Content-Disposition: attachment; filename=db.zip \n\n";
+	    $tour ||= 0;
 	    my (@files) = &PrintArchive($dbh, $tour);
 	    WriteFile($dbh,$_) foreach @files;
-	    open F, "$ZIP -j - $SRCPATH/COPYRIGHT @files |";
-	    print ();
+	    open F, "$ZIP -j - @files |";
+	    binmode(F);
+	    binmode(STDOUT);
+	    $globaloutput.= join "",;
 	    close F;
 	    $dbh->disconnect;
 	    exit;
@@ -1663,28 +1951,6 @@ $sstr=~s/[^йцукенгшщзхъфывапролджэячсмит
 	    exit;
 
 	} else {
-		$tour = (param('tour')) ? param('tour') : 0;
-		my $sth;
-		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'
-                        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;
-		}
 		my $QuestionNumber=0;
 		my $qnum;
 		if ($qnum=param('qnumber')){
@@ -1694,14 +1960,15 @@ $sstr=~s/[^йцукенгшщзхъфывапролджэячсмит
 		  $QuestionNumber=($sth->fetchrow)[0]||0;
 	        }
 	        if ($QuestionNumber) {
-		  print &PrintQuestion($dbh, $QuestionNumber, param('answer')||0, $qnum, 1);
+		  $globaloutput.= &PrintQuestion($dbh, $QuestionNumber, param('answer')||0, $qnum, 1,0,0);
 #                                        $dbh, $Id, $answer, $qnum, $title, $text
 		} else  {
-  		   print &PrintTournament($dbh, $tour, param('answer'));
+  		   $globaloutput.=&PrintTournament($dbh, $tour, param('answer'));
   		}
 	}
 	if (!$text) {
-		print &Include_virtual("../dimrub/db/footer.html");
+		$globaloutput.=&Include_virtual("../dimrub/db/footer.html");
+		$globaloutput.=p."
Обновление: ".&Include_virtual("../dimrub/db/date")."
";
 print <
 function toggle(e) {
@@ -1716,5 +1983,13 @@ EEE
 ;
 		print end_html;
 	}
+	print $globaloutput;
+	if (($qs!~ /(rand)|(sstr)|(comp)/i) && (length $qs<=255)) {
+		$globaloutput=  $dbh->quote($globaloutput);
+		$dbh->do("insert into hash (query,page) values (".
+		$dbh->quote($qs).
+                    ",$globaloutput)");
+	}
+
 	$dbh->disconnect;
 }