--- db/prgsrc/db.cgi 2004/11/21 13:37:29 1.138 +++ db/prgsrc/db.cgi 2006/09/30 22:16:48 1.145 @@ -14,6 +14,7 @@ use Getopt::Std; eval {require "dbdefs.pl";} ; my $url=url||''; my @used_stop=(); +my $showNearQuestions=0; $dbuser||="piataev"; $dbname||="chgk"; $dbpass||=""; @@ -44,7 +45,7 @@ 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/"; } @@ -67,7 +68,7 @@ $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/ && $url !~ /zaba/) { +if ($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; @@ -130,8 +131,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"; @@ -279,6 +280,8 @@ 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/; @@ -287,7 +290,7 @@ sub tourhref { $res=~s/\.1// unless -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 { @@ -433,9 +436,9 @@ action="/znatoki/cgi-bin/db.cgi"> -
Если при попытке поиска выдаётся сообщение об ошибке,
+
EOT
@@ -904,7 +907,7 @@ 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;
@@ -1278,7 +1281,7 @@ 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%'});
@@ -1499,14 +1502,17 @@ $output.=""
}
$output=~s/\(pic: ([^\)]*)\)/ /g unless $text;
+ $output=~s/⌡/\ï/g;
+ $output=~s/⌠/\Ï/g;
+
$paramtour||=param("tour");
$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.a({href=> "/search/"."?metod=proxy&
qid=$qid"}, 'Близкие вопросы').p
- if $answer>0 && !$text && $qid;
+ if $answer>0 && !$text && $qid && $showNearQuestions;
return $output;
}
@@ -1979,7 +1985,7 @@ MAIN:
my $texttour=$tour;
my ($sth,$dbh);
my($dsn) = "DBI:mysql:database=$dbname;host=$dbhost";
- $dbh = DBI->connect($dsn, $dbuser, $dbpass)
+ $dbh = DBI->connect($dsn, $dbuser, $dbpass)
# $dbh = DBI->connect("DBI:mysql:$dbname", $username, $dbpass)
or do {
print header.h1("Временные проблемы") . "База вопросов временно не
@@ -1991,14 +1997,14 @@ MAIN:
if (param('qid') && (param('qid')=~/^\d+$/) || $tour && $tour=~/^\d+$/) {
- my $destination='http://chgk.zaba.ru/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$//;
@@ -2229,7 +2235,7 @@ EOT
$QuestionNumber=($sth->fetchrow)[0]||0;
}
if ($QuestionNumber) {
- $globaloutput.= &PrintQuestion($dbh, $QuestionNumber, $withanswers||0, $qnum, 1,0,0);
+ $globaloutput.= &PrintQuestion($dbh, $QuestionNumber, $withanswers||0, $qnum, 1,$text,0);
# $dbh, $Id, $answer, $qnum, $title, $text
} else {
$globaloutput.=&PrintTournament($dbh, $tour, $withanswers);