--- db/prgsrc/db.cgi 2003/12/19 01:44:47 1.126 +++ db/prgsrc/db.cgi 2009/06/20 12:21:02 1.153 @@ -2,23 +2,40 @@ use DBI; use CGI ':all'; -use strict; +#use strict; +use Encode; +my @softfields=("От Олега Степанова"); use Time::Local; +use Data::Dumper "Dumper"; +use URI::Escape; +my $proxyredirect=1; use POSIX qw(locale_h); use locale; use vars qw($opt_z); use Getopt::Std; +#my ($dbuser,$dbname,$dbpass,$dbhost); +eval {require "dbdefs.pl";} ; +my $url=url||''; +my @used_stop=(); +my $showNearQuestions=0; +$dbuser||="piataev"; +$dbname||="chgk"; +$dbpass||=""; +$dbhost||="localhost"; getopts('z'); $opt_z||=param("makehtml"); my $timestamp="_timestamp.tmp"; +my $usehash=0; my $paramtour; my $withanswers=param('answer')||param('answers'); open STDERR, ">/var/tmp/errors1"; my $newsurl='http://news.chgk.info/'; my $reklama="../dimrub/db/reklama.html"; my $footer="../dimrub/db/footer.html"; - +$footer="../../chgk/footer.html" if $url=~/zaba/; +$reklama="../../chgk/reklama.html" if $url=~/zaba/; my $datefooter="../dimrub/db/date"; +$datefooter="../../chgk/date" if $url=~/zaba/; my $fname; $reklama="../reklama.html" if $opt_z; @@ -31,30 +48,41 @@ if ($^O =~ /win/i) { $realHTMLDIR="/html/znatoki/baza/"; } else { - $realHTMLDIR="/home/piataev/public_html/dimrub/db/files/"; + $realHTMLDIR="/home/znatoki/chgk-db/public_html/dimrub/db/files/"; } + + my $usehtml=$opt_z||0; $usehtml=1; +$usehtml=0 if $url=~/zaba/ || $url=~/localhost/; + 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 $metod=param('metod')||''; 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/ && $url !~ /bilbo/) { +if ($url!~ /\/\/db\// && $url !~ /db\.chgk\.info/ && $url !~ /localhost/ && $url !~ /bilbo/ && $url !~ /zaba/ && $url !~ /question\.chgk\.info/ ) { my $u="http://db.chgk.info/cgi-bin/db.cgi?$qs"; Redirect ($u); exit; } + +if ($proxyredirect && $metod=~/proxy/ && $url !~ /localhost/ && $url !~ /bilbo/ && $url !~ /zaba/) { + my $u="http://chgk.zaba.ru/cgi-bin/db.cgi?$qs"; + Redirect ($u); + exit; +} + #if (!param('sstr') && param('all')) { # my $destination='http://db.chgk.info/all.html'; # Redirect($destination); @@ -70,8 +98,8 @@ POSIX::setlocale( &POSIX::LC_ALL, $thisl 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', 'Ответ', +my %fieldname= (0,'Question', 1, 'Answer', 2, 'PassCriteria', 3, 'Comments', 4, 'Authors', 5, 'Sources'); +my %rusfieldname=('Question','Вопрос', 'Answer', 'Ответ', 'PassCriteria','Зачёт', 'Comments', 'Комментарии', 'Authors', 'Автор', 'Sources', 'Источник','old','Старый','rus','Новый', 'chgk', 'ЧГК', 'brain', 'Брейн-ринг','game', 'Своя игра', @@ -106,8 +134,8 @@ my $all=param('all'); $all=0 if lc $all eq 'no'; 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 ($SRCPATH) = "/home/db-chgk/public_html/dimrub/src"; +my ($ZIP) = "/usr/bin/zip"; my $DUMPFILE = "/tmp/chgkdump"; my ($SENDMAIL) = "/usr/sbin/sendmail"; my ($TMPDIR) = "/var/tmp"; @@ -184,12 +212,12 @@ sub GetTournament { sub fetchquestion { my ($sth,$q,$WithTour)=@_; if ($WithTour) { - ($$q{'QuestionId'}, $$q{'Question'},$$q{'Answer'},$$q{'Comments'},$$q{'Authors'},$$q{'Sources'}, + ($$q{'QuestionId'}, $$q{'Question'},$$q{'Answer'},$$q{'PassCriteria'},$$q{'Comments'},$$q{'Authors'},$$q{'Sources'}, $$q{'Number'}, - $$q{'Title'}, $$q{'TourTitle'}, $$q{'FileName'},$$q{'PlayedAt'},$$q{'TourNumber'}) = + $$q{'Title'}, $$q{'TourTitle'}, $$q{'FileName'},$$q{'PlayedAt'},$$q{'TourNumber'},$$q{'PlayedAt2'}) = $sth->fetchrow; } else { - ($$q{'QuestionId'}, $$q{'Question'},$$q{'Answer'},$$q{'Comments'},$$q{'Authors'},$$q{'Sources'}, + ($$q{'QuestionId'}, $$q{'Question'},$$q{'Answer'},$$q{'PassCriteria'},$$q{'Comments'},$$q{'Authors'},$$q{'Sources'}, $$q{'Number'})= $sth->fetchrow; } @@ -211,13 +239,13 @@ sub SelectQuestions { my $query; if ($WithTour) { - $query="SELECT QuestionId, Questions.Question, Answer, Comments, Authors, Sources, + $query="SELECT QuestionId, Questions.Question, Answer, PassCriteria, Comments, Authors, Sources, Questions.Number - , t2.Title, t1.Title, t2.FileName, t2.PlayedAt,t1.Number + , t2.Title, t1.Title, t2.FileName, t2.PlayedAt,t1.Number,t2.PlayedAt2 from Questions,Tournaments as t1, Tournaments as t2 WHERE $where"; } else { - $query="SELECT QuestionId, Questions.Question, Answer, Comments, Authors, Sources, + $query="SELECT QuestionId, Questions.Question, Answer, PassCriteria, Comments, Authors, Sources, Questions.Number from Questions WHERE $where"; } @@ -255,21 +283,24 @@ sub tourhref { my $res; if ($usehtml) { $res=$t; + $res=~s/\-q$//; + $res=~s/\-a$//; $res.=$a?"-a":"-q" unless $gr; $res.=".html"; $res=~s/(\#\d+)(.*)$/$2$1/; my $t=$res; $t=~s/\#.*$//; - $res=~s/\.1// unless -e "$realHTMLDIR$t"; +# $res=~s/\.1// unless $gr ||$res=~/\.\d+$/;#-e "$realHTMLDIR$t"; $t=$res; $t=~s/\#.*$//; - $res=~s/\.html/-q\.html/ unless -e "$realHTMLDIR$t"; +# $res=~s/\.html/-q\.html/ unless -e "$realHTMLDIR$t"; $res="$HTMLDIR$res" unless $opt_z; return $res; } else { $res=$url; - $res.="?tour=$t"; - $res.=$a?"&answers=1":""; + $res.=$a?"?answers=1&":"?"; + $res.="tour=$t"; + return $res; } @@ -334,11 +365,11 @@ sub printform my $sstr=param('sstr'); my @df=keys %searchin; my %checked; - $checked{lc $_}="" foreach ('Question','Answer','Comments','Authors','Sources','old','rus', + $checked{lc $_}="" foreach ('Question','Answer','PassCriteria','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], + my $fields=checkbox_group('searchin',['Question','Answer','PassCriteria','Comments','Authors','Sources'], [@df], 'false',\%rusfieldname); @df=param('type'); @df=('chgk','brain','igp','game','ehruditka','beskrylka') unless @df; @@ -354,7 +385,7 @@ sub printform return < +action="/cgi-bin/db.cgi">

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

