--- db/prgsrc/db.cgi 2001/11/26 10:31:49 1.37 +++ db/prgsrc/db.cgi 2001/12/10 21:28:33 1.48 @@ -2,28 +2,38 @@ 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} 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 $thislocale; +my $thislocale; -$searchin{'question'}=param('Question'); -$searchin{'answer'}=param('Answer'); -$searchin{'comment'}=param('Comment'); -$searchin{'authors'}=param('Authors'); -$searchin{'sources'}=param('Sources'); +$searchin{$_}=1 foreach param('searchin'); +#$searchin{'Question'}=param('Question'); +#$searchin{'Answer'}=param('Answer'); +#$searchin{'Comments'}=param('Comments'); +#$searchin{'Authors'}=param('Authors'); +#$searchin{'Sources'}=param('Sources'); my $all=param('all'); $all=0 if lc $all eq 'no'; my ($PWD) = `pwd`; @@ -122,6 +132,105 @@ sub GetTours { 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; + $a[0]||0; +} + + +sub printform +{ + + my $submit=submit(-value=>'Поиск'); + my $inputstring=textfield(-name=>'sstr', + -default=>param('sstr')||'', + -size=>30, + -maxlength=>30); + 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) +) +) + +#$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); @@ -161,7 +270,7 @@ print "$query",br if $printqueries; } - my @bad=grep {!$nf[$_]} 0..$#w; # @bad -- номера словоформ, + my @bad=grep {!@{$nf[$_]}} 0..$#w; # @bad -- номера словоформ, # которых нет в словаре if (@bad) #есть неопознанные словоформы @@ -192,9 +301,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; @@ -235,7 +344,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 +439,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 +489,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 +498,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,7 +523,6 @@ sub Search { print $query if $printqueries; $sth = $dbh->prepare($query) - } #else -- processing old-style query (R7) $sth->execute; @@ -403,6 +530,7 @@ print $query if $printqueries; push @Questions, $arr[0] unless $forbidden{$arr[0]}; } +print "@Questions" if $printqueries; return @Questions; } @@ -411,7 +539,7 @@ print $query if $printqueries; пП рР сС тТ уУ фФ хХ цЦ чЧ шШ щЩ ьЬ ыЫ эЭ юЮ яЯ/; sub NoCase { - my ($sstr) = shift; + my ($sstr) = shift; my ($res); if (($res) = grep(/$sstr/, @letters)) { @@ -421,14 +549,108 @@ sub NoCase { } } +sub PrintList { + my ($dbh,$Questions,$shablon)=@_; + + my $first=param('first') ||1; + my $kvo=param('kvo') ||30; + + $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; + + + 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) = @_; + print h2("Поиск в базе вопросов"); + print printform; my @allnf; - my (@Questions) = &Search($dbh, $sstr,$metod,$all,\@allnf); + my (@Questions) = &Search($dbh, \$sstr,$metod,$all,\@allnf); my ($output, $i, $suffix, $hits) = ('', 0, '', $#Questions + 1); my $shablon; - + $metod='rus' if $metod eq 'proxy'; if ($metod eq 'rus') { my $where='0'; @@ -469,18 +691,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); } sub PrintRandom { @@ -714,7 +931,6 @@ 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%"}); @@ -744,32 +960,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 +999,8 @@ sub PrintQuestion { $output .= &PrintField("Комментарии", $Question{'Comments'}, $text); } } +# $output.=br.a({href=> url."?metod=proxy&qid=$Id"}, 'Близкие вопросы').p +# if $answer; return $output; } @@ -914,6 +1131,7 @@ sub PrintDates { sub PrintQOfAuthor { + my ($dbh, $id) = @_; $id=$dbh->quote($id); my $sth = $dbh->prepare("SELECT Name, Surname FROM Authors WHERE Id=$id"); @@ -936,15 +1154,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'); } @@ -1025,6 +1245,7 @@ MAIN: print &Include_virtual("../dimrub/db/reklama.html"); } + if ($^O =~ /win/i) { $thislocale = "Russian_Russia.20866"; } else { @@ -1084,7 +1305,23 @@ EOT } elsif (param('sstr')) { &PrintSearch($dbh, param('sstr'), param('metod')); - } elsif (param('all')) { + } + 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; + $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);