--- db/prgsrc/db.cgi 2000/10/15 19:49:22 1.1
+++ db/prgsrc/db.cgi 2001/01/26 12:09:32 1.13
@@ -9,13 +9,17 @@ use POSIX qw(locale_h);
my ($PWD) = `pwd`;
chomp $PWD;
my ($SRCPATH) = "$PWD/../dimrub/src";
-my ($ZIP) = "/usr/local/bin/zip";
+my ($ZIP) = "/home/piataev/bin/zip";
+my $DUMPFILE = "/tmp/chgkdump";
my ($SENDMAIL) = "/usr/sbin/sendmail";
my ($TMSECS) = 30*24*60*60;
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');
+ 'Dec', '11',
+ 'ñÎ×', '0', 'æÅ×', 1, 'íÁÒ', 2, 'áÐÒ', 3, 'íÁÊ', '4',
+ 'éÀÎ', '5', 'éÀÌ', 6, 'á×Ç', '7', 'óÅÎ', '8',
+ 'ïËÔ', '9', 'îÏÑ', '19', 'äÅË', '11');
# Determine whether the given time is within 2 months from now.
sub NewEnough {
@@ -105,8 +109,8 @@ sub Search {
my (@arr, @Questions, @fields);
my (@sar, $i, $sth);
- push @fields, 'Question';
- foreach (qw/Answer Sources Authors Comments/) {
+# push @fields, 'Question';
+ foreach (qw/Question Answer Sources Authors Comments/) {
if (param($_)) {
push @fields, "IFNULL($_, '')";
}
@@ -172,7 +176,7 @@ sub PrintSearch {
$sstr =~ s/(.)/&NoCase($1)/ge;
- my(@sar) = split(/\s/, $sstr);
+ my(@sar) = split(' ', $sstr);
for ($i = 0; $i <= $#Questions; $i++) {
$output = &PrintQuestion($dbh, $Questions[$i], 1, $i + 1, 1);
foreach (@sar) {
@@ -221,15 +225,21 @@ sub PrintTournament {
for ($Tournament{'Type'}) {
/ç/ && do {
$output .= h2({align=>"center"},
- "çÒÕÐÐÁ: $Tournament{'Title'}") . p . "\n";
+ "çÒÕÐÐÁ: $Tournament{'Title'} ",
+ "$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"},
- "þÅÍÐÉÏÎÁÔ: $Tournament{'Title'}") . p . "\n";
+ "$title") . p . "\n";
last;
};
/ô/ && do {
@@ -266,7 +276,8 @@ sub PrintTournament {
if ($SingleTour or $Tournament{'Type'} =~ /ô/) {
$list .= dd(img({src=>$imgsrc, alt=>$alt})
- . " " . $Tournament{'Title'} . $qnum) .
+ . " " . $Tournament{'Title'} . " " .
+ $Tournament{'PlayedAt'} . $qnum) .
dl(
dd("["
. a({href=>url . "?tour=$Tournament{'Id'}&answer=0"},
@@ -279,7 +290,8 @@ sub PrintTournament {
img({src=>'/icons/compressed.gif', alt=>'[ZIP]', border=>1}))
. " " . img({src=>$imgsrc, alt=>$alt})
. " " . a({href=>url . "?tour=$Tournament{'Id'}&answer=0"},
- $Tournament{'Title'}) . $qnum);
+ $Tournament{'Title'}. " ".
+ $Tournament{'PlayedAt'}) . $qnum);
}
}
$output .= dl($list);
@@ -333,7 +345,9 @@ sub PrintTour {
my ($qnum) = $Tour{'QuestionsNum'};
my ($suffix) = &Suffix($qnum);
- $output .= h2({align=>"center"}, $Tour{"Title"} .
+ $output .= h2({align=>"center"}, $Tournament{"Title"},
+ $Tournament{'PlayedAt'},
+ "
", $Tour{"Title"} .
" ($qnum ×ÏÐÒÏÓ$suffix)\n") . p;
my (@Questions) = &GetTourQuestions($dbh, $Id);
@@ -388,7 +402,10 @@ 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;
}
return $text ? "$header:\n$value\n\n" :
strong("$header: ") . $value . p . "\n";
@@ -408,7 +425,7 @@ sub PrintQuestion {
my (%Tournament) = GetTournament($dbh, $Tour{'ParentId'});
$titles .=
dd(img({src=>"/icons/folder.open.gif"}) . " " .
- a({href=>url . "?tour=$Tournament{'Id'}"}, $Tournament{'Title'}));
+ a({href=>url . "?tour=$Tournament{'Id'}"}, $Tournament{'Title'}, $Tournament{'PlayedAt'}));
$titles .=
dl(dd(img({src=>"/icons/folder.open.gif"}) . " " .
a({href=>url . "?tour=$Tour{'Id'}"}, $Tour{'Title'})));
@@ -448,34 +465,40 @@ sub GetQNum {
$sth->execute;
return ($sth->fetchrow)[0];
}
+sub GetMaxQId {
+ my ($dbh) = @_;
+ my ($sth) = $dbh->prepare("SELECT MAX(QuestionId) FROM Questions");
+ $sth->execute;
+ return ($sth->fetchrow)[0];
+}
# Returns Id's of 12 random questions
sub Get12Random {
my ($dbh, $type, $num) = @_;
my ($i, @questions, $q, $t, $sth);
- my ($qnum) = &GetQNum($dbh);
+ my ($qnum) = &GetMaxQId($dbh);
my (%chosen);
srand;
- for ($i = 0; $i < $num; $i++) {
- do {
- $q = int(rand($qnum));
- $sth = $dbh->prepare("SELECT Type FROM Questions
+ 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/;
- $chosen{$q} = 'y';
- push @questions, $q;
- }
- return @questions;
+ $sth->execute;
+ $t = ($sth->fetchrow)[0];
+ } until !$chosen{$q} && $t && $type =~ /[$t]/;
+ $chosen{$q} = 'y';
+ push @questions, $q;
+ }
+ return @questions;
}
sub Include_virtual {
my ($fn, $output) = (@_, '');
open F , $fn
- or die "Can't open the file $fn: $!\n";
+ or return; #die "Can't open the file $fn: $!\n";
while () {
if (/