--- db/prgsrc/db.cgi 2000/10/19 23:04:46 1.5
+++ db/prgsrc/db.cgi 2000/10/24 17:59:25 1.11
@@ -9,7 +9,8 @@ use POSIX qw(locale_h);
my ($PWD) = `pwd`;
chomp $PWD;
my ($SRCPATH) = "$PWD/../dimrub/src";
-my ($ZIP) = "/usr/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) =
@@ -108,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($_, '')";
}
@@ -224,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 {
@@ -269,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"},
@@ -282,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);
@@ -337,6 +346,7 @@ sub PrintTour {
my ($suffix) = &Suffix($qnum);
$output .= h2({align=>"center"}, $Tournament{"Title"},
+ $Tournament{'PlayedAt'},
"
", $Tour{"Title"} .
" ($qnum ×ÏÐÒÏÓ$suffix)\n") . p;
@@ -415,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'})));
@@ -464,18 +474,18 @@ sub Get12Random {
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 {
@@ -527,7 +537,7 @@ sub PrintAll {
} else {
$output .= dd(img({src=>"/icons/folder.gif", alt=>"[*]"}) .
" " . a({href=>url . "?tour=$Tournament{'Id'}&answer=0"},
- $Tournament{'Title'}) . " $New");
+ $Tournament{'Title'}) ." " . $Tournament{'PlayedAt'} . " $New");
}
if ($Id == 0 or $Tournament{'Type'} =~ /ç/) {
for ($i = 0; $i <= $#Tours; $i++) {
@@ -561,7 +571,7 @@ sub PrintDates {
%Tournament = &GetTournament($dbh, $array[0]);
$list .= dd(img({src=>"/icons/folder.gif", alt=>"[*]"}) .
" " . a({href=>url . "?tour=$Tournament{'Id'}&answer=0"},
- $Tournament{'Title'}));
+ $Tournament{'Title'}, $Tournament{'PlayedAt'}));
}
$output .= dl($list);
return $output;
@@ -580,7 +590,7 @@ MAIN:
print end_html;
die "Can't connect to DB chgk\n";
};
- if (!param('comp') and !$text) {
+ if (!param('comp') and !param('sqldump') and !$text) {
print header;
print start_html(-"title"=>'Database of the questions',
-author=>'dimrub@icomverse.com',
@@ -594,16 +604,18 @@ MAIN:
}
if (param('rand')) {
- my ($type, $qnum) = ('þ', 12);
- $type = 'â' if (param('brain'));
+ my ($type, $qnum) = ('', 12);
+ $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 ($mime_type) = $text ? "plain" : "html";
print F < 'application/x-zip-compressed; name="db.zip"',
- -'Content-Disposition' => 'attachment; filename="db.zip"'
- );
- $tour = (param('tour')) ? param('tour') : 0;
- my (@files) = &PrintArchive($dbh, $tour);
- open F, "$ZIP -j - $SRCPATH/COPYRIGHT @files |";
- print ();
- close F;
- $dbh->disconnect;
- exit;
+ print header(
+ -'Content-Type' => 'application/x-zip-compressed; name="db.zip"',
+ -'Content-Disposition' => 'attachment; filename="db.zip"'
+ );
+ $tour = (param('tour')) ? param('tour') : 0;
+ my (@files) = &PrintArchive($dbh, $tour);
+ open F, "$ZIP -j - $SRCPATH/COPYRIGHT @files |";
+ print ();
+ close F;
+ $dbh->disconnect;
+ exit;
+ } elsif (param('sqldump')) {
+ print header(
+ -'Content-Type' => 'application/x-zip-compressed; name="dump.zip"',
+ -'Content-Disposition' => 'attachment; filename="dump.zip"'
+ );
+ open F, "$ZIP -j - $DUMPFILE |";
+ print ();
+ close F;
+ $dbh->disconnect;
+ exit;
+
} else {
$tour = (param('tour')) ? param('tour') : 0;
if ($tour !~ /^[0-9]*$/) {