--- db/prgsrc/db.cgi 2001/12/21 11:54:37 1.53 +++ db/prgsrc/db.cgi 2001/12/25 04:05:46 1.54 @@ -23,7 +23,7 @@ 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); @@ -562,7 +562,7 @@ sub NoCase { } sub PrintList { - my ($dbh,$Questions,$shablon)=@_; + my ($dbh,$Questions,$shablon,$was)=@_; my $first=param('first') ||1; my $kvo=param('kvo') ||150; @@ -577,6 +577,8 @@ sub PrintList { $qs=~s/\&first\=[^\&]+//g; my $sstr=param('sstr'); $qs=~s/sstr=[^\&]+/sstr=$sstr/; + $qs=~s/\&was=[^\&]+//; + $qs.="&was=$was"; if ($first>$kvo*3+1) { $nav.= @@ -654,11 +656,37 @@ sub PrintList { } sub PrintSearch { - my ($dbh, $sstr, $metod) = @_; + my ($dbh, $sstr, $metod,$was) = @_; + my $t=time; print h2("Поиск в базе вопросов"); print printform; my @allnf; - my (@Questions) = &Search($dbh, \$sstr,$metod,$all,\@allnf); + my @Questions; + if ($was) + { + my $sth=$dbh->prepare ("select sstr,questions,allnf from lastqueries where id=".param('was')); + $sth->execute; + my ($q,$nf); + ($sstr, $q,$nf)=($sth->fetchrow); + @Questions=unpack 'S*',$q; + @allnf=unpack 'S*',$nf; + $sth->finish; + } else + { + @Questions=&Search($dbh, \$sstr,$metod,$all,\@allnf); + my $tmp=$dbh->quote(pack("S*",@Questions)); + my $qsstr=$dbh->quote($sstr); + my $nf=$dbh->quote(pack("S*", @allnf)); + do + { + $was=int rand(32000); + } + while (!$dbh->do ("insert into lastqueries (id,sstr,questions,allnf) + values ($was, $qsstr,$tmp,$nf)")); + } + + + print p. "Время поиска: " . (time-$t) ." сек.".p; my ($output, $i, $suffix, $hits) = ('', 0, '', $#Questions + 1); my $shablon; @@ -677,11 +705,13 @@ print "$query" if $printqueries; { push @shablon,"(?:$arr[0])"; } + $sth->finish; $shablon= join "|", @shablon; $shablon=~s/[её]/\[ЕЁ\]/gi; # $shablon=~s/([йцукенгшщзхъфывапролджэячсмитьбюЙЦУКЕНГШЩЗХЪФЫВАПРОЛДЖЭЯЧСМИТЬБЮ])/&NoCase($1)/ge; $shablon=qr/$shablon/i; print "!$shablon!",br if $printqueries; + } @@ -709,7 +739,7 @@ print "$query" if $printqueries; (@sar) = split(' ', $sstr); $shablon=join "|",@sar; } - PrintList($dbh,\@Questions,$shablon); + PrintList($dbh,\@Questions,$shablon,$was); } sub PrintRandom { @@ -737,7 +767,7 @@ sub PrintEditor { my $t=shift; #ссылка на Хэш с полями my $ed=$$t{'Editors'}; my $edname=($ed=~/\,/ ) ? "Редакторы" : "Редактор" ; - return h4({align=>"center"},"$edname: $ed" ); + return $ed? h4({align=>"center"},"$edname: $ed" ): ''; } sub PrintTournament { @@ -751,9 +781,10 @@ sub PrintTournament { my ($URL) = $Tournament{'URL'}; my ($Info) = $Tournament{'Info'}; my ($Copyright) = $Tournament{'Copyright'}; - + my $fname=$Tournament{'FileName'}; @Tours = &GetTours($dbh, $Id); $list=''; + my $textid; if ($Id) { for ($Tournament{'Type'}) { /Г/ && do { @@ -808,22 +839,35 @@ sub PrintTournament { $alt = "[-]"; } + my $textid; + if ($textid=$Tournament{'FileName'}) + { + $textid=~s/\.txt//; + } + elsif ($textid=$Tournament{'Number'}) + { + $fname=~s/\.txt//; + $textid="$fname.$textid"; + } + else {$textid=$Tournament{'Id'}}; + + if ($SingleTour or $Tournament{'Type'} =~ /Т/) { $list .= dd(img({src=>$imgsrc, alt=>$alt}) . " " . $Tournament{'Title'} . " " . $Tournament{'PlayedAt'} . $qnum) . dl( dd("[" - . a({href=>url . "?tour=$Tournament{'Id'}&answer=0"}, + . a({href=>url . "?tour=$textid&answer=0"}, "вопросы") . "] [" - . a({href=>url . "?tour=$Tournament{'Id'}&answer=1"}, + . a({href=>url . "?tour=$textid&answer=1"}, "вопросы + ответы") . "]") ); } else { - $list .= dd(a({href=>url . "?tour=$Tournament{'Id'}&comp=1"}, + $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=$Tournament{'Id'}&answer=0"}, + . " " . a({href=>url . "?tour=$textid&answer=0"}, $Tournament{'Title'}. " ". $Tournament{'PlayedAt'}) . $qnum); } @@ -857,11 +901,23 @@ sub Suffix { } sub IsTour { - my ($dbh, $Id) = @_; - my ($sth) = $dbh->prepare("SELECT Type FROM Tournaments + my ($dbh, $Id,$n) = @_; + + my ($sth) ; + + if (defined $n) + { $sth=$dbh->prepare ("select Id FROM Tournaments + WHERE ParentId=$Id AND Number=$n"); + } + else + { + $sth=$dbh->prepare("SELECT Id FROM Tournaments WHERE Id=$Id"); + } $sth->execute; - return ($sth->fetchrow)[0] =~ /Т/; + my $a=($sth->fetchrow)[0]; + $sth->finish; + return $a; } # Gets a DB handler (ofcourse) and a tour Id. Prints all the @@ -877,6 +933,8 @@ sub PrintTour { return 0 if ($Tour{'Type'} !~ /Т/); + my ($fname)=$Tournament{'FileName'}; + $fname=~s/\.txt//; my ($qnum) = $Tour{'QuestionsNum'}; my ($suffix) = &Suffix($qnum); @@ -907,25 +965,25 @@ sub PrintTour { $output .= p($Tournament{'Info'}); } - + my $n=$Tour{'Number'}; if ($answer == 0) { $bottom .= - "[" . a({href=>url . "?tour=$Id&answer=1"}, "ответы") . "] " . br; + "[" . a({href=>url . "?tour=$fname.$n&answer=1"}, "ответы") . "] " . br; } - if (&IsTour($dbh, $Id - 1)) { + if ($n>1) { $bottom .= - "[" . a({href=>url . "?tour=" . ($Id - 1) . "&answer=0"}, + "[" . a({href=>url . "?tour=$fname." . ($n - 1) . "&answer=0"}, "предыдущий тур") . "] "; $bottom .= - "[" . a({href=>url . "?tour=" . ($Id - 1) . "&answer=1"}, + "[" . a({href=>url . "?tour=$fname." . ($n - 1) . "&answer=1"}, "предыдущий тур с ответами") . "] " . br; } - if (&IsTour($dbh, $Id + 1)) { + if (&IsTour($dbh, $Tour{'ParentId'}, $n + 1)) { $bottom .= - "[" . a({href=>url . "?tour=" . ($Id + 1) . "&answer=0"}, + "[" . a({href=>url . "?tour=$fname." . ($n + 1) . "&answer=0"}, "следующий тур") . "] "; $bottom .= - "[" . a({href=>url . "?tour=" . ($Id + 1) . "&answer=1"}, + "[" . a({href=>url . "?tour=$fname." . ($n + 1) . "&answer=1"}, "следующий тур с ответами") . "] "; } @@ -959,12 +1017,14 @@ sub PrintQuestion { if ($title) { my (%Tour) = GetTournament($dbh, $Question{'ParentId'}); my (%Tournament) = GetTournament($dbh, $Tour{'ParentId'}); + my $fname=$Tournament{'FileName'}; + $fname=~s/\.txt//; $titles .= dd(img({src=>"/icons/folder.open.gif"}) . " " . - a({href=>url . "?tour=$Tournament{'Id'}"}, $Tournament{'Title'}, $Tournament{'PlayedAt'})); + a({href=>url . "?tour=$fname"}, $Tournament{'Title'}, $Tournament{'PlayedAt'})); $titles .= dl(dd(img({src=>"/icons/folder.open.gif"}) . " " . - a({href=>url . "?tour=$Tour{'Id'}"}, $Tour{'Title'}))); + a({href=>url . "?tour=$fname.$Tour{Number}"}, $Tour{'Title'}))); } $output .= dl(strong($titles)); } @@ -1031,13 +1091,18 @@ sub GetQNum { my ($dbh) = @_; my ($sth) = $dbh->prepare("SELECT COUNT(*) FROM Questions"); $sth->execute; - return ($sth->fetchrow)[0]; + my $tmp=($sth->fetchrow)[0]; + $sth->finish; + return $tmp; } sub GetMaxQId { my ($dbh) = @_; my ($sth) = $dbh->prepare("SELECT MAX(QuestionId) FROM Questions"); $sth->execute; - return ($sth->fetchrow)[0]; + my $tmp=($sth->fetchrow)[0]; + $sth->finish; + return $tmp; + } # Returns Id's of 12 random questions @@ -1068,7 +1133,7 @@ sub Get12Random { { push @questions,$i; } - + $sth->finish; for ($i=@questions; --$i;){ my $j=rand ($i+1); @questions[$i,$j]=@questions[$j,$i] unless $i==$j; @@ -1111,7 +1176,7 @@ sub PrintArchive { } sub PrintAll { - my ($dbh, $Id) = @_; + my ($dbh, $Id,$fname) = @_; my ($output, $list, $i); my (%Tournament) = &GetTournament($dbh, $Id); @@ -1123,13 +1188,26 @@ sub PrintAll { if ($Id == 0) { $output = h3("Все турниры"); } else { + my $textid; + if ($textid=$Tournament{'FileName'}) + { + $textid=~s/\.txt//; + } + elsif ($textid=$Tournament{'Number'}) + { + $fname=~s/\.txt//; + $textid="$fname.$textid"; + } + else {$textid=$Tournament{'Id'}}; + + $output .= dd(img({src=>"/icons/folder.gif", alt=>"[*]"}) . - " " . a({href=>url . "?tour=$Tournament{'Id'}&answer=0"}, + " " . a({href=>url . "?tour=$textid&answer=0"}, $Tournament{'Title'}) ." " . $Tournament{'PlayedAt'} . " $New"); } - if ($Id == 0 or $Tournament{'Type'} =~ /Г/) { + if ($Id == 0 or $Tournament{'Type'} =~ /Г/ or $Tournament{'Type'} eq '') { for ($i = 0; $i <= $#Tours; $i++) { - $list .= &PrintAll($dbh, $Tours[$i]); + $list .= &PrintAll($dbh, $Tours[$i],$Tournament{'FileName'}); } $output .= dl($list); } @@ -1240,6 +1318,7 @@ a({href=>url."?authors=surname"},"фамили my $ar=$sth->fetchall_arrayref; + $sth->finish; foreach my $arr(@$ar) @@ -1343,8 +1422,10 @@ EOT elsif (param('qofauthor')){ &PrintQOfAuthor($dbh,param('qofauthor')); } - elsif (param('sstr')) { - &PrintSearch($dbh, param('sstr'), param('metod')); + elsif (param('sstr')||param('was')) { + &PrintSearch($dbh, param('sstr'), param('metod'),param('was')); + $dbh->do("delete from lastqueries where + time_to_sec(now())-time_to_sec(t) >3600") } elsif (param('qid')) { my $qid=param('qid'); @@ -1391,12 +1472,26 @@ $sstr=~s/[^йцукенгшщзхъфывапролджэячсмит } else { $tour = (param('tour')) ? param('tour') : 0; + my $sth; if ($tour !~ /^[0-9]*$/) { - my ($sth) = $dbh->prepare("SELECT Id FROM Tournaments - WHERE FileName = '$tour.txt'"); - $sth->execute; - $tour = ($sth->fetchrow)[0]; - $sth->finish; + if ($tour=~/\./) + { + my ($fname,$n)= split /\./ , $tour; + + $sth = $dbh->prepare( + "SELECT t2.Id FROM Tournaments as t1, + Tournaments as t2 + WHERE t1.FileName = '$fname.txt' + AND t1.Id=t2.ParentId AND t2.Number=$n"); + } + else + { + $sth = $dbh->prepare("SELECT Id FROM Tournaments + WHERE FileName = '$tour.txt'"); + } + $sth->execute; + $tour = ($sth->fetchrow)[0]; + $sth->finish; } print &PrintTournament($dbh, $tour, param('answer')); }