version 1.158, 2010/01/24 20:30:05
|
version 1.160, 2010/09/24 07:01:52
|
Line 233 sub SelectQuestions {
|
Line 233 sub SelectQuestions {
|
# my $where=join " OR ",@$q; |
# my $where=join " OR ",@$q; |
my $where=join ',',@$q; |
my $where=join ',',@$q; |
$where &&= "QuestionId IN (".(join ',',$where).")"; |
$where &&= "QuestionId IN (".(join ',',$where).")"; |
$where||=1; |
$where||=0; |
$where="($where) AND Questions.ParentId=t1.Id AND t1.ParentId=t2.Id" |
$where="($where) AND Questions.ParentId=t1.Id AND t1.ParentId=t2.Id" |
if $WithTour; |
if $WithTour; |
|
|
Line 1092 sub PrintTournament {
|
Line 1092 sub PrintTournament {
|
@Tours = &GetTours($dbh, $Id); |
@Tours = &GetTours($dbh, $Id); |
$list=''; |
$list=''; |
my $textid; |
my $textid; |
|
my $isGroup; |
if ($Id) { |
if ($Id) { |
for ($Tournament{'Type'}) { |
for ($Tournament{'Type'}) { |
/Г/ && do { |
/Г/ && do { |
Line 1102 sub PrintTournament {
|
Line 1103 sub PrintTournament {
|
$Tournament{'PlayedAt2'}:'') . |
$Tournament{'PlayedAt2'}:'') . |
|
|
p . "\n"; |
p . "\n"; |
|
$isGroup=1; |
last; |
last; |
}; |
}; |
/Ч/ && do { |
/Ч/ && do { |
Line 1223 sub PrintTournament {
|
Line 1225 sub PrintTournament {
|
$output .= p($Info); |
$output .= p($Info); |
} |
} |
|
|
|
|
|
|
$output.=p("<a href='/dbxml.php?tour=".param('tour')."'>XML</a>"); |
$output.=p("<a href='/dbxml.php?tour=".param('tour')."'>XML</a>"); |
|
|
|
if ($textid=$fname) |
|
{ |
|
$textid=~s/\.txt//; |
|
} |
|
if (!$isGroup) { |
|
$output .= center("<font size='-1'>[". |
|
a({href=>'/v2/print/'.$textid, target=>'_blank'}, 'версия для печати')."] [". |
|
a({href=>'/v2/fb2/'.$textid, target=>'_blank'}, 'fb2')."]"."</font>"); |
|
} |
|
|
return $output; |
return $output; |
} |
} |
Line 1340 sub PrintTour {
|
Line 1353 sub PrintTour {
|
|
|
$bottom .= |
$bottom .= |
"[" . a({href=>tourhref("$fname$nn",1)}, |
"[" . a({href=>tourhref("$fname$nn",1)}, |
"ответы") . "] " . br."\n"; |
"ответы") . "] " |
} |
} |
|
$bottom .= "[".a({href=>'/v2/print/'.$fname, target=>'_blank'}, 'версия для печати')."] [". |
|
a({href=>'/v2/fb2/'.$fname, target=>'_blank'}, 'fb2')."]".br; |
|
|
|
# $bottom .= "[".a({href=>'/v2/print/'.$fname.'.'.$Tour{'Number'}, target=>'_blank'}, 'версия для печати')."]".br; |
|
|
if ($n>1) { |
if ($n>1) { |
$bottom .= |
$bottom .= |
"[" . a({href=>tourhref("$fname.".($n-1),0)}, |
"[" . a({href=>tourhref("$fname.".($n-1),0)}, |
Line 1350 sub PrintTour {
|
Line 1368 sub PrintTour {
|
"[" . a({href=>tourhref("$fname.".($n-1),1)}, |
"[" . a({href=>tourhref("$fname.".($n-1),1)}, |
"предыдущий тур с ответами") . "] " . br."\n"; |
"предыдущий тур с ответами") . "] " . br."\n"; |
} |
} |
|
|
if (&IsTour($dbh, $Tour{'ParentId'}, $n + 1)) { |
if (&IsTour($dbh, $Tour{'ParentId'}, $n + 1)) { |
$bottom .= |
$bottom .= |
"[" . a({href=>tourhref("$fname.".($n+1),0)}, |
"[" . a({href=>tourhref("$fname.".($n+1),0)}, |