@@ -364,7 +395,7 @@ action="/znatoki/cgi-bin/db.cgi"> -
Вариант поиска: - + Простой (старый)  "Что? Где? Когда?" @@ -382,11 +413,11 @@ action="/znatoki/cgi-bin/db.cgi">  "Бескрылка"
Расширенный (с учетом грамматики, в вопросах всех типов) + Расширенный (с учетом грамматики, в вопросах всех типов)
Искать: - + Все слова Любое слово @@ -398,6 +429,8 @@ action="/znatoki/cgi-bin/db.cgi"> Ответ
 +Зачёт
+		 Комментарии
 Автор
@@ -406,6 +439,9 @@ action="/znatoki/cgi-bin/db.cgi">
+ EOT @@ -444,7 +480,7 @@ sub makeproxysstr { # $good{$words[$_]}=1 foreach 0..4; foreach (@words) { - $good{$_}=1 if $c{$_}<200; + $good{$_}=1 if $c{$_}<200 && length $_>2; } $good{$words[$_]}=0 foreach 16..$#words; @@ -471,19 +507,31 @@ sub russearch { my %relevance; my @blob; my %count; + my %stop_word; POSIX::setlocale( &POSIX::LC_ALL, $thislocale ); $sstr=~tr/йцукенгшщзхъфывапролджэячсмитьбю/ЙЦУКЕНГШЩЗХЪФЫВАПРОЛДЖЭЯЧСМИТЬБЮ/; # @qw=@w =split (' ', uc $sstr); my $ts=uc $sstr; @qw=@w= $ts=~m/(?:(?:${RLrl})+)|(?:[A-Za-z0-9]+)/gom; - + $query="select nf.word from nf where number>=50000"; + $sth=$dbh->prepare($query); + $sth->execute(); + %stop_word=(); + while (@arr = $sth->fetchrow) + { + $stop_word{$arr[0]}=1; + } + $sth->finish; + #----------- foreach $i (0..$#w) # заполняем массив @nf начальных форм # $nf[$i] -- ссылка на массив возможных # начальных форм словоформы $i { + (push @used_stop, uc $w[$i]),next if $stop_word{uc $w[$i]}; $qw= $dbh->quote (uc $w[$i]); + $query=" select distinct w2 from nests where w1=$qw"; $sth=$dbh -> prepare($query); @@ -528,7 +576,7 @@ $sstr=~tr/йцукенгшщзхъфывапролджэячсмить $_= " word2question.word=$_" foreach @arr; $_= " nf.id=".$_. ' ' foreach @arr1; # @arr=(0) unless @arr; - $query="select questions from word2question where (". (join ' OR ', @arr).") AND length(questions)<80000"; + $query="select questions from word2question where (". (join ' OR ', @arr).") "; $sth=$dbh -> prepare($query); $sth->execute; @@ -590,7 +638,12 @@ $sstr=~tr/йцукенгшщзхъфывапролджэячсмить #Ищем пересечение или объединение списков вопросов (значений %tasksof) foreach $sf (keys %tasksof) { - $count{$_}++ foreach keys %{$tasksof{$sf}}; + foreach (keys %{$tasksof{$sf}}) + { + next if $forbidden{$_}; + $count{$_}++ + } + } @tasks= ($all ? (grep {$count{$_}==$kvo} keys %count) : keys %count) ; @@ -664,7 +717,10 @@ sub Search { my (@sar, $i, $sth,$where,$query); if ($metod eq 'rus') { - my @tasks=russearch($dbh,$sstr,$all,$allnf); + my @tasks; + @tasks = russearch($dbh,$sstr,$all,$allnf); + + return @tasks } elsif ($metod eq 'proxy') @@ -678,13 +734,13 @@ sub Search { ###Simple and advanced query processing. Added by R7 if ($metod eq 'simple' || $metod eq 'advanced') { - foreach (qw/Question Answer Sources Authors Comments/) { + foreach (qw/Question Answer PassCriteria Sources Authors Comments/) { if (param($_)) { push @fields, $_; } } - @fields=(qw/Question Answer Sources Authors Comments/) unless scalar @fields; + @fields=(qw/Question Answer PassCriteria Sources Authors Comments/) unless scalar @fields; my $fields=join ",", @fields; my $q=new Text::Query($sstr, -parse => 'Text::Query::'. @@ -702,7 +758,6 @@ sub Search { ###### { -# foreach (qw/Question Answer Sources Authors Comments/) { foreach (param('searchin')) { # if (param($_)) { push @fields, "IFNULL($_, '')"; @@ -746,7 +801,7 @@ sub makewhere { $type .= ($_=$TypeName{$_}) foreach @type; my $where=' 0 '; foreach (@type) { - $where.= " OR (Type ='$_') OR (Type ='$_Д') "; + $where.= " OR (Type ='$_') OR (Type ='$_Д') OR (Type ='Д$_') "; } $where.= "OR (Type='ЧБ')" if ($type=~/Ч|Б/); return $where; @@ -858,12 +913,14 @@ sub PrintList { for (my $i = $first; $i <= $last; $i++) { my $q=$q{$$Questions[$i-1]}; my $output; - $output = &PrintQuestion($dbh, $q, 1, 0, 1,0,1 ); + $output = &PrintQuestion($dbh, $q, 1, 0, 1,$text,1 ); # if (param('metod') && (param('metod') eq 'rus' || param('metod') eq 'proxy')) { $output=~s/\b($shablon)\b/\$1\<\/strong\>/gi; $output=~s/($shablon)/\$1\<\/strong\>/gi; + $output=~s/(href="[^"]*?)(?:<.*?>)+([^"]*?)(?:<\/.*?>)+([^"]*?")/!1 $1$2$3 2!/g;#!!!! } + $Output.= $output; } $sth->finish; @@ -905,13 +962,15 @@ sub PrintSearch { } while (--$ss && (!$dbh->do ("insert into lastqueries (id,sstr,questions,allnf) values ($was, $qsstr,$tmp,$nf)"))); - $Output.= "Something is wrong...".br unless $ss; + $Output.= "Something is wrong...".br."\n" unless $ss; } } $Output.= p. "Время поиска: " . (time-$t) ." сек.".p; + $_="\"$_\"" foreach @used_stop; + $Output.= p. (join ', ',@used_stop) ." ignored".p if @used_stop; my ($output, $i, $suffix, $hits) = ('', 0, '', $#Questions + 1); my $shablon; @@ -974,9 +1033,11 @@ sub PrintRandom { my %q; my $answer=$razd?0:1; my @answers; +#my $t=time; my (@Questions) = &Get12Random($dbh, $type, $num); - my ($output, $i) = ('', 0); + my ($output, $i) = ('', 0); +#$output.="time=".(time-$t).p; if ($text) { $output .= " $num случайных вопросов.\n\n"; } else { @@ -1036,7 +1097,11 @@ sub PrintTournament { /Г/ && do { $output .= h2({align=>"center"}, "Группа: $Tournament{'Title'} ", - $Tournament{'PlayedAt'}||'') . p . "\n"; + $Tournament{'PlayedAt'}||'') . + ($Tournament{'PlayedAt2'}?' – '. + $Tournament{'PlayedAt2'}:'') . + + p . "\n"; last; }; /Ч/ && do { @@ -1048,6 +1113,10 @@ sub PrintTournament { $title .= " $Tournament{'PlayedAt'}"; } + if ($Tournament{'PlayedAt2'}) { + $title .= ' – '.$Tournament{'PlayedAt2'}; + } + $output .= h2({align=>"center"}, "$title") . p . "\n"; $output.=&PrintEditor(\%Tournament); @@ -1062,7 +1131,7 @@ sub PrintTournament { my ($qnum1) = GetQNum($dbh,1); $output .= h2("База вопросов"). h3("$qnum запис".&Suffix2($qnum). - " (не повторяется $qnum1)"); + " (уникальных $qnum1)"); # h4("". # Tr(td("Из них:"), td("Вопросов ЧГК: ".countz($dbh,'Ч'))). @@ -1114,7 +1183,9 @@ sub PrintTournament { if ($SingleTour or ($Tournament{'Type'} =~ /Т/)) { $list .= dd(img({src=>$imgsrc, alt=>$alt}) . " " . $Tournament{'Title'} . " " . - ($Tournament{'PlayedAt'}||"") . $qnum) . + ($Tournament{'PlayedAt'}||"") . + ($Tournament{'PlayedAt2'}?' – '.$Tournament{'PlayedAt2'}:"") . + $qnum) . dl( dd("[" . a({href=>tourhref($textid,0)}, @@ -1130,7 +1201,8 @@ sub PrintTournament { img({src=>$imgsrc, alt=>$alt}) . " " . a({href=>tourhref($textid,0,1)}, $Tournament{'Title'}. " ". - ($Tournament{'PlayedAt'}||'')) . $qnum); + ($Tournament{'PlayedAt'}||'')) . + ($Tournament{'PlayedAt2'}?' &ndash '. $Tournament{'PlayedAt2'}:''). $qnum); } } $output .= dl($list); @@ -1141,7 +1213,6 @@ sub PrintTournament { p("Дополнительная информация об этом турнире - по адресу " . a({-'href'=>$URL}, $URL)); } - if ($Copyright) { $output .= p("Копирайт: " . $Copyright); } @@ -1151,6 +1222,10 @@ sub PrintTournament { if ($Info) { $output .= p($Info); } + + $output.=p("XML"); + + return $output; } @@ -1220,7 +1295,8 @@ sub PrintTour { $output .= h2({align=>"center"}, $Tournament{"Title"}, $Tournament{'PlayedAt'}||'', - "
", $Tour{"Title"} . + $Tournament{'PlayedAt2'}?' – '.$Tournament{'PlayedAt2'}:'', + "
\n", $Tour{"Title"} . " ($qnum вопрос$suffix)\n") . p; $output .=&PrintEditor(\%Tour); @@ -1228,25 +1304,35 @@ sub PrintTour { my $sth=SelectQuestions($dbh,\@Questions,0); for ($q = 0; $q <= $#Questions; $q++) { fetchquestion($sth,\%q,0); - $output .= &PrintQuestion($dbh, \%q, $answer, 0,0,0,1); + $output .= &PrintQuestion($dbh, \%q, $answer, 0,0,$text,1); } $sth->finish; $output .= hr({-'align'=>'center', -'width'=>'80%'}); if ($Tournament{'URL'}) { - $output .= - p("Дополнительная информация об этом турнире - по адресу " . - a({-'href'=>$Tournament{'URL'}}, $Tournament{'URL'})); + $URL = $Tournament{'URL'}; + $URL=~s/http:\/znatoki\/boris\/reports\//$newsurl/ if $url=~/kulichki/ || $url=~/db.chgk.info/; + $URL=~s/\/znatoki\/boris\/reports\//$newsurl/ if url=~/kulichki/ || $url=~/db.chgk.info/; + + $output .= + p("Дополнительная информация об этом турнире - по адресу " . + a({-'href'=>$URL}, $URL)); } if ($Tournament{'Copyright'}) { $output .= p("Копирайт: " . $Tournament{'Copyright'}); } - if ($Tournament{'Info'}) { + if ($Tournament{'Info'} ) { $output .= p($Tournament{'Info'}); } + if ($Tour{'Info'} && ($Tournament{'Info'} ne $Tour{'Info'})) { + $output .= "!!".p($Tour{'Info'}); + } + + $output.=p("XML"); + my $n=$Tour{'Number'}; if ($answer == 0) { my $nn=".$n"; @@ -1254,7 +1340,7 @@ sub PrintTour { $bottom .= "[" . a({href=>tourhref("$fname$nn",1)}, - "ответы") . "] " . br; + "ответы") . "] " . br."\n"; } if ($n>1) { $bottom .= @@ -1262,7 +1348,7 @@ sub PrintTour { "предыдущий тур") . "] "; $bottom .= "[" . a({href=>tourhref("$fname.".($n-1),1)}, - "предыдущий тур с ответами") . "] " . br; + "предыдущий тур с ответами") . "] " . br."\n"; } if (&IsTour($dbh, $Tour{'ParentId'}, $n + 1)) { $bottom .= @@ -1279,26 +1365,47 @@ sub PrintTour { return $output; } + +sub escapeUrl { + my $uri = shift; + $uri=~s/<.*?>//g; + $uri =~ s/([Ю-Ъю-ъ]+)/URI::Escape::uri_escape_utf8(decode("koi8-r",$1))/eg; + return $uri; +} + sub PrintField { my ($header, $value, $text) = @_; if ($text) { $value =~ s/<[\/\w]*?>//sg; } else { - $value =~ s/^\s+/
    /mg; + if ($header=~/Комментар/) + { + $value=~s/^\s*$_[\.:]/p."\n".strong("$_").":\n"/me foreach @softfields; + } + + $value =~ s/^\s+/
