--- db/prgsrc/db.cgi 2001/11/26 10:31:49 1.37 +++ db/prgsrc/db.cgi 2002/01/08 23:15:31 1.57 @@ -2,28 +2,39 @@ use DBI; use CGI ':all'; -use Text::Query; +#use Text::Query; use strict; use Time::Local; use POSIX qw(locale_h); use locale; -#open STDERR, ">errors"; +open STDERR, ">errors1"; my $printqueries=0; my %forbidden=(); my $debug=0; #added by R7 +if (param('debug')) {$debug=1; $printqueries=1} +*STDERR=*STDOUT if $debug; my %fieldname= (0,'Question', 1, 'Answer', 2, 'Comments', 3, 'Authors', 4, 'Sources'); +my %rusfieldname=('Question','Вопрос', 'Answer', 'Ответ', + 'Comments', 'Комментарии', 'Authors', 'Автор', + 'Sources', 'Источник','old','Старый','rus','Новый'); my %searchin; +my $rl=qr/[йцукенгшщзхъфывапролджэячсмитьбюё]/; +my $RL=qr/[ЙЦУКЕНГШЩЗХЪЭЖДЛОРПАВЫФЯЧСМИТЬБЮЁ]/; +my $RLrl=qr/(?:(?:${rl})|(?:${RL}))+/; +my $l=qr/(?:(?:${RLrl})|(?:[\w\-]))+/; +my $Ll=qr/(?:[A-Z])|(?:${RL})/; +my %metodchar=('rus',1,'old',2); my $thislocale; +$searchin{$_}=1 foreach param('searchin'); +my %TypeName=('children'=>'Д', 'game'=>'И', + 'chgk'=>'Ч', 'brain'=>'Б', 'beskrylka'=>'Л','ehruditka'=>'Э'); + + -$searchin{'question'}=param('Question'); -$searchin{'answer'}=param('Answer'); -$searchin{'comment'}=param('Comment'); -$searchin{'authors'}=param('Authors'); -$searchin{'sources'}=param('Sources'); my $all=param('all'); $all=0 if lc $all eq 'no'; my ($PWD) = `pwd`; @@ -64,7 +75,7 @@ sub GetTournament { foreach $name (@{$sth->{NAME}}) { $Tournament{$name} = $arr[$i++]; } - + $sth->finish; return %Tournament; } @@ -85,6 +96,7 @@ sub GetQuestion { $Question{$name} = $arr[$i++]; } + $sth->finish; return %Question; } @@ -94,7 +106,7 @@ sub GetTourQuestions { my (@arr, @Questions); my ($sth) = $dbh->prepare("SELECT QuestionId FROM Questions - WHERE ParentId=$ParentId ORDER BY QuestionId"); + WHERE ParentId=$ParentId"); $sth->execute; @@ -102,6 +114,7 @@ sub GetTourQuestions { push @Questions, $arr[0]; } + $sth->finish; return @Questions; } @@ -118,10 +131,116 @@ sub GetTours { while (@arr = $sth->fetchrow) { push @Tours, $arr[0]; } - + $sth->finish; return @Tours; } +sub count +{ + my ($dbh,$word)=@_; +print "timeb=".time.br if $debug; + $word=$dbh->quote(uc $word); + my $query="SELECT number from nests,nf where $word=w1 AND w2=nf.id"; + my $sth=$dbh->prepare($query); + $sth->execute; + my @a=$sth->fetchrow; +print "timee0=".time.br if $debug; + $sth->finish; + $a[0]||0; +} + + +sub printform +{ + + my $submit=submit(-value=>'Поиск'); + my $inputstring=textfield(-name=>'sstr', + -default=>param('sstr')||'', + -size=>30, + -maxlength=>30); + my $qnumber="Выводить по".br. textfield(-name=>'kvo', + -default=>param('kvo')||'150', + -size=>3, + -maxlength=>5). br."вопросов"; + + my @df=keys %searchin; + @df=('Question', 'Answer') unless @df; + my $fields=checkbox_group('searchin',['Question','Answer','Comments','Authors','Sources'], [@df], + 'false',\%rusfieldname); + + my $metod=radio_group(-name=>'metod',-values=>['old','rus'], + -default=>(param('metod')||'rus'), + -labels=>\%rusfieldname); + my $all=radio_group(-name=>'all',-values=>['yes','no'], + -default=>(param('all')||'no'), + -labels=>{'yes'=>'Все','no'=>'Любое'}); + +################################################# +return start_form(-method=>'get', + -action=>url, + -enctype=> + "application/x-www-form-urlencoded" +).br. +table(Tr +( + td({-valign=>'TOP'},$inputstring.$submit.p."Метод: $metod".p."Слова: $all"), + td({-valign=>'TOP'},(' 'x 8).'Поля:'), + td({-valign=>'TOP'},$fields), td(" "x5), + td({-valign=>'TOP'},$qnumber) +) +) + +#$fields. +#$inputstring.$submit.br.$metod.$all +.endform +.hr + +} + +sub proxy +{ +#print "time0=".time.br if $debug; + my ($dbh,$ptext,$allnf)=@_; + my $text=$$ptext; + $text=~tr/ёЁ/еЕ/; + $text=~s/(${RLrl})p(${RLrl})/$1p$2/gom; + $text=~s/p(${RLrl})/р$1/gom; + $text=~s/(${RLrl})p/$1р/gom; + $text=~s/\s+/ /gmo; + $text=~s/[^йцукенгшщзхъфывапролджэячсмитьбюЙЦУКЕНГШЩЗХЪФЫВАПРОЛДЖЭЯЧСМИТЬБЮQWERTYUIOPASDFGHJKLZXCVBNM0-9]/ /g; + $text=uc $text; + my @list= $text=~m/(?:(?:${RLrl})+)|(?:[A-Za-z0-9]+)/gom; + my (%c, %good,$sstr); + foreach (@list) + { + $c{$_}=count($dbh,$_)||10000; + } + my @words=sort {$c{$a}<=> $c{$b}} @list; + +# $good{$words[$_]}=1 foreach 0..4; + + foreach (@words) + { + $good{$_}=1 if $c{$_}<200; + } + + $good{$words[$_]}=0 foreach 16..$#words; + +# foreach (@list) +# { +# if ($good{$_}) +# { +# $good{$_}=0; +# $sstr.=" $_"; +# } +# } + $sstr.=" $_" foreach grep {$good{$_}} @list; +print "time05=".time.br if $debug; + $$ptext=$sstr; + return russearch($dbh,$sstr,0,$allnf); +} + + sub russearch { my ($dbh, $sstr, $all,$allnf)=@_; my (@qw,@w,@tasks,$qw,@arr,$nf,$sth,@nf,$w,$where,$e,@where,%good,$i,%where,$from); @@ -158,10 +277,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) #есть неопознанные словоформы @@ -192,9 +312,9 @@ print "$query",br if $printqueries; $_= " word2question.word=".$_. ' ' foreach @arr; $_= " nf.id=".$_. ' ' foreach @arr1; - +# @arr=(0) unless @arr; $query="select questions from word2question where". (join ' OR ', @arr); -print "$query\n",br if $printqueries; +print STDERR "!$query\n",br if $printqueries; $sth=$dbh -> prepare($query); $sth->execute; @@ -204,6 +324,7 @@ print "$query\n",br if $printqueries; { @blob=(@blob,unpack 'C*',$arr[0]); } + $sth->finish; $query="select number from nf where ".(join ' OR ', @arr1); print "$query\n",br if $printqueries; $sth=$dbh -> prepare($query); @@ -213,7 +334,7 @@ print "$query\n",br if $printqueries; { $frequence[$i]+=$arr[0]; } - + $sth->finish; if (@blob < 4) @@ -235,7 +356,7 @@ print "$query\n",br if $printqueries; $ii+=4; $number=$lo+$hi*256; $field=$fieldname{$field}; - if ($searchin{lc $field}) + if ($searchin{$field}) { push @{$tasksof{$i}{$number}}, $wordnumber; # дополнили в хэше, висящем на @@ -330,17 +451,35 @@ if $$words{$first}; # Returns list of QuestionId's, that have the search string in them. sub Search { - my ($dbh, $sstr,$metod,$all,$allnf) = @_; + my ($dbh, $s,$metod,$all,$allnf) = @_; + my $sstr=$$s; my (@arr, @Questions, @fields); - my (@sar, $i, $sth,$where); - -# push @fields, 'Question'; + my (@sar, $i, $sth,$where,$query); +# my $ip=$ENV{'REMOTE_ADDR'}; +# $ip=$dbh->quote($ip); +# $query= +# "INSERT into queries (query,metod,searchin,ip) +# values (". $dbh->quote($sstr).', '. +# $dbh->quote($metod) . ', ' . +# $dbh->quote(join ' ', grep $searchin{$_}, keys %searchin) . +# ", $ip)"; +#print $query if $printqueries; +# $dbh -> do ($query); if ($metod eq 'rus') { my @tasks=russearch($dbh,$sstr,$all,$allnf); return @tasks } + elsif ($metod eq 'proxy') + { +# $searchin{'question'}=1; +# $searchin{'answer'}=1; + my @task=proxy($dbh,$s,$allnf); +# $$s=$sstr; + return @task + } + ###Simple and advanced query processing. Added by R7 @@ -362,7 +501,7 @@ sub Search { -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 $debug; @@ -371,10 +510,11 @@ sub Search { ###### { - foreach (qw/Question Answer Sources Authors Comments/) { - if (param($_)) { +# foreach (qw/Question Answer Sources Authors Comments/) { + foreach (param('searchin')) { +# if (param($_)) { push @fields, "IFNULL($_, '')"; - } +# } } @sar = split " ", $sstr; for $i (0 .. $#sar) { @@ -395,14 +535,14 @@ sub Search { print $query if $printqueries; $sth = $dbh->prepare($query) - } #else -- processing old-style query (R7) $sth->execute; while (@arr = $sth->fetchrow) { push @Questions, $arr[0] unless $forbidden{$arr[0]}; } - + $sth->finish; +print "@Questions" if $printqueries; return @Questions; } @@ -411,7 +551,7 @@ print $query if $printqueries; пП рР сС тТ уУ фФ хХ цЦ чЧ шШ щЩ ьЬ ыЫ эЭ юЮ яЯ/; sub NoCase { - my ($sstr) = shift; + my ($sstr) = shift; my ($res); if (($res) = grep(/$sstr/, @letters)) { @@ -421,14 +561,139 @@ sub NoCase { } } +sub PrintList { + my ($dbh,$Questions,$shablon,$was)=@_; + + my $first=param('first') ||1; + my $kvo=param('kvo') ||150; + + $first=$first-($first-1)%$kvo; + my $last=$first+$kvo-1; + $last=scalar @$Questions if scalar @$Questions <$last; + my($f,$l); + my $nav=''; + my $qs=query_string; + $qs=~s/\;/\&/g; + $qs=~s/\&first\=[^\&]+//g; + my $sstr=param('sstr'); + $qs=~s/sstr=[^\&]+/sstr=$sstr/; + $qs=~s/\&was=[^\&]+//; + $qs.="&was=$was"; + if ($first>$kvo*3+1) + { + $nav.= + (" "x4). + a({href=>url."?".$qs."\&first=1"},"<<").(" "x4). + a({href=>(url."?".$qs."\&first=".($first-$kvo))},"<").(" "x4) + } + + else {$nav.=' 'x15;} + + my ($fprint,$lprint); + my $llprint=$#$Questions- ($#$Questions+1)%$kvo+2; + if ($#$Questions+1<=$kvo*7) + { $fprint=1; + $lprint=$llprint; + } + elsif ($first>$kvo*3 && $#$Questions+1-$first>$kvo*3) + { + $fprint=$first-$kvo*3; + $lprint=$first+$kvo*3; + } + elsif ($first<=$kvo*3) + { + $fprint=1; $lprint=6*$kvo+1; + } + else + { + $lprint=$llprint; + $fprint=$lprint-$kvo*6 + } + +# my $fprint=($first>$kvo*3) ? $first-$kvo*3 : 1; +# my $lprint=$#$Questions+1-$fprint>$kvo*7 ? $kvo*7 :$#$Questions+1; +# if ($lprint-$fprint<$kvo*6 && $fprint>1) +# { +# $fprint=$lprint-$kvo*6; +# $fprint=1 if ($fprint<=0) +# } + + + + for($f=$fprint; $f<=$lprint; $f+=$kvo) + { +# next if $first-$f>$kvo*3; + $l=$f+$kvo-1; + $l=$#$Questions+1 if $l>$#$Questions+1; + if ($f==$first) {$nav.="[$f-$l] ";} + else { + $nav.= "[".a({href=>(url."?".$qs."\&first=$f")},"$f-$l")."] ";} + } + if ($lprint+$kvo<$#$Questions) + { + $nav.= + (" "x4). + a({href=>(url."?".$qs."\&first=".($first+$kvo))},">").(" "x4). + a({href=>url."?".$qs."\&first=$llprint"},">>").(" "x4) + } + + + print "$nav".br."\n"; + for (my $i = $first; $i <= $last; $i++) { + my $output = &PrintQuestion($dbh, $$Questions[$i-1], 1, $i, 1); + if (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; + } + + + print "$nav".br."\n"; + +} + sub PrintSearch { - my ($dbh, $sstr, $metod) = @_; + my ($dbh, $sstr, $metod,$was) = @_; + my $t=time; + print h2("Поиск в базе вопросов"); + print printform; my @allnf; - my (@Questions) = &Search($dbh, $sstr,$metod,$all,\@allnf); + my @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)); + my $ss=200; + do + { + $was=int rand(32000); + } + while (--$ss && (!$dbh->do ("insert into lastqueries (id,sstr,questions,allnf) + values ($was, $qsstr,$tmp,$nf)"))); + print "Something is wrong...".br unless $ss; + } + + + + print p. "Время поиска: " . (time-$t) ." сек.".p; my ($output, $i, $suffix, $hits) = ('', 0, '', $#Questions + 1); my $shablon; - + $metod='rus' if $metod eq 'proxy'; if ($metod eq 'rus') { my $where='0'; @@ -443,11 +708,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; + } @@ -469,18 +736,13 @@ print "$query" if $printqueries; $sstr =~ s/(.)/&NoCase($1)/ge; - my(@sar) = split(' ', $sstr); - for ($i = 0; $i <= $#Questions; $i++) { - $output = &PrintQuestion($dbh, $Questions[$i], 1, $i + 1, 1); - if (param('metod') eq 'rus') - { - $output=~s/\b($shablon)\b/\$1\<\/strong\>/gi; - } else { - foreach (@sar) { - $output =~ s/$_/$&<\/strong>/gs; - }} - print $output; + my @sar; + if ($metod ne 'rus') + { + (@sar) = split(' ', $sstr); + $shablon=join "|",@sar; } + PrintList($dbh,\@Questions,$shablon,$was); } sub PrintRandom { @@ -504,6 +766,13 @@ sub PrintRandom { return $output; } +sub PrintEditor { + my $t=shift; #ссылка на Хэш с полями + my $ed=$$t{'Editors'}; + my $edname=($ed=~/\,/ ) ? "Редакторы" : "Редактор" ; + return $ed? h4({align=>"center"},"$edname: $ed" ): ''; +} + sub PrintTournament { my ($dbh, $Id, $answer) = @_; my (%Tournament, @Tours, $i, $list, $qnum, $imgsrc, $alt, @@ -515,9 +784,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 { @@ -537,6 +807,7 @@ sub PrintTournament { $output .= h2({align=>"center"}, "$title") . p . "\n"; + $output.=&PrintEditor(\%Tournament); last; }; /Т/ && do { @@ -571,22 +842,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); } @@ -603,10 +887,11 @@ sub PrintTournament { $output .= p("Копирайт: " . $Copyright); } + + if ($Info) { $output .= p($Info); } - return $output; } @@ -619,11 +904,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 @@ -639,6 +936,8 @@ sub PrintTour { return 0 if ($Tour{'Type'} !~ /Т/); + my ($fname)=$Tournament{'FileName'}; + $fname=~s/\.txt//; my ($qnum) = $Tour{'QuestionsNum'}; my ($suffix) = &Suffix($qnum); @@ -646,6 +945,7 @@ sub PrintTour { $Tournament{'PlayedAt'}, "
", $Tour{"Title"} . " ($qnum вопрос$suffix)\n") . p; + $output .=&PrintEditor(\%Tour); my (@Questions) = &GetTourQuestions($dbh, $Id); for ($q = 0; $q <= $#Questions; $q++) { @@ -668,25 +968,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"}, "следующий тур с ответами") . "] "; } @@ -714,19 +1014,20 @@ sub PrintField { sub PrintQuestion { my ($dbh, $Id, $answer, $qnum, $title, $text) = @_; my ($output, $titles) = ('', ''); - my (%Question) = &GetQuestion($dbh, $Id); if (!$text) { $output .= hr({width=>"50%"}); if ($title) { my (%Tour) = GetTournament($dbh, $Question{'ParentId'}); my (%Tournament) = GetTournament($dbh, $Tour{'ParentId'}); + my $fname=$Tournament{'FileName'}; + $fname=~s/\.txt//; $titles .= dd(img({src=>"/icons/folder.open.gif"}) . " " . - a({href=>url . "?tour=$Tournament{'Id'}"}, $Tournament{'Title'}, $Tournament{'PlayedAt'})); + a({href=>url . "?tour=$fname"}, $Tournament{'Title'}, $Tournament{'PlayedAt'})); $titles .= dl(dd(img({src=>"/icons/folder.open.gif"}) . " " . - a({href=>url . "?tour=$Tour{'Id'}"}, $Tour{'Title'}))); + a({href=>url . "?tour=$fname.$Tour{Number}"}, $Tour{'Title'}))); } $output .= dl(strong($titles)); } @@ -744,32 +1045,31 @@ sub PrintQuestion { 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; -# $other.=a({href=>url."?qofauthor=$AuthorId"},"$Name $Surname").". "; - $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.Id,Name, Surname, Nicks from Authors, A2Q +# where Authors.Id=Author And Question=$Id"); +# $sth->execute; +# my ($AuthorId,$Name, $Surname,$other,$Nicks); + +# while ((($AuthorId,$Name, $Surname,$Nicks)=$sth->fetchrow),$AuthorId) +# { +# my ($firstletter)=$Name=~m/^./g; +# $Name=~s/\./\\\./g; +# my $sha="(?:$Name\\s+$Surname)|(?:$Surname\\s+$Name)|(?:$firstletter\\.\\s*$Surname)|(?:$Surname\\s+$firstletter\\.)|(?:$Surname)|(?:$Name)"; +# if ($Nicks) +# { +# $Nicks=~s/^\|//; +# foreach (split /\|/, $Nicks) +# { +# s/\s+/ /g; +# s/\s+$//; +# s/ /\\s+/g; +# s/\./\\\./g; +# if (s/>$//) {$sha="$sha|(?:$_)"} +# else {$sha="(?:$_)|$sha"} +# } +# } +# $q=~s/($sha)/a({href=>url."?qofauthor=$AuthorId"},$1)/ei; +# } $output .= &PrintField("Автор(ы)", $q, $text); @@ -784,6 +1084,8 @@ sub PrintQuestion { $output .= &PrintField("Комментарии", $Question{'Comments'}, $text); } } +# $output.=br.a({href=> url."?metod=proxy&qid=$Id"}, 'Близкие вопросы').p +# if $answer; return $output; } @@ -792,13 +1094,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 @@ -809,17 +1116,31 @@ sub Get12Random { my (%chosen); srand; - for ($i = 0; $i < $num; $i++) { - do { - $q = int(rand($qnum)); - $sth = $dbh->prepare("SELECT Type FROM Questions - WHERE QuestionId=$q"); - $sth->execute; - $t = ($sth->fetchrow)[0]; - } until !$chosen{$q} && $t && $type =~ /[$t]/; - $chosen{$q} = 'y'; - push @questions, $q; + my $where=0; + my $r=int (rand(10000)); + + foreach (split '', $type) + { + $where.= " OR (Type ='$_') OR (Type ='$_Д') "; + } + $where.= "OR (Type='ЧБ')" if ($type=~/Ч|Б/); + + $q="select QuestionId, QuestionId/$r-floor(QuestionId/$r) as val + from Questions where $where order by val limit $num"; + +# Когда на куличках появится mysql >=3.23 надо заменить на order by rand(); + + $sth=$dbh->prepare($q); + $sth->execute; + while (($i)=$sth->fetchrow) + { + push @questions,$i; } + $sth->finish; + for ($i=@questions; --$i;){ + my $j=rand ($i+1); + @questions[$i,$j]=@questions[$j,$i] unless $i==$j; + } return @questions; } @@ -858,7 +1179,7 @@ sub PrintArchive { } sub PrintAll { - my ($dbh, $Id) = @_; + my ($dbh, $Id,$fname) = @_; my ($output, $list, $i); my (%Tournament) = &GetTournament($dbh, $Id); @@ -870,13 +1191,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); } @@ -908,12 +1242,14 @@ sub PrintDates { " " . a({href=>url . "?tour=$Tournament{'Id'}&answer=0"}, $Tournament{'Title'}, $Tournament{'PlayedAt'})); } + $sth->finish; $output .= dl($list); return $output; } sub PrintQOfAuthor { + my ($dbh, $id) = @_; $id=$dbh->quote($id); my $sth = $dbh->prepare("SELECT Name, Surname FROM Authors WHERE Id=$id"); @@ -926,6 +1262,7 @@ sub PrintQOfAuthor my @Questions; while (($q)=$sth->fetchrow,$q) {push @Questions,$q unless $forbidden{$q}} + $sth->finish; my ($output, $i, $suffix, $hits) = ('', 0, '', $#Questions + 1); @@ -936,15 +1273,17 @@ sub PrintQOfAuthor } else { $suffix = 'я'; } - + print h2("Поиск в базе вопросов"); + print printform; print p({align=>"center"}, "Автор ".strong("$name $surname. ") . " : $hits попадани$suffix."); - for ($i = 0; $i <= $#Questions; $i++) { - $output = &PrintQuestion($dbh, $Questions[$i], 1, $i + 1, 1); - print $output; - } +# for ($i = 0; $i <= $#Questions; $i++) { +# $output = &PrintQuestion($dbh, $Questions[$i], 1, $i + 1, 1); +# print $output; +# } + PrintList($dbh,\@Questions,'gdfgdfgdfgdfg'); } @@ -982,6 +1321,7 @@ a({href=>url."?authors=surname"},"фамили my $ar=$sth->fetchall_arrayref; + $sth->finish; foreach my $arr(@$ar) @@ -997,6 +1337,7 @@ a({href=>url."?authors=surname"},"фамили } } $output.=""; + $sth->finish; return $output; } @@ -1025,6 +1366,7 @@ MAIN: print &Include_virtual("../dimrub/db/reklama.html"); } + if ($^O =~ /win/i) { $thislocale = "Russian_Russia.20866"; } else { @@ -1052,17 +1394,18 @@ if ((uc 'а') ne 'А') {print "Koi8-r loca if (param('rand')) { my ($type, $qnum) = ('', 12); - $type .= 'Б' if (param('brain')); - $type .= 'Ч' if (param('chgk')); + $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 <Reload для получения еще одного пакета"; } else { print &PrintRandom($dbh, $type, $qnum, $text); @@ -1082,9 +1425,29 @@ EOT elsif (param('qofauthor')){ &PrintQOfAuthor($dbh,param('qofauthor')); } - elsif (param('sstr')) { - &PrintSearch($dbh, param('sstr'), param('metod')); - } elsif (param('all')) { + elsif (param('sstr')||param('was')) { + &PrintSearch($dbh, param('sstr'), param('metod'),param('was')); + $dbh->do("delete from lastqueries where + (TO_DAYS(NOW()) - TO_DAYS(t) >= 2) OR + (time_to_sec(now())-time_to_sec(t) >3600)") + } + elsif (param('qid')) { + my $qid=param('qid'); + my $query="SELECT Question, Answer from Questions where QuestionId=$qid"; +print $query if $printqueries; + my $sth=$dbh->prepare($query); + $sth->execute; + my $sstr= join ' ',$sth->fetchrow; + $sth->finish; + $searchin{'Question'}=1; + $searchin{'Answer'}=1; + $sstr=~tr/ёЁ/еЕ/; +$sstr=~s/[^йцукенгшщзхъфывапролджэячсмитьбюЙЦУКЕНГШЩЗХЪФЫВАПРОЛДЖЭЯЧСМИТЬБЮa-zA-Z0-9]/ /gi; +# print &PrintQuestion($dbh,$qid, 1, '!'); + &PrintSearch($dbh, $sstr, 'proxy'); + } + + elsif (param('all')) { print &PrintAll($dbh, 0); } elsif (param('from_year') && param('to_year')) { print &PrintDates($dbh); @@ -1113,11 +1476,26 @@ EOT } else { $tour = (param('tour')) ? param('tour') : 0; + my $sth; if ($tour !~ /^[0-9]*$/) { - my ($sth) = $dbh->prepare("SELECT Id FROM Tournaments - WHERE FileName = '$tour.txt'"); - $sth->execute; - $tour = ($sth->fetchrow)[0]; + if ($tour=~/\./) + { + my ($fname,$n)= split /\./ , $tour; + + $sth = $dbh->prepare( + "SELECT t2.Id FROM Tournaments as t1, + Tournaments as t2 + WHERE t1.FileName = '$fname.txt' + AND t1.Id=t2.ParentId AND t2.Number=$n"); + } + else + { + $sth = $dbh->prepare("SELECT Id FROM Tournaments + WHERE FileName = '$tour.txt'"); + } + $sth->execute; + $tour = ($sth->fetchrow)[0]; + $sth->finish; } print &PrintTournament($dbh, $tour, param('answer')); }