--- db/prgsrc/db.cgi	2002/10/06 23:12:22	1.75
+++ db/prgsrc/db.cgi	2002/11/10 16:10:53	1.78
@@ -1,12 +1,13 @@
 #!/usr/bin/perl -w
 
-use  DBI;
+use DBI;
 use CGI ':all';
 use strict;
 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'),
@@ -813,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'};
@@ -1062,6 +1065,7 @@ 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"}) . " " .