\n    /mg; $value =~ s/(\s+)-+(\s+)/$1–$2/mg; $value =~ s/\s+\–/ \–/mg if $value !~ /^\|/; $value =~ s/^\|([^\n]*)/
$1<\/pre>/mg;
-	    $value =~ s/(http:\/\/\S+[^\s\)\(\,\.])/$1<\/a>/g if $header !~ /^Авто/;
+
+	    $value =~ s/(http:\/\/\S+[^\s\)\(\,\.])/a({href=>escapeUrl($1)},$1)/egm if $header !~ /^Авто/;#!!!
+
+
+#	    $value =~ s/(http:\/\/\S+[^\s\)\(\,\.])/make/eg if $header !~ /^Авто/;#!!!
+#	    $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;
 	}
 
-
+	if ($value=~/^\s*()?\s*"50%"}) if $answer>=0;
 		if ($title) {
-			my $fname=$Question{'FileName'};
+			$fname=$Question{'FileName'};
 			$fname=~s/\.txt//;
 			$titles .=
 				dd(img({src=>"/icons/folder.open.gif"}) . " " .
 					 a({href=>tourhref($fname,0,1)}, 
-                               $Question{'Title'}, $Question{'PlayedAt'}||''));
+                               $Question{'Title'}, $Question{'PlayedAt'}||'',
+                               $Question{'PlayedAt2'}?' – '.$Question{'PlayedAt2'}:''));
 			$titles .=
 				dl(dd(img({src=>"/icons/folder.open.gif"}) . " " .
 					a({href=>tourhref("$fname.$Question{'TourNumber'}#$qnum",1)}, 
@@ -1350,6 +1460,10 @@ sub PrintQuestion {
 	if ($answer==1|| $answer==-1) {
 		$output .=
 			&PrintField("Ответ", $Question{'Answer'}, $text);
+		if ($Question{'PassCriteria'} ) {
+		  $output .=
+			&PrintField("Зачёт", $Question{'PassCriteria'}, $text);
+                }
 
 		if ($Question{'Authors'} ) {
                       my $q=$Question{'Authors'};
@@ -1418,6 +1532,10 @@ EOTT
 		if ($Question{'Authors'}) {
 			$output .= &PrintField("Автор(ы)", $Question{'Authors'}, $text);
 		}
+		if ($Question{'PassCriteria'}) {
+			$output .= &PrintField("Зачёт", $Question{'PassCriteria'}, $text);
+		}
+
 		if ($Question{'Sources'}) {
 			$output .= &PrintField("Источник(и)", $Question{'Sources'}, $text);
 		}
@@ -1431,13 +1549,20 @@ EOTT
 $output.=""
 
 	}
-	$output=~s/\(pic: ([^\)]*)\)/
/g unless $text;
+	$output=~s/\(pic: ([^\)]*)\)/
<\/p>/g unless $text;
+	$output=~s/\(aud: ([^\)]*)\)//g unless $text;
+
+	$output=~s/⌡/\ï/g;
+	$output=~s/⌠/\Ï/g;
+
 	$paramtour||=param("tour");
-	my $qid=$paramtour ? ($paramtour.".$Question{'Number'}" ): '';
+	$fname=$fname.".$Question{'TourNumber'}" if $fname && $Question{'TourNumber'};
+$fname||=param('tour');
+	my $qid=$fname ? ($fname.".$Question{'Number'}" ): '';
 
-	$output.=br.a({href=> $url."?metod=proxy&
+	$output.=br."\n".a({href=> "/search/"."?metod=proxy&
 qid=$qid"}, 'Близкие вопросы').p
-             if $answer>0 && !$text && $qid;
+             if $answer>0 && !$text && $qid && $showNearQuestions;
 	return $output;
 }
 
@@ -1479,7 +1604,9 @@ sub Get12Random {
 	srand;
 	my $where=0;
 	my $r=int (rand(10000));
-
+	my $w1=$r<5000? "QuestionId<50000 ":"QuestionId>=50000";
+	$w1=1 if $url=~/zaba/;
+	$w1=1 if $type!~/Ч/;
 	foreach (split '', $type)
         {
  	   $where.= " OR (Type ='$_') OR (Type ='$_Д') ";
@@ -1489,7 +1616,7 @@ sub Get12Random {
 #   $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";
+   $q="select QuestionId from Questions where ($w1) AND ($where) order by rand() limit $num";
 
 
    $sth=$dbh->prepare($q);
@@ -1570,7 +1697,9 @@ sub PrintAll {
 
 		$output .= dd(img({src=>"/icons/folder.gif", alt=>"[*]"}) .
       " " . a({href=>tourhref($textid,0,!$SingleTour)},
-      $Tournament{'Title'}) ." " . ($Tournament{'PlayedAt'}||'') . " $New");
+      $Tournament{'Title'}) ." " . ($Tournament{'PlayedAt'}||'') . 
+      ($Tournament{'PlayedAt2'}?' – '.$Tournament{'PlayedAt2'}:'') . 
+      " $New");
 	}
 	if ($Id == 0 or $Tournament{'Type'} =~ /Г/ or $Tournament{'Type'} eq '') {
 		for ($i = 0; $i <= $#Tours; $i++) {
@@ -1615,7 +1744,8 @@ sub PrintDates {
 	         else {$textid=$Tournament{'Id'}};
       $list .= dd(img({src=>"/icons/folder.gif", alt=>"[*]"}) .
       " " . a({href=>tourhref($textid,0,1)},
-      $Tournament{'Title'}, $Tournament{'PlayedAt'}||''));
+      $Tournament{'Title'}, $Tournament{'PlayedAt'}||'', 
+      $Tournament{'PlayedAt2'}?' – '.$Tournament{'PlayedAt2'}:''));
 	}
         $sth->finish;
 	$output .= dl($list);
@@ -1658,7 +1788,7 @@ sub PrintQOfAuthor
 		$suffix = 'я';
 	}
 	$Output.= printform;
-	$Output.= p({align=>"center"}, "Автор ".strong("$name $surname. ")
+	$Output.= p({align=>"center"}, "Автор ".strong("$name $surname ")
 	. " : $hits попадани$suffix.");
 
 
@@ -1732,14 +1862,14 @@ sub WriteFile {
   $fname=~s/.*\/(\w+)/$1/;
 
   my $query= "SELECT Id, Title, Copyright, Info, URL, 
-                      Editors, EnteredBy, PlayedAt, CreatedAt 
+                      Editors, EnteredBy, PlayedAt, CreatedAt, PlayedAt2
                      from Tournaments where FileName=
                      '$fname' OR FileName=".$dbh->quote("$fname.txt");
   my $sth=$dbh->prepare($query);
   my (%Question,%editor,%qnumber,%copyright,%author,%vid,%tourtitle);
   $sth->execute;
   my ($Id, $Title, $Copyright, $Info, $URL, 
-   $Editors, $EnteredBy, $PlayedAt, $CreatedAt)=
+   $Editors, $EnteredBy, $PlayedAt, $CreatedAt, $PlayedAt2)=
       $sth->fetchrow;
   return -1 unless $Id;
   open (OUT, ">$TMPDIR/$fname.txt") || print STDERR "Error in $fname.txt\n";
@@ -1748,6 +1878,10 @@ sub WriteFile {
   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);
+  if ($PlayedAt2) {
+    my ($year,$month,$day)=split /-/, $date;
+    $pdate .= sprintf(" - %02d-%3s-%4d",$day,$months[$month],$year);    
+  }
 
   print OUT "Дата:\n$pdate\n\n" if $date;
 
@@ -1857,6 +1991,7 @@ sub WriteFile {
      {
         print OUT "Вопрос $q:\n".$Question{$tour}[$q]{'Question'}."\n\n";
 	print OUT  "Ответ:\n".$Question{$tour}[$q]{'Answer'}."\n\n";
+	print OUT  "Зачёт:\n".$Question{$tour}[$q]{'PassCriteria'}."\n\n";
 	print OUT  "Автор:\n".$Question{$tour}[$q]{'Authors'}."\n\n" 
                if !$tourauthor && !$eqauthor && $Question{$tour}[$q]{'Authors'};
 	print OUT  "Комментарий:\n".$Question{$tour}[$q]{'Comments'}."\n\n" 
@@ -1906,25 +2041,27 @@ MAIN:
 	$tour = (param('tour')) ? param('tour') : 0;
 	my $texttour=$tour;
 	my ($sth,$dbh);
-	$dbh = DBI->connect("DBI:mysql:chgk", "piataev", "")
+	my($dsn) = "DBI:mysql:database=$dbname;host=$dbhost";
+        $dbh = DBI->connect($dsn, $dbuser, $dbpass)
+#	$dbh = DBI->connect("DBI:mysql:$dbname", $username, $dbpass)
 		or do {
-			print h1("Временные проблемы") . "База вопросов временно не
+			print header.h1("Временные проблемы") . "База вопросов временно не
 			работает. Заходите попозже.";
 			print &Include_virtual("$reklama") if $url!~/localhost/;
 		    print end_html;
 			die "Can't connect to DB chgk\n";
 		};
-
+        $dbh->do("set names koi8r");
 
 	if (param('qid') && (param('qid')=~/^\d+$/) || $tour && $tour=~/^\d+$/) {
-	   my $destination='http://db.chgk.info/search.html';
+#	   my $destination='http://chgk.zaba.ru/search.html';
 #		print header (-'Content-Type' => 'text/html',
 #                -'Location:'=> 'http:\\db.chgk.info');
 		Redirect($destination);
                 exit
 	}
 
-	if ($tour && !param('qnumber') && (!param('answers')||(param('answers')<=1)))
+	if (0 && $tour && !param('qnumber') && (!param('answers')||(param('answers')<=1)))
 	{       
 	        my $n=param('tour');
 	        $n=~s/.txt$//;        
@@ -1933,14 +2070,13 @@ MAIN:
 		my $d=$destination;
 		$d=~s/$HTMLDIR/$realHTMLDIR/;
 #		print header.$destination;
-                print header."$d|".(-e "$realHTMLDIR$n.html");
+#                print header."$d|".(-e "$realHTMLDIR$n.html");
                 if (-e $d) {
 			Redirect($destination);
 			exit
 		}
 		$d=~s/\.\d+//;
 		$destination=~s/\.\d+//;
-print br.br.$d;
                 if (-e $d) {
 			Redirect($destination);
 			exit
@@ -1973,7 +2109,8 @@ print br.br.$d;
 
 	if ($text && !param ('comp')) {
 		print header('text/plain');
-	} elsif (!param('comp')) {print header;}
+	} elsif (!param('comp')) {
+		print header(-charset =>'koi8-r')}
 	  my $sstr=param('sstr');
           $opt_z||=param("makehtml");
 	  if (param('qid')) {
@@ -2027,11 +2164,10 @@ print br.br.$d;
 	   my $title="Результаты поиска на \"". ($proxysstr||$sstr) .'"' 
                                                     if ($proxysstr||$sstr);
            $title||="База вопросов";
-
 	   $globaloutput.=start_html(-"title"=>$title,
 	           -author=>'dimrub@icomverse.com',
 	           -bgcolor=>'#fff0e0',
-				  -vlink=>'#800020');
+				  -vlink=>'#800020');#}
 $globaloutput.="