--- db/prgsrc/db.cgi 2000/10/19 22:34:56 1.4
+++ db/prgsrc/db.cgi 2000/10/20 04:06:54 1.6
@@ -108,8 +108,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 +224,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 +275,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 +289,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 +345,7 @@ sub PrintTour {
my ($suffix) = &Suffix($qnum);
$output .= h2({align=>"center"}, $Tournament{"Title"},
+ $Tournament{'PlayedAt'},
"
", $Tour{"Title"} .
" ($qnum вопрос$suffix)\n") . p;
@@ -392,7 +401,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"; @@ -412,7 +424,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'}))); @@ -524,7 +536,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++) { @@ -558,7 +570,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;