--- db/prgsrc/db.cgi 2002/10/06 08:18:34 1.73 +++ db/prgsrc/db.cgi 2002/10/06 08:58:12 1.74 @@ -766,7 +766,9 @@ print "$query" if $printqueries; my @sar; if ($metod ne 'rus') { - (@sar) = split(' ', $sstr); + my $ss=$sstr; + (@sar) = split(' ', $ss); + s/(\W)/\\$1/g foreach (@sar); $shablon=join "|",@sar; } PrintList($dbh,\@Questions,$shablon,$was); @@ -820,7 +822,7 @@ sub PrintTournament { /Г/ && do { $output .= h2({align=>"center"}, "Группа: $Tournament{'Title'} ", - "$Tournament{'PlayedAt'}") . p . "\n"; + $Tournament{'PlayedAt'}||'') . p . "\n"; last; }; /Ч/ && do { @@ -901,7 +903,7 @@ sub PrintTournament { img({src=>$imgsrc, alt=>$alt}) . " " . a({href=>url . "?tour=$textid&answer=0"}, $Tournament{'Title'}. " ". - $Tournament{'PlayedAt'}) . $qnum); + $Tournament{'PlayedAt'}||'') . $qnum); } } $output .= dl($list); @@ -972,7 +974,7 @@ sub PrintTour { my ($suffix) = &Suffix($qnum); $output .= h2({align=>"center"}, $Tournament{"Title"}, - $Tournament{'PlayedAt'}, + $Tournament{'PlayedAt'}||'', "
", $Tour{"Title"} . " ($qnum вопрос$suffix)\n") . p; $output .=&PrintEditor(\%Tour); @@ -1061,7 +1063,7 @@ sub PrintQuestion { $fname=~s/\.txt//; $titles .= dd(img({src=>"/icons/folder.open.gif"}) . " " . - a({href=>url . "?tour=$fname"}, $Tournament{'Title'}, $Tournament{'PlayedAt'})); + a({href=>url . "?tour=$fname"}, $Tournament{'Title'}, $Tournament{'PlayedAt'}||'')); $titles .= dl(dd(img({src=>"/icons/folder.open.gif"}) . " " . a({href=>url . "?tour=$fname.$Tour{Number}#$qnum"}, $Tour{'Title'}))); @@ -1272,7 +1274,7 @@ sub PrintAll { $output .= dd(img({src=>"/icons/folder.gif", alt=>"[*]"}) . " " . a({href=>url . "?tour=$textid&answer=0"}, - $Tournament{'Title'}) ." " . $Tournament{'PlayedAt'} . " $New"); + $Tournament{'Title'}) ." " . ($Tournament{'PlayedAt'}||'') . " $New"); } if ($Id == 0 or $Tournament{'Type'} =~ /Г/ or $Tournament{'Type'} eq '') { for ($i = 0; $i <= $#Tours; $i++) { @@ -1306,7 +1308,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{'PlayedAt'})); + $Tournament{'Title'}, $Tournament{'PlayedAt'}||'')); } $sth->finish; $output .= dl($list); @@ -1427,7 +1429,7 @@ sub WriteFile { return -1 unless $Id; open (OUT, ">$TMPDIR/$fname.txt") || print STDERR "Error in $fname.txt\n"; print OUT "Чемпионат:\n$Title\n\n"; - my $date=$PlayedAt; + my $date=$PlayedAt||'00-00-00'; my ($year,$month,$day)=split /-/, $date; # $month=0,$date=0 if $year && $month==1 && $day==1; my $pdate=sprintf("%02d-%3s-%4d",$day,$months[$month],$year);