--- db/prgsrc/db.cgi 2001/05/17 03:57:32 1.19 +++ db/prgsrc/db.cgi 2003/01/27 13:04:25 1.86 @@ -2,26 +2,62 @@ use DBI; use CGI ':all'; -use Text::Query; use strict; use Time::Local; use POSIX qw(locale_h); -my $debug=1; #added by R7 -open STDERR, ">/tmp/errors" if $debug; +use locale; +open STDERR, ">/var/tmp/errors1"; +my $newsurl='http://news.chgk.info/'; +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','Новый', + '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'=>'Э'); + + + +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 ($SRCPATH) = "/home/piataev/public_html/dimrub/src"; +my ($ZIP) = "/usr/local/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 { @@ -46,7 +82,7 @@ sub GetTournament { foreach $name (@{$sth->{NAME}}) { $Tournament{$name} = $arr[$i++]; } - + $sth->finish; return %Tournament; } @@ -67,6 +103,7 @@ sub GetQuestion { $Question{$name} = $arr[$i++]; } + $sth->finish; return %Question; } @@ -75,8 +112,8 @@ 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; @@ -84,6 +121,7 @@ sub GetTourQuestions { push @Questions, $arr[0]; } + $sth->finish; return @Questions; } @@ -100,85 +138,483 @@ 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 $qnumber=(" "x10)."Выводить по ". textfield(-name=>'kvo', + -default=>param('kvo')||'150', + -size=>3, + -maxlength=>5)." вопросов"; + my $sstr=param('sstr'); + my @df=keys %searchin; + my %checked; + @df=('Question', 'Answer') unless @df; + $checked{lc $_}="checked" foreach @df; + my $fields=checkbox_group('searchin',['Question','Answer','Comments','Authors','Sources'], [@df], + 'false',\%rusfieldname); + @df=param('type'); + @df=('chgk','brain','igp','game','ehruditka','beskrylka') unless @df; + $checked{lc $_}="checked" foreach @df; + $checked{'all'}=param('all')?"checked":""; + $checked{'any'}=param('all')?"":"checked"; + $checked{lc param('metod')}="checked"; + $checked{'russian'}=1 unless $checked{'russian'} || $checked{'old'}; + +################################################# +return +< +

Поиск в базе данных

+ + + $qnumber +

