--- db/prgsrc/db.cgi	2002/10/06 08:18:34	1.73
+++ db/prgsrc/db.cgi	2002/11/10 16:10:53	1.78
@@ -7,6 +7,7 @@ use Time::Local;
 use POSIX qw(locale_h);
 use locale;
 open STDERR, ">/var/tmp/errors1";
+my $newsurl='http://news.chgk.info/';
 my $printqueries=0;
 my %forbidden=();
 my $debug=0; #added by R7
@@ -17,7 +18,7 @@ my %rusfieldname=('Question','Вопрос', '
                   'Comments', 'Комментарии', 'Authors', 'Автор', 
                   'Sources', 'Источник','old','Старый','rus','Новый',
                   'chgk', 'ЧГК', 'brain', 'Брейн-ринг','game', 'Своя игра', 
-                  'ehruditka', 'Эрудитка', 'beskrylka', 'Бескрылка'
+                  'ehruditka', 'Эрудитка', 'beskrylka', 'Бескрылка', 'igp', 'Интернет'
 );
 my %searchin;
 my $rl=qr/[йцукенгшщзхъфывапролджэячсмитьбюё]/;
@@ -32,7 +33,7 @@ my %metodchar=('rus',1,'old',2);
 my $thislocale;
 
 $searchin{$_}=1 foreach param('searchin');
-my %TypeName=('children'=>'Д', 'game'=>'И',
+my %TypeName=('children'=>'Д', 'game'=>'Я', 'igp'=>'И',
               'chgk'=>'Ч', 'brain'=>'Б', 'beskrylka'=>'Л','ehruditka'=>'Э');
 
 
@@ -174,9 +175,9 @@ sub printform
   my $fields=checkbox_group('searchin',['Question','Answer','Comments','Authors','Sources'], [@df],
              'false',\%rusfieldname);
   @df=param('type');
-  @df=('chgk','brain','game','ehruditka','beskrylka') unless @df;
+  @df=('chgk','brain','igp','game','ehruditka','beskrylka') unless @df;
 
-  my $types=checkbox_group('type',['chgk','brain','game','ehruditka','beskrylka'], [@df],
+  my $types=checkbox_group('type',['chgk','brain','igp','game','ehruditka','beskrylka'], [@df],
              'false',\%rusfieldname);
   my $metod=radio_group(-name=>'metod',-values=>['old','rus'],
                        -default=>(param('metod')||'rus'),
@@ -533,7 +534,9 @@ sub Search {
 	  for $i (0 .. $#sar) {
 		$sar[$i] = $dbh->quote("%${sar[$i]}%");
 	  }
-
+	  $_.=' ' foreach (@fields); # Это чтобы последнее слово поля
+	                             # не сливалось с первым словом
+	                             # следующего поля, R7
 	  my($f) = "CONCAT(" . join(',', @fields) . ")";
 	  if (param('all') eq 'yes') {
 		$sstr = join " AND $f LIKE ", @sar;
@@ -766,7 +769,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);
@@ -809,6 +814,8 @@ sub PrintTournament {
 	%Tournament = &GetTournament($dbh, $Id) if ($Id);
 
 	my ($URL) = $Tournament{'URL'};
+	$URL=~s/http:\/znatoki\/boris\/reports\//$newsurl/ if url=~/kulichki/;
+	$URL=~s/\/znatoki\/boris\/reports\//$newsurl/ if url=~/kulichki/;;
 	my ($Info) = $Tournament{'Info'};
 	my ($Copyright) = $Tournament{'Copyright'};
 	my $fname=$Tournament{'FileName'};
@@ -820,7 +827,7 @@ sub PrintTournament {
 			/Г/ && do {
 				$output .= h2({align=>"center"},
 					      "Группа: $Tournament{'Title'} ",
-					      "$Tournament{'PlayedAt'}") . p . "\n";
+					      $Tournament{'PlayedAt'}||'') . p . "\n";
 				last;
 			};
 			/Ч/ && do {
@@ -901,7 +908,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 +979,7 @@ sub PrintTour {
 	my ($suffix) = &Suffix($qnum);
 
 	$output .= h2({align=>"center"}, $Tournament{"Title"},
-		      $Tournament{'PlayedAt'},
+		      $Tournament{'PlayedAt'}||'',
 		      "<br>", $Tour{"Title"} .
 		" ($qnum вопрос$suffix)\n") . p;
 	$output .=&PrintEditor(\%Tour);
@@ -1058,10 +1065,11 @@ sub PrintQuestion {
 			my (%Tour) = GetTournament($dbh, $Question{'ParentId'});
 			my (%Tournament) = GetTournament($dbh, $Tour{'ParentId'});
 			my $fname=$Tournament{'FileName'};
+return "" if $fname=~/mgp0203/;
 			$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 +1280,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 +1314,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 +1435,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);