--- db/prgsrc/db.cgi	2002/10/06 08:18:34	1.73
+++ db/prgsrc/db.cgi	2003/01/12 09:51:35	1.81
@@ -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);
@@ -774,6 +779,8 @@ print "$query" if $printqueries;
 
 sub PrintRandom {
    my ($dbh, $type, $num, $text) = @_;
+   my $razd=param('razd');
+   my $answer=$razd?0:1;
    my (@Questions) = &Get12Random($dbh, $type, $num);
 	my ($output, $i) = ('', 0);
 
@@ -788,8 +795,17 @@ sub PrintRandom {
 		# Passing DB handler, question ID, print answer, question
 		# number, print title, print text/html
 		$output .=
-			&PrintQuestion($dbh, $Questions[$i], 1, $i + 1, 0, $text);
+			&PrintQuestion($dbh, $Questions[$i], $answer, $i + 1, 0, $text);
 	}
+	unless ($answer )
+        { 
+         $output.=$text?"\n".('-'x 20)."\nОтветы\n~~~~~~\n\n":h2('Ответы');
+         for ($i = 0; $i <= $#Questions; $i++) {
+		$output .=
+			&PrintQuestion($dbh, $Questions[$i], -1, $i + 1, 0, $text);
+	 }
+        }
+
 	return $output;
 }
 
@@ -809,6 +825,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 +838,7 @@ sub PrintTournament {
 			/Г/ && do {
 				$output .= h2({align=>"center"},
 					      "Группа: $Tournament{'Title'} ",
-					      "$Tournament{'PlayedAt'}") . p . "\n";
+					      $Tournament{'PlayedAt'}||'') . p . "\n";
 				last;
 			};
 			/Ч/ && do {
@@ -901,7 +919,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 +990,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);
@@ -1034,6 +1052,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;
@@ -1053,15 +1073,16 @@ sub PrintQuestion {
 	$qnum = $Question{'Number'}
 		if ($qnum == 0);
 	if (!$text) {
-		$output .= hr({width=>"50%"});
+		$output .= hr({width=>"50%"}) if $answer>=0;
 		if ($title) {
 			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'})));
@@ -1070,23 +1091,23 @@ sub PrintQuestion {
 	}
 
 
-	$output.= "<a NAME=\"$qnum\">";
+	$output.= "<a NAME=\"$qnum\">" unless $text;
 
-	$output .=
-		&PrintField("Вопрос $qnum", $Question{'Question'}, $text);
-
-	if ($answer==1) {
+	if ($answer>=0) {$output .=
+		&PrintField("Вопрос $qnum", $Question{'Question'}, $text);}
+	else {$output .="$qnum. "}
+	if ($answer==1|| $answer==-1) {
 		$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;
@@ -1107,7 +1128,7 @@ sub PrintQuestion {
                            }
                            $q=~s/($sha)/a({href=>url."?qofauthor=$AuthorId"},$1)/ei;
                        }
- 
+                      }
 			$output .= &PrintField("Автор(ы)", $q, $text);
 
 		}
@@ -1148,12 +1169,13 @@ EOTT
 			$output .= &PrintField("Комментарии", $Question{'Comments'}, $text);
 		}
 
+	$output=~s/(pic:[^\)]*)/<img src="\/images\/$1">/g;
 
 $output.="</span>"
 
 	}
 	$output.=br.a({href=> url."?metod=proxy&qid=$Id"}, 'Близкие вопросы').p
-             if $answer;
+             if $answer>0 && !$text;
 	return $output;
 }
 
@@ -1272,7 +1294,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 +1328,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 +1449,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);