+ + + + + + + + + + + + + +
Вариант поиска: + + Простой (старый) + + "Что? Где? Когда?" + + "Брейн-Ринг" + + "Интернет" +
+ "Своя игра" + + "Эрудитка" + + "Бескрылка" +
Расширенный (с учетом грамматики, в вопросах всех типов) +
Искать: + +Все слова + +Любое слово +
Поля для поиска: + +Вопрос + +Ответ
+		 +Комментарии
+		 +Автор
+		 +Источник
+
+ + +EOT +.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); + my($number,@good,$t,$task,@rho,$rank,%rank,$r2,$r1,$word,$n,@last,$good,@words,%number,$taskid); + my ($hi, $lo, $wordnumber,$query,$blob,$field,$sf,$ii); + my @frequence; + my (@arr1,@ar,@sf,@arr2); + my %tasks; + my $tasks; + my @verybad; + my %nf; + my %tasksof; + my %wordsof; + my %relevance; + my @blob; + my %count; + +$sstr=~tr/йцукенгшщзхъфывапролджэячсмитьбю/ЙЦУКЕНГШЩЗХЪФЫВАПРОЛДЖЭЯЧСМИТЬБЮ/; + @qw=@w =split (' ', uc $sstr); + +#----------- + foreach $i (0..$#w) # заполняем массив @nf начальных форм + # $nf[$i] -- ссылка на массив возможных + # начальных форм словоформы $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]}=(); + while (@arr = $sth->fetchrow) + { + push (@{$nf[$i]},$arr[0]) + } + $sth->finish; + } + + + my @bad=grep {!@{$nf[$_]}} 0..$#w; # @bad -- номера словоформ, + # которых нет в словаре + + if (@bad) #есть неопознанные словоформы + { + require "cw.pl"; + foreach $i(@bad) + { + if (@arr=checkword($dbh,$w[$i])) + {push (@{$nf[$i]}, @arr);} + else + {push (@verybad,$i);} + } + } + return () if ($all && @verybad); + + + my $kvo=0; + push @$allnf, @{$_} foreach @nf; + print "nf=@$allnf" if $printqueries; + + foreach $i (0..$#w) #запросы в базу... + { + @arr=@{$nf[$i]} if $nf[$i]; + @arr2=@arr1=@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; + + $sth=$dbh -> prepare($query); + $sth->execute; + + @blob=(); + while (@arr=$sth->fetchrow) + { + @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; + + while (@arr=$sth->fetchrow) + { + $frequence[$i]+=$arr[0]; + } + $sth->finish; + + + if (@blob < 4) + { + $tasksof{$i}=undef; + } else + { + $kvo++; + $ii=0; + while ($ii<$#blob) # создаём хэш %tasksof, ключи которого -- + # номера искомых словоформ, а значения -- + # списки вопросов, в которых есть соответствующа + # словоформа. + # Каждый список в свою очередь также оформлен в + # виде хэша, ключи которого -- номера вопросов, + # а значения -- списки номеров вхождений. Вот. + { + ($field,$lo,$hi,$wordnumber)=@blob[$ii..($ii+3)]; + $ii+=4; + 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 список + # вхождений $i в вопрос $number. + push @{$wordsof{$number}{$i}}, $wordnumber; + # дополнили в хэше, висящем на + # вопросе $number в %wordsof список + # вхождений $i в вопрос $number. + + + } + } #while ($ii<$#blob) + } + } #foreach $i + +#print "keys tasksof", join ' ', keys %{$tasksof{0}}; +#Ищем пересечение или объединение списков вопросов (значений %tasksof) + foreach $sf (keys %tasksof) + { + $count{$_}++ foreach keys %{$tasksof{$sf}}; + } + @tasks= ($all ? (grep {$count{$_}==$kvo} keys %count) : + keys %count) ; + + +print "\n\$#tasks=",$#tasks,br if $printqueries; +############ Сортировка найденных вопросов + +foreach (keys %wordsof) +{ + $relevance{$_}=&relevance($#w,$wordsof{$_},\@frequence) if $_ +} + +@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; +} + + +sub distance { + # на входе -- номера словоформ и ссылки на + # списки вхождений. На выходе -- расстояние, + # вычисляемое по формуле min(|b-a-pb+pa|) + # pb,pa + # (pb и pa -- позиции слов b и a) + my ($a,$b,$lista,$listb)=@_; + my ($pa,$pb,$min,$curmin); + $min=10000; + foreach $pa (@$lista) + { + foreach $pb (@$listb) + { + $curmin=abs($b-$a-$pb+$pa); + $min= $curmin if $curmin<$min; + } + } + return $min; + +} + +sub relevance { + # На входе -- количество искомых словоформ -1 и + # ссылка на hash, ключи которого -- + # номера словоформ, а значения -- списки вхождений + + my ($n,$words,$frequence)=@_; + my $relevance=0; + my ($first,$second,$d); + foreach $first (0..$n) + { + $relevance+=scalar @{$$words{$first}}+1000+1000/$$frequence[$first] +if $$words{$first}; + foreach $second ($first+1..$n) + { + $d=&distance($first,$second,$$words{$first},$$words{$second}); + $relevance+=($d>10?0:10-$d)*10; + } + } + return $relevance; +} + + # Returns list of QuestionId's, that have the search string in them. sub Search { - my ($dbh, $sstr, $metod) = @_; + my ($dbh, $s,$metod,$all,$allnf) = @_; + my $sstr=$$s; my (@arr, @Questions, @fields); - my (@sar, $i, $sth,$where); + 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 + } + -# push @fields, 'Question'; ###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 Sources Authors Comments/) { if (param($_)) { - push @fields, $_; + push @fields, $_; } - } + } @fields=(qw/Question Answer 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 $debug; $sth = $dbh->prepare($query); } else -###### +###### { - - 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) { $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; } - - $sth = $dbh->prepare("SELECT QuestionId FROM Questions - WHERE $f LIKE $sstr ORDER BY QuestionId"); + + my $query; + $query="SELECT QuestionId FROM Questions + WHERE ($f LIKE $sstr) AND (".&makewhere.") ORDER BY QuestionId"; + +print $query if $printqueries; + $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; +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/аА бБ вВ гГ дД еЕ жЖ зЗ иИ йЙ кК лЛ мМ нН оО + my (@letters) = qw/аА бБ вВ гГ дД еЕ жЖ зЗ иИ йЙ кК лЛ мМ нН оО пП рР сС тТ уУ фФ хХ цЦ чЧ шШ щЩ ьЬ ыЫ эЭ юЮ яЯ/; - + sub NoCase { - my ($sstr) = shift; + my ($sstr) = shift; my ($res); if (($res) = grep(/$sstr/, @letters)) { @@ -188,19 +624,172 @@ 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, 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; + } + + + print "$nav".br."\n"; + +} + sub PrintSearch { - my ($dbh, $sstr, $metod) = @_; - my (@Questions) = &Search($dbh, $sstr,$metod); + my ($dbh, $sstr, $metod,$was) = @_; + my $t=time; +# print h2("Поиск в базе вопросов"); + print printform; + my @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 'L*',$q; + @allnf=unpack 'L*',$nf; + $sth->finish; + } else + { + @Questions=&Search($dbh, \$sstr,$metod,$all,\@allnf); + my $tmp=$dbh->quote(pack("L*",@Questions)); + 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) + 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'; + $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; + while (my @arr = $sth->fetchrow) + { + 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; + + } + + + if ($hits =~ /1.$/ || $hits =~ /[5-90]$/) { $suffix = 'й'; } elsif ($hits =~ /1$/) { $suffix = 'е'; } else { - $suffix = 'я'; + $suffix = 'я'; } - + print p({align=>"center"}, "Результаты поиска на " . strong($sstr) . " : $hits попадани$suffix."); @@ -208,20 +797,23 @@ sub PrintSearch { $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); - 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; } + PrintList($dbh,\@Questions,$shablon,$was); } sub PrintRandom { my ($dbh, $type, $num, $text) = @_; + my $razd=param('razd'); + my $answer=$razd?0:1; my (@Questions) = &Get12Random($dbh, $type, $num); my ($output, $i) = ('', 0); @@ -235,10 +827,26 @@ sub PrintRandom { 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); + $output .= + &PrintQuestion($dbh, $Questions[$i], $answer, $i + 1, 0, $text); } - return $output; + unless ($answer ) + { + $output.=$text?"\n".('-'x 20)."\nОтветы\n~~~~~~\n\n":h2('Ответы'); + for ($i = 0; $i <= $#Questions; $i++) { + $output .= + &PrintQuestion($dbh, $Questions[$i], -1, $i + 1, 0, $text); + } + } + + return $output; +} + +sub PrintEditor { + my $t=shift; #ссылка на Хэш с полями + my $ed=$$t{'Editors'}||''; + my $edname=($ed=~/\,/ ) ? "Редакторы" : "Редактор" ; + return $ed? h4({align=>"center"},"$edname: $ed" ): ''; } sub PrintTournament { @@ -248,32 +856,36 @@ sub PrintTournament { my ($output) = ''; %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'}; @Tours = &GetTours($dbh, $Id); - + $list=''; + my $textid; if ($Id) { for ($Tournament{'Type'}) { /Г/ && do { - $output .= h2({align=>"center"}, + $output .= h2({align=>"center"}, "Группа: $Tournament{'Title'} ", - "$Tournament{'PlayedAt'}") . p . "\n"; + $Tournament{'PlayedAt'}||'') . p . "\n"; 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"}, + $output .= h2({align=>"center"}, "$title") . p . "\n"; + $output.=&PrintEditor(\%Tournament); last; }; /Т/ && do { @@ -282,12 +894,13 @@ sub PrintTournament { } } else { my ($qnum) = GetQNum($dbh); - $output .= h2("Банк Вопросов: $qnum вопросов") . p . "\n"; + $output .= h2("Банк Вопросов: $qnum вопрос".&Suffix($qnum)) + . p . "\n"; } - 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'}); @@ -301,6 +914,7 @@ sub PrintTournament { $qnum = ''; } if ($Tournament{'Type'} =~ /Г/) { + $SingleTour=0; $imgsrc = "/icons/folder.gif"; $alt = "[*]"; } else { @@ -308,31 +922,45 @@ 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) . + $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"}, - 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=>url . "?tour=$textid&answer=0"}, + $Tournament{'Title'}. " ". + $Tournament{'PlayedAt'}||'') . $qnum); } } $output .= dl($list); if ($URL) { + if (url=~/zaba\.ru/ && $URL=~/^\//){$URL="http://info.chgk.info$URL"} $output .= - p("Дополнительная информация об этом турнире - по адресу " . + p("Дополнительная информация об этом турнире - по адресу " . a({-'href'=>$URL}, $URL)); } @@ -340,10 +968,11 @@ sub PrintTournament { $output .= p("Копирайт: " . $Copyright); } + + if ($Info) { $output .= p($Info); } - return $output; } @@ -356,11 +985,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 @@ -376,24 +1017,27 @@ sub PrintTour { 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'}||'', + "
", $Tour{"Title"} . " ($qnum вопрос$suffix)\n") . p; + $output .=&PrintEditor(\%Tour); my (@Questions) = &GetTourQuestions($dbh, $Id); for ($q = 0; $q <= $#Questions; $q++) { $output .= &PrintQuestion($dbh, $Questions[$q], $answer, 0); - } + } $output .= hr({-'align'=>'center', -'width'=>'80%'}); if ($Tournament{'URL'}) { $output .= - p("Дополнительная информация об этом турнире - по адресу " . + p("Дополнительная информация об этом турнире - по адресу " . a({-'href'=>$Tournament{'URL'}}, $Tournament{'URL'})); } @@ -404,26 +1048,26 @@ sub PrintTour { if ($Tournament{'Info'}) { $output .= p($Tournament{'Info'}); } - + my $n=$Tour{'Number'}; if ($answer == 0) { - $bottom .= - "[" . a({href=>url . "?tour=$Id&answer=1"}, "ответы") . "] " . br; + $bottom .= + "[" . a({href=>url . "?tour=$fname.$n&answer=1"}, "ответы") . "] " . br; } - if (&IsTour($dbh, $Id - 1)) { - $bottom .= - "[" . a({href=>url . "?tour=" . ($Id - 1) . "&answer=0"}, + if ($n>1) { + $bottom .= + "[" . a({href=>url . "?tour=$fname." . ($n - 1) . "&answer=0"}, "предыдущий тур") . "] "; - $bottom .= - "[" . a({href=>url . "?tour=" . ($Id - 1) . "&answer=1"}, + $bottom .= + "[" . a({href=>url . "?tour=$fname." . ($n - 1) . "&answer=1"}, "предыдущий тур с ответами") . "] " . br; } - if (&IsTour($dbh, $Id + 1)) { - $bottom .= - "[" . a({href=>url . "?tour=" . ($Id + 1) . "&answer=0"}, + if (&IsTour($dbh, $Tour{'ParentId'}, $n + 1)) { + $bottom .= + "[" . a({href=>url . "?tour=$fname." . ($n + 1) . "&answer=0"}, "следующий тур") . "] "; - $bottom .= - "[" . a({href=>url . "?tour=" . ($Id + 1) . "&answer=1"}, + $bottom .= + "[" . a({href=>url . "?tour=$fname." . ($n + 1) . "&answer=1"}, "следующий тур с ответами") . "] "; } @@ -436,51 +1080,120 @@ sub PrintTour { sub PrintField { my ($header, $value, $text) = @_; if ($text) { - $value =~ s/<[\/\w]*>//sg; + $value =~ s/<[\/\w]*?>//sg; } else { $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;
 	}
-	return $text ? "$header:\n$value\n\n" : 
+
+
+	return $text ? "$header:\n$value\n\n" :
 		strong("$header: ") . $value . p . "\n";
 }
 
-# Gets a DB handler (ofcourse) and a question Id. Prints 
+# 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 ($output, $titles) = ('', '');
-
 	my (%Question) = &GetQuestion($dbh, $Id);
+	$qnum = $Question{'Number'}
+		if ($qnum == 0);
 	if (!$text) {
-		$output .= hr({width=>"50%"});
+		$output .= hr({width=>"50%"}) if $answer>=0;
 		if ($title) {
 			my (%Tour) = GetTournament($dbh, $Question{'ParentId'});
 			my (%Tournament) = GetTournament($dbh, $Tour{'ParentId'});
+			my $fname=$Tournament{'FileName'};
+#return "" if $fname=~/mgp0203/;
+			$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}#$qnum"}, $Tour{'Title'})));
 		}
 		$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{'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);
+                      if (!$text) {
+                       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);
+
+		}
+
+		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/