--- db/prgsrc/db.cgi	2002/10/06 08:58:12	1.74
+++ db/prgsrc/db.cgi	2002/11/26 05:34:39	1.79
@@ -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;
@@ -811,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'};
@@ -1036,6 +1041,8 @@ sub PrintField {
 	    $value =~ s/^\s+/<br>&nbsp;&nbsp;&nbsp;&nbsp;/mg;
 	    $value =~ s/^\|([^\n]*)/<pre>$1<\/pre>/mg;
 	    $value =~ s/\s+-+\s+/&nbsp;&#0150; /mg;
+	    $value =~ s/(http:\/\/\S+[^\s\)\(\,\.])/<a href="$1">$1<\/a>/g if $header !~ /^Авто/;
+#	    $value =~ s/(http:\/\/(?:\w+.)+[\w\\\~]+(\?[^\s.]+)?)/<a href="$1">$1<\/a>/g if $header !~ /^Авто/;
 #	    $value =~ s/(\s)"/$1&#147;/mg;
 #	    $value =~ s/^"/&#147;/mg;
 #	    $value =~ s/"/&#148;/mg;
@@ -1060,6 +1067,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"}) . " " .
@@ -1072,7 +1080,7 @@ sub PrintQuestion {
 	}
 
 
-	$output.= "<a NAME=\"$qnum\">";
+	$output.= "<a NAME=\"$qnum\">" unless $text;
 
 	$output .=
 		&PrintField("Вопрос $qnum", $Question{'Question'}, $text);
@@ -1081,14 +1089,14 @@ sub PrintQuestion {
 		$output .=
 			&PrintField("Ответ", $Question{'Answer'}, $text);
 
-		if ($Question{'Authors'}) {
+		if ($Question{'Authors'} ) {
                       my $q=$Question{'Authors'};
 ###АВТОРА!!
  		      my $sth=$dbh->prepare("select Authors.Id,Name, Surname, Nicks from Authors, A2Q
                                   where Authors.Id=Author And Question=$Id");
                        $sth->execute;
                        my ($AuthorId,$Name, $Surname,$other,$Nicks);
-
+                      if (!$text) {
                        while ((($AuthorId,$Name, $Surname,$Nicks)=$sth->fetchrow),$AuthorId)
                        {
                          my ($firstletter)=$Name=~m/^./g;
@@ -1109,7 +1117,7 @@ sub PrintQuestion {
                            }
                            $q=~s/($sha)/a({href=>url."?qofauthor=$AuthorId"},$1)/ei;
                        }
- 
+                      }
 			$output .= &PrintField("Автор(ы)", $q, $text);
 
 		}
@@ -1155,7 +1163,7 @@ $output.="</span>"
 
 	}
 	$output.=br.a({href=> url."?metod=proxy&qid=$Id"}, 'Близкие вопросы').p
-             if $answer;
+             if $answer && !$text;
 	return $output;
 }