--- db/prgsrc/db.cgi 2003/12/19 08:05:01 1.127
+++ db/prgsrc/db.cgi 2004/09/05 14:57:05 1.136
@@ -2,23 +2,35 @@
use DBI;
use CGI ':all';
-use strict;
+#use strict;
+my @softfields=("От Олега Степанова");
use Time::Local;
+my $proxyredirect=1;
use POSIX qw(locale_h);
use locale;
use vars qw($opt_z);
use Getopt::Std;
+#my ($dbuser,$dbname,$dbpass,$dbhost);
+require "dbdefs.pl";
+my $url=url||'';
+$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;
@@ -33,28 +45,39 @@ if ($^O =~ /win/i) {
{
$realHTMLDIR="/home/piataev/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\.chgk\.info/ && $url !~ /localhost/ && $url !~ /bilbo/ && $url !~ /zaba/) {
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 +93,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', 'Своя игра',
@@ -184,12 +207,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'}) =
$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 +234,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
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";
}
@@ -268,8 +291,9 @@ sub tourhref {
return $res;
} else {
$res=$url;
- $res.="?tour=$t";
- $res.=$a?"&answers=1":"";
+ $res.=$a?"?answers=1&":"?";
+ $res.="tour=$t";
+
return $res;
}
@@ -334,11 +358,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;
@@ -364,7 +388,7 @@ action="/znatoki/cgi-bin/db.cgi">
+Если при попытке поиска выдаётся сообщение об ошибке,
+попробуйте воспользоваться
+зеркалом базы
EOT
@@ -444,7 +473,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;
@@ -590,7 +619,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) ;
@@ -678,13 +712,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 +736,6 @@ sub Search {
######
{
-# foreach (qw/Question Answer Sources Authors Comments/) {
foreach (param('searchin')) {
# if (param($_)) {
push @fields, "IFNULL($_, '')";
@@ -746,7 +779,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;
@@ -974,9 +1007,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 {
@@ -1284,6 +1319,11 @@ sub PrintField {
if ($text) {
$value =~ s/<[\/\w]*?>//sg;
} else {
+ if ($header=~/Комментар/)
+ {
+ $value=~s/^\s*$_[\.:]/p."\n".strong("$_").":"/me foreach @softfields;
+ }
+
$value =~ s/^\s+/
/mg;
$value =~ s/(\s+)-+(\s+)/$1–$2/mg;
$value =~ s/\s+\–/ \–/mg
@@ -1296,7 +1336,10 @@ sub PrintField {
# $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"}) . " " .
@@ -1350,6 +1394,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 +1466,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);
}
@@ -1433,7 +1485,9 @@ $output.=""
}
$output=~s/\(pic: ([^\)]*)\)/
/g unless $text;
$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&
qid=$qid"}, 'Близкие вопросы').p
@@ -1479,7 +1533,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 +1545,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);
@@ -1658,7 +1714,7 @@ sub PrintQOfAuthor
$suffix = 'я';
}
$Output.= printform;
- $Output.= p({align=>"center"}, "Автор ".strong("$name $surname. ")
+ $Output.= p({align=>"center"}, "Автор ".strong("$name $surname ")
. " : $hits попадани$suffix.");
@@ -1857,6 +1913,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,9 +1963,11 @@ 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;
@@ -1917,7 +1976,7 @@ MAIN:
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);
@@ -1933,14 +1992,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 +2031,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 +2086,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.="