--- db/prgsrc/db.cgi 2001/12/05 00:17:52 1.42
+++ db/prgsrc/db.cgi 2002/01/15 03:34:31 1.60
@@ -2,15 +2,17 @@
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, ">errors1";
+open STDERR, ">errors1";
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', 'Автор',
@@ -21,18 +23,18 @@ 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');
-#$searchin{'Question'}=param('Question');
-#$searchin{'Answer'}=param('Answer');
-#$searchin{'Comments'}=param('Comments');
-#$searchin{'Authors'}=param('Authors');
-#$searchin{'Sources'}=param('Sources');
+my %TypeName=('children'=>'Д', 'game'=>'И',
+ 'chgk'=>'Ч', 'brain'=>'Б', 'beskrylka'=>'Л','ehruditka'=>'Э');
+
+
+
my $all=param('all');
$all=0 if lc $all eq 'no';
my ($PWD) = `pwd`;
@@ -41,6 +43,7 @@ my ($SRCPATH) = "$PWD/../dimrub/src";
my ($ZIP) = "/home/piataev/bin/zip";
my $DUMPFILE = "/tmp/chgkdump";
my ($SENDMAIL) = "/usr/sbin/sendmail";
+my ($TMPDIR) = "/tmp";
my ($TMSECS) = 30*24*60*60;
my (%RevMonths) =
('Jan', '0', 'Feb', '1', 'Mar', '2', 'Apr', '3', 'May', '4', 'Jun', '5',
@@ -49,6 +52,9 @@ my (%RevMonths) =
'Янв', '0', 'Фев', 1, 'Мар', 2, 'Апр', 3, 'Май', '4',
'Июн', '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 {
@@ -73,7 +79,7 @@ sub GetTournament {
foreach $name (@{$sth->{NAME}}) {
$Tournament{$name} = $arr[$i++];
}
-
+ $sth->finish;
return %Tournament;
}
@@ -94,6 +100,7 @@ sub GetQuestion {
$Question{$name} = $arr[$i++];
}
+ $sth->finish;
return %Question;
}
@@ -103,7 +110,7 @@ sub GetTourQuestions {
my (@arr, @Questions);
my ($sth) = $dbh->prepare("SELECT QuestionId FROM Questions
- WHERE ParentId=$ParentId ORDER BY QuestionId");
+ WHERE ParentId=$ParentId");
$sth->execute;
@@ -111,6 +118,7 @@ sub GetTourQuestions {
push @Questions, $arr[0];
}
+ $sth->finish;
return @Questions;
}
@@ -127,7 +135,7 @@ sub GetTours {
while (@arr = $sth->fetchrow) {
push @Tours, $arr[0];
}
-
+ $sth->finish;
return @Tours;
}
@@ -141,6 +149,7 @@ print "timeb=".time.br if $debug;
$sth->execute;
my @a=$sth->fetchrow;
print "timee0=".time.br if $debug;
+ $sth->finish;
$a[0]||0;
}
@@ -151,8 +160,16 @@ sub printform
my $submit=submit(-value=>'Поиск');
my $inputstring=textfield(-name=>'sstr',
-default=>param('sstr')||'',
- -size=>50);
- my $fields=checkbox_group('searchin',['Question','Answer','Comments','Authors','Sources'], [grep $searchin{$_}, keys %searchin],
+ -size=>30,
+ -maxlength=>30);
+ my $qnumber="Выводить по".br. textfield(-name=>'kvo',
+ -default=>param('kvo')||'150',
+ -size=>3,
+ -maxlength=>5). br."вопросов";
+
+ 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'],
@@ -172,7 +189,8 @@ table(Tr
(
td({-valign=>'TOP'},$inputstring.$submit.p."Метод: $metod".p."Слова: $all"),
td({-valign=>'TOP'},(' 'x 8).'Поля:'),
- td({-valign=>'TOP'},$fields)
+ td({-valign=>'TOP'},$fields), td(" "x5),
+ td({-valign=>'TOP'},$qnumber)
)
)
@@ -193,7 +211,7 @@ sub proxy
$text=~s/p(${RLrl})/р$1/gom;
$text=~s/(${RLrl})p/$1р/gom;
$text=~s/\s+/ /gmo;
- $text=~s/[^йцукенгшщзхъфывапролджэячсмитьбюЙЦУКЕНГШЩЗХЪФЫВАПРОЛДЖЭЯЧСМИТЬБЮQWERTYUIOPASDFGHJKLZXCVBNM]/ /g;
+ $text=~s/[^йцукенгшщзхъфывапролджэячсмитьбюЙЦУКЕНГШЩЗХЪФЫВАПРОЛДЖЭЯЧСМИТЬБЮQWERTYUIOPASDFGHJKLZXCVBNM0-9]/ /g;
$text=uc $text;
my @list= $text=~m/(?:(?:${RLrl})+)|(?:[A-Za-z0-9]+)/gom;
my (%c, %good,$sstr);
@@ -263,6 +281,7 @@ print "$query",br if $printqueries;
{
push (@{$nf[$i]},$arr[0])
}
+ $sth->finish;
}
@@ -309,6 +328,7 @@ print STDERR "!$query\n",br if $printque
{
@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);
@@ -318,7 +338,7 @@ print "$query\n",br if $printqueries;
{
$frequence[$i]+=$arr[0];
}
-
+ $sth->finish;
if (@blob < 4)
@@ -338,8 +358,9 @@ print "$query\n",br if $printqueries;
{
($field,$lo,$hi,$wordnumber)=@blob[$ii..($ii+3)];
$ii+=4;
- $number=$lo+$hi*256;
- $field=$fieldname{$field};
+ my $addnumber=($field >> 4) << 16;
+ $number=(($field >> 4) << 16)+($hi << 8) + $lo;
+ $field=$fieldname{$field & 0xF};
if ($searchin{$field})
{
push @{$tasksof{$i}{$number}}, $wordnumber;
@@ -439,17 +460,17 @@ sub Search {
my $sstr=$$s;
my (@arr, @Questions, @fields);
my (@sar, $i, $sth,$where,$query);
- my $ip=$ENV{'REMOTE_ADDR'};
+# 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);
+# $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);
@@ -525,7 +546,7 @@ print $query if $printqueries;
while (@arr = $sth->fetchrow) {
push @Questions, $arr[0] unless $forbidden{$arr[0]};
}
-
+ $sth->finish;
print "@Questions" if $printqueries;
return @Questions;
}
@@ -535,7 +556,7 @@ print "@Questions" if $printqueries;
пП рР сС тТ уУ фФ хХ цЦ чЧ шШ щЩ ьЬ ыЫ эЭ юЮ яЯ/;
sub NoCase {
- my ($sstr) = shift;
+ my ($sstr) = shift;
my ($res);
if (($res) = grep(/$sstr/, @letters)) {
@@ -546,10 +567,10 @@ sub NoCase {
}
sub PrintList {
- my ($dbh,$Questions,$shablon)=@_;
+ my ($dbh,$Questions,$shablon,$was)=@_;
my $first=param('first') ||1;
- my $kvo=param('kvo') ||30;
+ my $kvo=param('kvo') ||150;
$first=$first-($first-1)%$kvo;
my $last=$first+$kvo-1;
@@ -559,15 +580,17 @@ sub PrintList {
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;}
@@ -638,11 +661,40 @@ sub PrintList {
}
sub PrintSearch {
- my ($dbh, $sstr, $metod) = @_;
+ my ($dbh, $sstr, $metod,$was) = @_;
+ my $t=time;
print h2("Поиск в базе вопросов");
print printform;
my @allnf;
- my (@Questions) = &Search($dbh, \$sstr,$metod,$all,\@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;
@@ -661,11 +713,13 @@ print "$query" if $printqueries;
{
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;
+
}
@@ -693,7 +747,7 @@ print "$query" if $printqueries;
(@sar) = split(' ', $sstr);
$shablon=join "|",@sar;
}
- PrintList($dbh,\@Questions,$shablon);
+ PrintList($dbh,\@Questions,$shablon,$was);
}
sub PrintRandom {
@@ -717,6 +771,13 @@ sub PrintRandom {
return $output;
}
+sub PrintEditor {
+ my $t=shift; #ссылка на Хэш с полями
+ my $ed=$$t{'Editors'};
+ my $edname=($ed=~/\,/ ) ? "Редакторы" : "Редактор" ;
+ return $ed? h4({align=>"center"},"$edname: $ed" ): '';
+}
+
sub PrintTournament {
my ($dbh, $Id, $answer) = @_;
my (%Tournament, @Tours, $i, $list, $qnum, $imgsrc, $alt,
@@ -728,9 +789,10 @@ sub PrintTournament {
my ($URL) = $Tournament{'URL'};
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 {
@@ -750,6 +812,7 @@ sub PrintTournament {
$output .= h2({align=>"center"},
"$title") . p . "\n";
+ $output.=&PrintEditor(\%Tournament);
last;
};
/Т/ && do {
@@ -784,22 +847,35 @@ 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) .
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"},
+ $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);
}
@@ -816,10 +892,11 @@ sub PrintTournament {
$output .= p("Копирайт: " . $Copyright);
}
+
+
if ($Info) {
$output .= p($Info);
}
-
return $output;
}
@@ -832,11 +909,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
@@ -852,6 +941,8 @@ sub PrintTour {
return 0
if ($Tour{'Type'} !~ /Т/);
+ my ($fname)=$Tournament{'FileName'};
+ $fname=~s/\.txt//;
my ($qnum) = $Tour{'QuestionsNum'};
my ($suffix) = &Suffix($qnum);
@@ -859,6 +950,7 @@ sub PrintTour {
$Tournament{'PlayedAt'},
"
", $Tour{"Title"} .
" ($qnum вопрос$suffix)\n") . p;
+ $output .=&PrintEditor(\%Tour);
my (@Questions) = &GetTourQuestions($dbh, $Id);
for ($q = 0; $q <= $#Questions; $q++) {
@@ -881,25 +973,25 @@ sub PrintTour {
$output .= p($Tournament{'Info'});
}
-
+ my $n=$Tour{'Number'};
if ($answer == 0) {
$bottom .=
- "[" . a({href=>url . "?tour=$Id&answer=1"}, "ответы") . "] " . br;
+ "[" . a({href=>url . "?tour=$fname.$n&answer=1"}, "ответы") . "] " . br;
}
- if (&IsTour($dbh, $Id - 1)) {
+ if ($n>1) {
$bottom .=
- "[" . a({href=>url . "?tour=" . ($Id - 1) . "&answer=0"},
+ "[" . a({href=>url . "?tour=$fname." . ($n - 1) . "&answer=0"},
"предыдущий тур") . "] ";
$bottom .=
- "[" . a({href=>url . "?tour=" . ($Id - 1) . "&answer=1"},
+ "[" . a({href=>url . "?tour=$fname." . ($n - 1) . "&answer=1"},
"предыдущий тур с ответами") . "] " . br;
}
- if (&IsTour($dbh, $Id + 1)) {
+ if (&IsTour($dbh, $Tour{'ParentId'}, $n + 1)) {
$bottom .=
- "[" . a({href=>url . "?tour=" . ($Id + 1) . "&answer=0"},
+ "[" . a({href=>url . "?tour=$fname." . ($n + 1) . "&answer=0"},
"следующий тур") . "] ";
$bottom .=
- "[" . a({href=>url . "?tour=" . ($Id + 1) . "&answer=1"},
+ "[" . a({href=>url . "?tour=$fname." . ($n + 1) . "&answer=1"},
"следующий тур с ответами") . "] ";
}
@@ -912,12 +1004,17 @@ 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/(\s)"/$1“/mg;
+ $value =~ s/^"/“/mg;
+ $value =~ s/"/”/mg;
}
+
return $text ? "$header:\n$value\n\n" :
strong("$header: ") . $value . p . "\n";
}
@@ -933,12 +1030,14 @@ sub PrintQuestion {
if ($title) {
my (%Tour) = GetTournament($dbh, $Question{'ParentId'});
my (%Tournament) = GetTournament($dbh, $Tour{'ParentId'});
+ my $fname=$Tournament{'FileName'};
+ $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}"}, $Tour{'Title'})));
}
$output .= dl(strong($titles));
}
@@ -956,31 +1055,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;
- $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);
@@ -995,8 +1094,8 @@ sub PrintQuestion {
$output .= &PrintField("Комментарии", $Question{'Comments'}, $text);
}
}
- $output.=br.a({href=> url."?metod=proxy&qid=$Id"}, 'Близкие вопросы').p
- if $answer;
+# $output.=br.a({href=> url."?metod=proxy&qid=$Id"}, 'Близкие вопросы').p
+# if $answer;
return $output;
}
@@ -1005,13 +1104,18 @@ sub GetQNum {
my ($dbh) = @_;
my ($sth) = $dbh->prepare("SELECT COUNT(*) FROM Questions");
$sth->execute;
- return ($sth->fetchrow)[0];
+ my $tmp=($sth->fetchrow)[0];
+ $sth->finish;
+ return $tmp;
}
sub GetMaxQId {
my ($dbh) = @_;
my ($sth) = $dbh->prepare("SELECT MAX(QuestionId) FROM Questions");
$sth->execute;
- return ($sth->fetchrow)[0];
+ my $tmp=($sth->fetchrow)[0];
+ $sth->finish;
+ return $tmp;
+
}
# Returns Id's of 12 random questions
@@ -1022,17 +1126,31 @@ sub Get12Random {
my (%chosen);
srand;
- for ($i = 0; $i < $num; $i++) {
- do {
- $q = int(rand($qnum));
- $sth = $dbh->prepare("SELECT Type FROM Questions
- WHERE QuestionId=$q");
- $sth->execute;
- $t = ($sth->fetchrow)[0];
- } until !$chosen{$q} && $t && $type =~ /[$t]/;
- $chosen{$q} = 'y';
- push @questions, $q;
+ my $where=0;
+ my $r=int (rand(10000));
+
+ foreach (split '', $type)
+ {
+ $where.= " OR (Type ='$_') OR (Type ='$_Д') ";
+ }
+ $where.= "OR (Type='ЧБ')" if ($type=~/Ч|Б/);
+
+ $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();
+
+ $sth=$dbh->prepare($q);
+ $sth->execute;
+ while (($i)=$sth->fetchrow)
+ {
+ push @questions,$i;
}
+ $sth->finish;
+ for ($i=@questions; --$i;){
+ my $j=rand ($i+1);
+ @questions[$i,$j]=@questions[$j,$i] unless $i==$j;
+ }
return @questions;
}
@@ -1067,11 +1185,12 @@ sub PrintArchive {
}
return @list;
}
- return "$SRCPATH/$Tournament{'FileName'} ";
+# return "$SRCPATH/$Tournament{'FileName'} ";
+ return "$TMPDIR/$Tournament{'FileName'} ";
}
sub PrintAll {
- my ($dbh, $Id) = @_;
+ my ($dbh, $Id,$fname) = @_;
my ($output, $list, $i);
my (%Tournament) = &GetTournament($dbh, $Id);
@@ -1083,13 +1202,26 @@ sub PrintAll {
if ($Id == 0) {
$output = h3("Все турниры");
} else {
+ my $textid;
+ if ($textid=$Tournament{'FileName'})
+ {
+ $textid=~s/\.txt//;
+ }
+ elsif ($textid=$Tournament{'Number'})
+ {
+ $fname=~s/\.txt//;
+ $textid="$fname.$textid";
+ }
+ else {$textid=$Tournament{'Id'}};
+
+
$output .= dd(img({src=>"/icons/folder.gif", alt=>"[*]"}) .
- " " . a({href=>url . "?tour=$Tournament{'Id'}&answer=0"},
+ " " . a({href=>url . "?tour=$textid&answer=0"},
$Tournament{'Title'}) ." " . $Tournament{'PlayedAt'} . " $New");
}
- if ($Id == 0 or $Tournament{'Type'} =~ /Г/) {
+ if ($Id == 0 or $Tournament{'Type'} =~ /Г/ or $Tournament{'Type'} eq '') {
for ($i = 0; $i <= $#Tours; $i++) {
- $list .= &PrintAll($dbh, $Tours[$i]);
+ $list .= &PrintAll($dbh, $Tours[$i],$Tournament{'FileName'});
}
$output .= dl($list);
}
@@ -1121,6 +1253,7 @@ sub PrintDates {
" " . a({href=>url . "?tour=$Tournament{'Id'}&answer=0"},
$Tournament{'Title'}, $Tournament{'PlayedAt'}));
}
+ $sth->finish;
$output .= dl($list);
return $output;
}
@@ -1140,6 +1273,7 @@ sub PrintQOfAuthor
my @Questions;
while (($q)=$sth->fetchrow,$q)
{push @Questions,$q unless $forbidden{$q}}
+ $sth->finish;
my ($output, $i, $suffix, $hits) = ('', 0, '', $#Questions + 1);
@@ -1198,6 +1332,7 @@ a({href=>url."?authors=surname"},"фамили
my $ar=$sth->fetchall_arrayref;
+ $sth->finish;
foreach my $arr(@$ar)
@@ -1213,10 +1348,152 @@ a({href=>url."?authors=surname"},"фамили
}
}
$output.="";
+ $sth->finish;
return $output;
}
+sub WriteFile {
+ my ($dbh,$fname) = @_;
+ $fname=~s/\.txt$//;
+ $fname=~s/.*\/(\w+)/$1/;
+ my $query= "SELECT Id, Title, Copyright, Info, URL,
+ Editors, EnteredBy, PlayedAt, CreatedAt
+ from Tournaments where 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)=
+ $sth->fetchrow;
+ return -1 unless $Id;
+ open (OUT, ">$TMPDIR/$fname.txt");
+ print OUT "Чемпионат:\n$Title\n\n";
+ my $date=$PlayedAt;
+ 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);
+
+ print OUT "Дата:\n$pdate\n\n" if $date;
+
+ print OUT "URL:\n$URL\n\n" if $URL;
+
+ print OUT "Инфо:\n$Info\n\n" if $Info;
+
+ print OUT "Копирайт:\n$Copyright\n\n" if $Copyright;
+
+ print OUT "Редактор:\n$Editors\n\n" if $Editors;
+
+
+ $query= "SELECT Id, Title, Copyright, Editors from Tournaments where ParentId=$Id order by Id";
+ $sth=$dbh->prepare($query);
+ $sth->execute;
+ my ($tourid,$tourtitle,$cright,$editor,@tours,$vid,$author,$tourauthor);
+
+
+ while (($tourid,$tourtitle,$cright,$editor)=$sth->fetchrow,$tourid)
+ {
+# $text{$tourid}="Тур:\n$tourtitle\n\n";
+ $query= "SELECT * from Questions where ParentId=$tourid order by QuestionId";
+ my $sth1=$dbh->prepare($query);
+ $sth1->execute;
+ push(@tours,$tourid);
+ $tourtitle{$tourid}=$tourtitle;
+ $copyright{$tourid}=$cright;
+ $editor{$tourid}=$editor;
+ $vid='';
+ my $author='';
+ my $eqauthor=1;
+ my $qnumber=0;
+ my @arr;
+ while ( @arr=$sth1->fetchrow, $arr[0])
+ {
+ my($i, $name) = 0;
+ $qnumber++;
+ foreach $name (@{$sth1->{NAME}}) {
+ $arr[$i]=~s/^(.*?)\s*$/$1/;
+ $Question{$tourid}[$qnumber]{$name} = $arr[$i++];
+ }
+ if ($vid)
+ {
+ if ($vid ne $Question{$tourid}[$qnumber]{'Type'}) {print STDERR "Warning: Different types for Tournament $tourid\n"}
+ } else
+ {
+ $vid=$Question{$tourid}[$qnumber]{'Type'};
+ }
+
+ if ($author)
+ {
+ if ($author ne $Question{$tourid}[$qnumber]{'Authors'})
+ {
+ $eqauthor=0;
+ }
+ } else
+ {
+ $author=$Question{$tourid}[$qnumber]{'Authors'};
+ $eqauthor=0 unless $author;
+ }
+ }
+ $vid{$tourid}=$vid;
+ $qnumber{$tourid}=$qnumber;
+ $author{$tourid}=$eqauthor ? $author : '';
+ }
+
+
+ $vid='';
+ my $eqvid=1;
+ my $eqauthor=1;
+ foreach (@tours)
+ {
+ $vid||=$vid{$_};
+ if ($vid{$_} ne $vid)
+ {
+ $eqvid=0;
+ }
+ $author||=$author{$_};
+ if (!$author{$_} || ($author{$_} ne $author))
+ {
+ $eqauthor=0;
+ }
+ }
+
+ print OUT "Вид:\n$vid\n\n" if $eqvid;
+ print OUT "Автор:\n$author\n\n" if $eqauthor;
+
+ foreach my $tour(@tours)
+ {
+ print OUT "Тур:\n$tourtitle{$tour}\n\n";
+ print OUT "Вид:\n$vid{$tour}\n\n" if !$eqvid;
+ print OUT "Копирайт:\n$copyright{$tour}\n\n" if $copyright{$tour} && ($copyright{$tour} ne $Copyright);
+ print OUT "Редактор:\n$editor{$tour}\n\n" if $editor{$tour} && ($editor{$tour} ne $Editors);
+ $tourauthor=0;
+ if (!$eqauthor && $author{$tour})
+ {
+ print OUT "Автор:\n$author{$tour}\n\n";
+ $tourauthor=1;
+ }
+ foreach my $q(1..$qnumber{$tour})
+ {
+ 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]{'Authors'}."\n\n"
+ if !$tourauthor && !$eqauthor && $Question{$tour}[$q]{'Authors'};
+ print OUT "Комментарий:\n".$Question{$tour}[$q]{'Comments'}."\n\n"
+ if $Question{$tour}[$q]{'Comments'};
+ print OUT "Источник:\n".$Question{$tour}[$q]{'Sources'}."\n\n"
+ if $Question{$tour}[$q]{'Sources'};
+ print OUT "Рейтинг:\n".$Question{$tour}[$q]{'Rating'}."\n\n"
+ if $Question{$tour}[$q]{'Rating'};
+
+ }
+ }
+
+ close OUT;
+
+
+
+}
+
MAIN:
{
@@ -1269,17 +1546,18 @@ if ((uc 'а') ne 'А') {print "Koi8-r loca
if (param('rand')) {
my ($type, $qnum) = ('', 12);
- $type .= 'Б' if (param('brain'));
- $type .= 'Ч' if (param('chgk'));
+ $type.=$TypeName{$_} foreach param('type');
+# $type .= 'Б' if (param('brain'));
+# $type .= 'Ч' if (param('chgk'));
$qnum = param('qnum') if (param('qnum') =~ /^\d+$/);
$qnum = 0 if (!$type);
- if (param('email') && -x $SENDMAIL &&
- open(F, "| $SENDMAIL -t -n")) {
- my ($Email) = param('email');
+ my $Email;
+ if (($Email=param('email')) && -x $SENDMAIL &&
+ open(F, "| $SENDMAIL $Email")) {
my ($mime_type) = $text ? "plain" : "html";
print F <Reload для получения еще одного пакета";
} else {
print &PrintRandom($dbh, $type, $qnum, $text);
@@ -1299,8 +1577,11 @@ EOT
elsif (param('qofauthor')){
&PrintQOfAuthor($dbh,param('qofauthor'));
}
- elsif (param('sstr')) {
- &PrintSearch($dbh, param('sstr'), param('metod'));
+ elsif (param('sstr')||param('was')) {
+ &PrintSearch($dbh, param('sstr'), param('metod'),param('was'));
+ $dbh->do("delete from lastqueries where
+ (TO_DAYS(NOW()) - TO_DAYS(t) >= 2) OR
+ (time_to_sec(now())-time_to_sec(t) >3600)")
}
elsif (param('qid')) {
my $qid=param('qid');
@@ -1309,6 +1590,7 @@ print $query if $printqueries;
my $sth=$dbh->prepare($query);
$sth->execute;
my $sstr= join ' ',$sth->fetchrow;
+ $sth->finish;
$searchin{'Question'}=1;
$searchin{'Answer'}=1;
$sstr=~tr/ёЁ/еЕ/;
@@ -1328,6 +1610,7 @@ $sstr=~s/[^йцукенгшщзхъфывапролджэячсмит
);
$tour = (param('tour')) ? param('tour') : 0;
my (@files) = &PrintArchive($dbh, $tour);
+ WriteFile($dbh,$_) foreach @files;
open F, "$ZIP -j - $SRCPATH/COPYRIGHT @files |";
print ();
close F;
@@ -1346,11 +1629,26 @@ $sstr=~s/[^йцукенгшщзхъфывапролджэячсмит
} else {
$tour = (param('tour')) ? param('tour') : 0;
+ my $sth;
if ($tour !~ /^[0-9]*$/) {
- my ($sth) = $dbh->prepare("SELECT Id FROM Tournaments
- WHERE FileName = '$tour.txt'");
- $sth->execute;
- $tour = ($sth->fetchrow)[0];
+ if ($tour=~/\./)
+ {
+ my ($fname,$n)= split /\./ , $tour;
+
+ $sth = $dbh->prepare(
+ "SELECT t2.Id FROM Tournaments as t1,
+ Tournaments as t2
+ WHERE t1.FileName = '$fname.txt'
+ AND t1.Id=t2.ParentId AND t2.Number=$n");
+ }
+ else
+ {
+ $sth = $dbh->prepare("SELECT Id FROM Tournaments
+ WHERE FileName = '$tour.txt'");
+ }
+ $sth->execute;
+ $tour = ($sth->fetchrow)[0];
+ $sth->finish;
}
print &PrintTournament($dbh, $tour, param('answer'));
}