version 1.132, 2004/03/17 10:26:31
|
version 1.139, 2005/02/26 11:03:41
|
Line 3
|
Line 3
|
use DBI; |
use DBI; |
use CGI ':all'; |
use CGI ':all'; |
#use strict; |
#use strict; |
|
my @softfields=("От Олега Степанова"); |
use Time::Local; |
use Time::Local; |
my $proxyredirect=1; |
my $proxyredirect=1; |
use POSIX qw(locale_h); |
use POSIX qw(locale_h); |
Line 10 use locale;
|
Line 11 use locale;
|
use vars qw($opt_z); |
use vars qw($opt_z); |
use Getopt::Std; |
use Getopt::Std; |
#my ($dbuser,$dbname,$dbpass,$dbhost); |
#my ($dbuser,$dbname,$dbpass,$dbhost); |
require "dbdefs.pl"; |
eval {require "dbdefs.pl";} ; |
my $url=url||''; |
my $url=url||''; |
|
my @used_stop=(); |
$dbuser||="piataev"; |
$dbuser||="piataev"; |
$dbname||="chgk"; |
$dbname||="chgk"; |
$dbpass||=""; |
$dbpass||=""; |
Line 48 if ($^O =~ /win/i) {
|
Line 50 if ($^O =~ /win/i) {
|
|
|
my $usehtml=$opt_z||0; |
my $usehtml=$opt_z||0; |
$usehtml=1; |
$usehtml=1; |
$usehtml=0 if $url=~/zaba/; |
$usehtml=0 if $url=~/zaba/ || $url=~/localhost/; |
|
|
my $usewas=0; |
my $usewas=0; |
my $cashednumber=500; |
my $cashednumber=500; |
Line 92 POSIX::setlocale( &POSIX::LC_ALL, $thisl
|
Line 94 POSIX::setlocale( &POSIX::LC_ALL, $thisl
|
|
|
if ((uc 'а') ne 'А') {print STDERR "Koi8-r locale not installed!\n"}; |
if ((uc 'а') ne 'А') {print STDERR "Koi8-r locale not installed!\n"}; |
|
|
my %fieldname= (0,'Question', 1, 'Answer', 2, 'Comments', 3, 'Authors', 4, 'Sources'); |
my %fieldname= (0,'Question', 1, 'Answer', 2, 'PassCriteria', 3, 'Comments', 4, 'Authors', 5, 'Sources'); |
my %rusfieldname=('Question','Вопрос', 'Answer', 'Ответ', |
my %rusfieldname=('Question','Вопрос', 'Answer', 'Ответ', 'PassCriteria','Зачёт', |
'Comments', 'Комментарии', 'Authors', 'Автор', |
'Comments', 'Комментарии', 'Authors', 'Автор', |
'Sources', 'Источник','old','Старый','rus','Новый', |
'Sources', 'Источник','old','Старый','rus','Новый', |
'chgk', 'ЧГК', 'brain', 'Брейн-ринг','game', 'Своя игра', |
'chgk', 'ЧГК', 'brain', 'Брейн-ринг','game', 'Своя игра', |
Line 206 sub GetTournament {
|
Line 208 sub GetTournament {
|
sub fetchquestion { |
sub fetchquestion { |
my ($sth,$q,$WithTour)=@_; |
my ($sth,$q,$WithTour)=@_; |
if ($WithTour) { |
if ($WithTour) { |
($$q{'QuestionId'}, $$q{'Question'},$$q{'Answer'},$$q{'Comments'},$$q{'Authors'},$$q{'Sources'}, |
($$q{'QuestionId'}, $$q{'Question'},$$q{'Answer'},$$q{'PassCriteria'},$$q{'Comments'},$$q{'Authors'},$$q{'Sources'}, |
$$q{'Number'}, |
$$q{'Number'}, |
$$q{'Title'}, $$q{'TourTitle'}, $$q{'FileName'},$$q{'PlayedAt'},$$q{'TourNumber'}) = |
$$q{'Title'}, $$q{'TourTitle'}, $$q{'FileName'},$$q{'PlayedAt'},$$q{'TourNumber'}) = |
$sth->fetchrow; |
$sth->fetchrow; |
} else { |
} else { |
($$q{'QuestionId'}, $$q{'Question'},$$q{'Answer'},$$q{'Comments'},$$q{'Authors'},$$q{'Sources'}, |
($$q{'QuestionId'}, $$q{'Question'},$$q{'Answer'},$$q{'PassCriteria'},$$q{'Comments'},$$q{'Authors'},$$q{'Sources'}, |
$$q{'Number'})= |
$$q{'Number'})= |
$sth->fetchrow; |
$sth->fetchrow; |
} |
} |
Line 233 sub SelectQuestions {
|
Line 235 sub SelectQuestions {
|
|
|
my $query; |
my $query; |
if ($WithTour) { |
if ($WithTour) { |
$query="SELECT QuestionId, Questions.Question, Answer, Comments, Authors, Sources, |
$query="SELECT QuestionId, Questions.Question, Answer, PassCriteria, Comments, Authors, Sources, |
Questions.Number |
Questions.Number |
, t2.Title, t1.Title, t2.FileName, t2.PlayedAt,t1.Number |
, t2.Title, t1.Title, t2.FileName, t2.PlayedAt,t1.Number |
from Questions,Tournaments as t1, Tournaments as t2 |
from Questions,Tournaments as t1, Tournaments as t2 |
WHERE $where"; |
WHERE $where"; |
} else { |
} else { |
$query="SELECT QuestionId, Questions.Question, Answer, Comments, Authors, Sources, |
$query="SELECT QuestionId, Questions.Question, Answer, PassCriteria, Comments, Authors, Sources, |
Questions.Number from Questions |
Questions.Number from Questions |
WHERE $where"; |
WHERE $where"; |
} |
} |
Line 357 sub printform
|
Line 359 sub printform
|
my $sstr=param('sstr'); |
my $sstr=param('sstr'); |
my @df=keys %searchin; |
my @df=keys %searchin; |
my %checked; |
my %checked; |
$checked{lc $_}="" foreach ('Question','Answer','Comments','Authors','Sources','old','rus', |
$checked{lc $_}="" foreach ('Question','Answer','PassCriteria','Comments','Authors','Sources','old','rus', |
'chgk','brain','igp','game','ehruditka','beskrylka'); |
'chgk','brain','igp','game','ehruditka','beskrylka'); |
@df=('Question', 'Answer') unless @df; |
@df=('Question', 'Answer') unless @df; |
$checked{lc $_}="checked" foreach @df; |
$checked{lc $_}="checked" foreach @df; |
my $fields=checkbox_group('searchin',['Question','Answer','Comments','Authors','Sources'], [@df], |
my $fields=checkbox_group('searchin',['Question','Answer','PassCriteria','Comments','Authors','Sources'], [@df], |
'false',\%rusfieldname); |
'false',\%rusfieldname); |
@df=param('type'); |
@df=param('type'); |
@df=('chgk','brain','igp','game','ehruditka','beskrylka') unless @df; |
@df=('chgk','brain','igp','game','ehruditka','beskrylka') unless @df; |
Line 387 action="/znatoki/cgi-bin/db.cgi">
|
Line 389 action="/znatoki/cgi-bin/db.cgi">
|
<table border="1" cellpadding=4 cellspacing=0> |
<table border="1" cellpadding=4 cellspacing=0> |
<tr> |
<tr> |
<th align="left" rowspan=3 width="20%"> Вариант поиска: |
<th align="left" rowspan=3 width="20%"> Вариант поиска: |
</td><td rowspan=2 colspan=2> |
</td><td rowspan=2 colspan=3> |
<input type="radio" $checked{'old'} name="metod" value="old"> Простой (старый) |
<input type="radio" $checked{'old'} name="metod" value="old"> Простой (старый) |
</td><td> |
</td><td> |
<input type="checkbox" $checked{'chgk'} name="type" value="chgk"> "Что? Где? Когда?" |
<input type="checkbox" $checked{'chgk'} name="type" value="chgk"> "Что? Где? Когда?" |
Line 405 action="/znatoki/cgi-bin/db.cgi">
|
Line 407 action="/znatoki/cgi-bin/db.cgi">
|
<input type="checkbox" $checked{'beskrylka'} name="type" value="beskrylka"> "Бескрылка" |
<input type="checkbox" $checked{'beskrylka'} name="type" value="beskrylka"> "Бескрылка" |
</td> |
</td> |
</tr><tr> |
</tr><tr> |
<td colspan=5><input type="radio" $checked{'rus'} name="metod" value="rus"> Расширенный (с учетом грамматики, в вопросах всех типов) |
<td colspan=6><input type="radio" $checked{'rus'} name="metod" value="rus"> Расширенный (с учетом грамматики, в вопросах всех типов) |
</td> |
</td> |
</tr><tr> |
</tr><tr> |
<th align="left">Искать: |
<th align="left">Искать: |
</td><td colspan=2> |
</td><td colspan=3> |
<input type="radio" $checked{'all'} name="all" value="yes">Все слова |
<input type="radio" $checked{'all'} name="all" value="yes">Все слова |
</td><td colspan=3> |
</td><td colspan=3> |
<input type="radio" $checked{'any'} name="all" value="no">Любое слово |
<input type="radio" $checked{'any'} name="all" value="no">Любое слово |
Line 421 action="/znatoki/cgi-bin/db.cgi">
|
Line 423 action="/znatoki/cgi-bin/db.cgi">
|
</td><td width="15%"> |
</td><td width="15%"> |
<input type="checkbox" name="searchin" value="Answer" $checked{'answer'}>Ответ<br> |
<input type="checkbox" name="searchin" value="Answer" $checked{'answer'}>Ответ<br> |
</td><td width="15%"> |
</td><td width="15%"> |
|
<input type="checkbox" name="searchin" value="PassCriteria" $checked{'passcriteria'}>Зачёт<br> |
|
</td><td width="15%"> |
<input type="checkbox" name="searchin" value="Comments" $checked{'comments'}>Комментарии<br> |
<input type="checkbox" name="searchin" value="Comments" $checked{'comments'}>Комментарии<br> |
</td><td width="15%"> |
</td><td width="15%"> |
<input type="checkbox" name="searchin" value="Authors" $checked{'authors'}>Автор<br> |
<input type="checkbox" name="searchin" value="Authors" $checked{'authors'}>Автор<br> |
Line 497 sub russearch {
|
Line 501 sub russearch {
|
my %relevance; |
my %relevance; |
my @blob; |
my @blob; |
my %count; |
my %count; |
|
my %stop_word; |
POSIX::setlocale( &POSIX::LC_ALL, $thislocale ); |
POSIX::setlocale( &POSIX::LC_ALL, $thislocale ); |
$sstr=~tr/йцукенгшщзхъфывапролджэячсмитьбю/ЙЦУКЕНГШЩЗХЪФЫВАПРОЛДЖЭЯЧСМИТЬБЮ/; |
$sstr=~tr/йцукенгшщзхъфывапролджэячсмитьбю/ЙЦУКЕНГШЩЗХЪФЫВАПРОЛДЖЭЯЧСМИТЬБЮ/; |
# @qw=@w =split (' ', uc $sstr); |
# @qw=@w =split (' ', uc $sstr); |
my $ts=uc $sstr; |
my $ts=uc $sstr; |
@qw=@w= $ts=~m/(?:(?:${RLrl})+)|(?:[A-Za-z0-9]+)/gom; |
@qw=@w= $ts=~m/(?:(?:${RLrl})+)|(?:[A-Za-z0-9]+)/gom; |
|
$query="select nf.word from nf where number>=50000"; |
|
$sth=$dbh->prepare($query); |
|
$sth->execute(); |
|
%stop_word=(); |
|
while (@arr = $sth->fetchrow) |
|
{ |
|
$stop_word{$arr[0]}=1; |
|
} |
|
$sth->finish; |
|
|
|
|
#----------- |
#----------- |
foreach $i (0..$#w) # заполняем массив @nf начальных форм |
foreach $i (0..$#w) # заполняем массив @nf начальных форм |
# $nf[$i] -- ссылка на массив возможных |
# $nf[$i] -- ссылка на массив возможных |
# начальных форм словоформы $i |
# начальных форм словоформы $i |
{ |
{ |
|
(push @used_stop, uc $w[$i]),next if $stop_word{uc $w[$i]}; |
$qw= $dbh->quote (uc $w[$i]); |
$qw= $dbh->quote (uc $w[$i]); |
|
|
$query=" select distinct w2 from nests |
$query=" select distinct w2 from nests |
where w1=$qw"; |
where w1=$qw"; |
$sth=$dbh -> prepare($query); |
$sth=$dbh -> prepare($query); |
Line 554 $sstr=~tr/йцукенгшщзхъфывапролджэячсмить
|
Line 570 $sstr=~tr/йцукенгшщзхъфывапролджэячсмить
|
$_= " word2question.word=$_" foreach @arr; |
$_= " word2question.word=$_" foreach @arr; |
$_= " nf.id=".$_. ' ' foreach @arr1; |
$_= " nf.id=".$_. ' ' foreach @arr1; |
# @arr=(0) unless @arr; |
# @arr=(0) unless @arr; |
$query="select questions from word2question where (". (join ' OR ', @arr).") AND length(questions)<80000"; |
$query="select questions from word2question where (". (join ' OR ', @arr).") "; |
|
|
$sth=$dbh -> prepare($query); |
$sth=$dbh -> prepare($query); |
$sth->execute; |
$sth->execute; |
Line 616 $sstr=~tr/йцукенгшщзхъфывапролджэячсмить
|
Line 632 $sstr=~tr/йцукенгшщзхъфывапролджэячсмить
|
#Ищем пересечение или объединение списков вопросов (значений %tasksof) |
#Ищем пересечение или объединение списков вопросов (значений %tasksof) |
foreach $sf (keys %tasksof) |
foreach $sf (keys %tasksof) |
{ |
{ |
$count{$_}++ foreach keys %{$tasksof{$sf}}; |
foreach (keys %{$tasksof{$sf}}) |
|
{ |
|
next if $forbidden{$_}; |
|
$count{$_}++ |
|
} |
|
|
} |
} |
@tasks= ($all ? (grep {$count{$_}==$kvo} keys %count) : |
@tasks= ($all ? (grep {$count{$_}==$kvo} keys %count) : |
keys %count) ; |
keys %count) ; |
Line 704 sub Search {
|
Line 725 sub Search {
|
###Simple and advanced query processing. Added by R7 |
###Simple and advanced query processing. Added by R7 |
if ($metod eq 'simple' || $metod eq 'advanced') |
if ($metod eq 'simple' || $metod eq 'advanced') |
{ |
{ |
foreach (qw/Question Answer Sources Authors Comments/) { |
foreach (qw/Question Answer PassCriteria Sources Authors Comments/) { |
if (param($_)) { |
if (param($_)) { |
push @fields, $_; |
push @fields, $_; |
} |
} |
} |
} |
|
|
@fields=(qw/Question Answer Sources Authors Comments/) unless scalar @fields; |
@fields=(qw/Question Answer PassCriteria Sources Authors Comments/) unless scalar @fields; |
my $fields=join ",", @fields; |
my $fields=join ",", @fields; |
my $q=new Text::Query($sstr, |
my $q=new Text::Query($sstr, |
-parse => 'Text::Query::'. |
-parse => 'Text::Query::'. |
Line 728 sub Search {
|
Line 749 sub Search {
|
###### |
###### |
{ |
{ |
|
|
# foreach (qw/Question Answer Sources Authors Comments/) { |
|
foreach (param('searchin')) { |
foreach (param('searchin')) { |
# if (param($_)) { |
# if (param($_)) { |
push @fields, "IFNULL($_, '')"; |
push @fields, "IFNULL($_, '')"; |
Line 884 sub PrintList {
|
Line 904 sub PrintList {
|
for (my $i = $first; $i <= $last; $i++) { |
for (my $i = $first; $i <= $last; $i++) { |
my $q=$q{$$Questions[$i-1]}; |
my $q=$q{$$Questions[$i-1]}; |
my $output; |
my $output; |
$output = &PrintQuestion($dbh, $q, 1, 0, 1,0,1 ); |
$output = &PrintQuestion($dbh, $q, 1, 0, 1,$text,1 ); |
# if (param('metod') && (param('metod') eq 'rus' || param('metod') eq 'proxy')) |
# if (param('metod') && (param('metod') eq 'rus' || param('metod') eq 'proxy')) |
{ |
{ |
$output=~s/\b($shablon)\b/\<strong\>$1\<\/strong\>/gi; |
$output=~s/\b($shablon)\b/\<strong\>$1\<\/strong\>/gi; |
Line 938 sub PrintSearch {
|
Line 958 sub PrintSearch {
|
|
|
|
|
$Output.= p. "Время поиска: " . (time-$t) ." сек.".p; |
$Output.= p. "Время поиска: " . (time-$t) ." сек.".p; |
|
$_="\"$_\"" foreach @used_stop; |
|
$Output.= p. (join ', ',@used_stop) ." ignored".p if @used_stop; |
my ($output, $i, $suffix, $hits) = ('', 0, '', $#Questions + 1); |
my ($output, $i, $suffix, $hits) = ('', 0, '', $#Questions + 1); |
|
|
my $shablon; |
my $shablon; |
Line 1256 sub PrintTour {
|
Line 1278 sub PrintTour {
|
my $sth=SelectQuestions($dbh,\@Questions,0); |
my $sth=SelectQuestions($dbh,\@Questions,0); |
for ($q = 0; $q <= $#Questions; $q++) { |
for ($q = 0; $q <= $#Questions; $q++) { |
fetchquestion($sth,\%q,0); |
fetchquestion($sth,\%q,0); |
$output .= &PrintQuestion($dbh, \%q, $answer, 0,0,0,1); |
$output .= &PrintQuestion($dbh, \%q, $answer, 0,0,$text,1); |
} |
} |
$sth->finish; |
$sth->finish; |
$output .= hr({-'align'=>'center', -'width'=>'80%'}); |
$output .= hr({-'align'=>'center', -'width'=>'80%'}); |
Line 1312 sub PrintField {
|
Line 1334 sub PrintField {
|
if ($text) { |
if ($text) { |
$value =~ s/<[\/\w]*?>//sg; |
$value =~ s/<[\/\w]*?>//sg; |
} else { |
} else { |
|
if ($header=~/Комментар/) |
|
{ |
|
$value=~s/^\s*$_[\.:]/p."\n".strong("$_").":"/me foreach @softfields; |
|
} |
|
|
$value =~ s/^\s+/<br> /mg; |
$value =~ s/^\s+/<br> /mg; |
$value =~ s/(\s+)-+(\s+)/$1–$2/mg; |
$value =~ s/(\s+)-+(\s+)/$1–$2/mg; |
$value =~ s/\s+\–/ \–/mg |
$value =~ s/\s+\–/ \–/mg |
Line 1324 sub PrintField {
|
Line 1351 sub PrintField {
|
# $value =~ s/"/”/mg; |
# $value =~ s/"/”/mg; |
} |
} |
|
|
|
if ($value=~/^\s*(<p.*?>)?\s*<strong/) { |
|
return $text ? "$value\n\n" : |
|
$value . p . "\n"; |
|
} |
return $text ? "$header:\n$value\n\n" : |
return $text ? "$header:\n$value\n\n" : |
strong("$header: ") . $value . p . "\n"; |
strong("$header: ") . $value . p . "\n"; |
} |
} |
Line 1334 sub PrintField {
|
Line 1364 sub PrintField {
|
sub PrintQuestion { |
sub PrintQuestion { |
my ($dbh, $Id, $answer, $qnum, $title, $text,$h) = @_; |
my ($dbh, $Id, $answer, $qnum, $title, $text,$h) = @_; |
my ($output, $titles) = ('', ''); |
my ($output, $titles) = ('', ''); |
|
my $fname; |
my (%Question); |
my (%Question); |
if ($h) { |
if ($h) { |
%Question=%$Id; |
%Question=%$Id; |
Line 1355 sub PrintQuestion {
|
Line 1386 sub PrintQuestion {
|
if (!$text) { |
if (!$text) { |
$output .= hr({width=>"50%"}) if $answer>=0; |
$output .= hr({width=>"50%"}) if $answer>=0; |
if ($title) { |
if ($title) { |
my $fname=$Question{'FileName'}; |
$fname=$Question{'FileName'}; |
$fname=~s/\.txt//; |
$fname=~s/\.txt//; |
$titles .= |
$titles .= |
dd(img({src=>"/icons/folder.open.gif"}) . " " . |
dd(img({src=>"/icons/folder.open.gif"}) . " " . |
Line 1378 sub PrintQuestion {
|
Line 1409 sub PrintQuestion {
|
if ($answer==1|| $answer==-1) { |
if ($answer==1|| $answer==-1) { |
$output .= |
$output .= |
&PrintField("Ответ", $Question{'Answer'}, $text); |
&PrintField("Ответ", $Question{'Answer'}, $text); |
|
if ($Question{'PassCriteria'} ) { |
|
$output .= |
|
&PrintField("Зачёт", $Question{'PassCriteria'}, $text); |
|
} |
|
|
if ($Question{'Authors'} ) { |
if ($Question{'Authors'} ) { |
my $q=$Question{'Authors'}; |
my $q=$Question{'Authors'}; |
Line 1446 EOTT
|
Line 1481 EOTT
|
if ($Question{'Authors'}) { |
if ($Question{'Authors'}) { |
$output .= &PrintField("Автор(ы)", $Question{'Authors'}, $text); |
$output .= &PrintField("Автор(ы)", $Question{'Authors'}, $text); |
} |
} |
|
if ($Question{'PassCriteria'}) { |
|
$output .= &PrintField("Зачёт", $Question{'PassCriteria'}, $text); |
|
} |
|
|
if ($Question{'Sources'}) { |
if ($Question{'Sources'}) { |
$output .= &PrintField("Источник(и)", $Question{'Sources'}, $text); |
$output .= &PrintField("Источник(и)", $Question{'Sources'}, $text); |
} |
} |
Line 1460 $output.="</span>"
|
Line 1499 $output.="</span>"
|
|
|
} |
} |
$output=~s/\(pic: ([^\)]*)\)/<p><img src="\/znatoki\/images\/db\/$1"><p>/g unless $text; |
$output=~s/\(pic: ([^\)]*)\)/<p><img src="\/znatoki\/images\/db\/$1"><p>/g unless $text; |
|
$output=~s/⌡/\ï/g; |
|
$output=~s/⌠/\Ï/g; |
|
|
$paramtour||=param("tour"); |
$paramtour||=param("tour"); |
my $qid=$paramtour ? ($paramtour.".$Question{'Number'}" ): ''; |
$fname=$fname.".$Question{'TourNumber'}" if $fname && $Question{'TourNumber'}; |
|
$fname||=param('tour'); |
|
my $qid=$fname ? ($fname.".$Question{'Number'}" ): ''; |
|
|
$output.=br.a({href=> $url."?metod=proxy& |
$output.=br.a({href=> $url."?metod=proxy& |
qid=$qid"}, 'Близкие вопросы').p |
qid=$qid"}, 'Близкие вопросы').p |
Line 1688 sub PrintQOfAuthor
|
Line 1732 sub PrintQOfAuthor
|
$suffix = 'я'; |
$suffix = 'я'; |
} |
} |
$Output.= printform; |
$Output.= printform; |
$Output.= p({align=>"center"}, "Автор ".strong("$name $surname. ") |
$Output.= p({align=>"center"}, "Автор ".strong("$name $surname ") |
. " : $hits попадани$suffix."); |
. " : $hits попадани$suffix."); |
|
|
|
|
Line 1887 sub WriteFile {
|
Line 1931 sub WriteFile {
|
{ |
{ |
print OUT "Вопрос $q:\n".$Question{$tour}[$q]{'Question'}."\n\n"; |
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]{'Answer'}."\n\n"; |
|
print OUT "Зачёт:\n".$Question{$tour}[$q]{'PassCriteria'}."\n\n"; |
print OUT "Автор:\n".$Question{$tour}[$q]{'Authors'}."\n\n" |
print OUT "Автор:\n".$Question{$tour}[$q]{'Authors'}."\n\n" |
if !$tourauthor && !$eqauthor && $Question{$tour}[$q]{'Authors'}; |
if !$tourauthor && !$eqauthor && $Question{$tour}[$q]{'Authors'}; |
print OUT "Комментарий:\n".$Question{$tour}[$q]{'Comments'}."\n\n" |
print OUT "Комментарий:\n".$Question{$tour}[$q]{'Comments'}."\n\n" |
Line 2097 th {font-size: x-small; font-family : sa
|
Line 2142 th {font-size: x-small; font-family : sa
|
} |
} |
|
|
|
|
|
|
if (param('rand')) { |
if (param('rand')) { |
my ($type, $qnum) = ('', 12); |
my ($type, $qnum) = ('', 12); |
$type.=$TypeName{$_} foreach param('type'); |
$type.=$TypeName{$_} foreach param('type'); |
Line 2186 EOT
|
Line 2232 EOT
|
$QuestionNumber=($sth->fetchrow)[0]||0; |
$QuestionNumber=($sth->fetchrow)[0]||0; |
} |
} |
if ($QuestionNumber) { |
if ($QuestionNumber) { |
$globaloutput.= &PrintQuestion($dbh, $QuestionNumber, $withanswers||0, $qnum, 1,0,0); |
$globaloutput.= &PrintQuestion($dbh, $QuestionNumber, $withanswers||0, $qnum, 1,$text,0); |
# $dbh, $Id, $answer, $qnum, $title, $text |
# $dbh, $Id, $answer, $qnum, $title, $text |
} else { |
} else { |
$globaloutput.=&PrintTournament($dbh, $tour, $withanswers); |
$globaloutput.=&PrintTournament($dbh, $tour, $withanswers); |