--- db/prgsrc/db.cgi	2002/06/13 00:16:10	1.68
+++ db/prgsrc/db.cgi	2003/01/12 09:51:35	1.81
@@ -2,12 +2,12 @@
 
 use DBI;
 use CGI ':all';
-#use Text::Query;
 use strict;
 use Time::Local;
 use POSIX qw(locale_h);
 use locale;
-open STDERR, ">errors1";
+open STDERR, ">/var/tmp/errors1";
+my $newsurl='http://news.chgk.info/';
 my $printqueries=0;
 my %forbidden=();
 my $debug=0; #added by R7
@@ -16,7 +16,10 @@ if (param('debug')) {$debug=1; $printque
 my %fieldname= (0,'Question', 1, 'Answer', 2, 'Comments', 3, 'Authors', 4, 'Sources');
 my %rusfieldname=('Question','Вопрос', 'Answer', 'Ответ', 
                   'Comments', 'Комментарии', 'Authors', 'Автор', 
-                  'Sources', 'Источник','old','Старый','rus','Новый');
+                  'Sources', 'Источник','old','Старый','rus','Новый',
+                  'chgk', 'ЧГК', 'brain', 'Брейн-ринг','game', 'Своя игра', 
+                  'ehruditka', 'Эрудитка', 'beskrylka', 'Бескрылка', 'igp', 'Интернет'
+);
 my %searchin;
 my $rl=qr/[йцукенгшщзхъфывапролджэячсмитьбюё]/;
 my $RL=qr/[ЙЦУКЕНГШЩЗХЪЭЖДЛОРПАВЫФЯЧСМИТЬБЮЁ]/;
@@ -30,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'=>'Э');
 
 
@@ -39,11 +42,11 @@ my $all=param('all');
 $all=0 if lc $all eq 'no';
 my ($PWD) = `pwd`;
 chomp $PWD;
-my ($SRCPATH) = "$PWD/../dimrub/src";
-my ($ZIP) = "/home/piataev/bin/zip";
+my ($SRCPATH) = "/home/piataev/public_html/dimrub/src";
+my ($ZIP) = "/usr/local/bin/zip";
 my $DUMPFILE = "/tmp/chgkdump";
 my ($SENDMAIL) = "/usr/sbin/sendmail";
-my ($TMPDIR) = "/tmp";
+my ($TMPDIR) = "/var/tmp";
 my ($TMSECS) = 30*24*60*60;
 my (%RevMonths) =
 	('Jan', '0', 'Feb', '1', 'Mar', '2', 'Apr', '3', 'May', '4', 'Jun', '5',
@@ -110,7 +113,7 @@ sub GetTourQuestions {
 	my (@arr, @Questions);
 
 	my ($sth) = $dbh->prepare("SELECT QuestionId FROM Questions
-		WHERE ParentId=$ParentId");
+		WHERE ParentId=$ParentId order by Number");
 
 	$sth->execute;
 
@@ -171,7 +174,11 @@ sub printform
   @df=('Question', 'Answer') unless @df;
   my $fields=checkbox_group('searchin',['Question','Answer','Comments','Authors','Sources'], [@df],
              'false',\%rusfieldname);
+  @df=param('type');
+  @df=('chgk','brain','igp','game','ehruditka','beskrylka') unless @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'),
                        -labels=>\%rusfieldname);
@@ -189,7 +196,9 @@ table(Tr
 (
   td({-valign=>'TOP'},$inputstring.$submit.p."Метод: $metod".p."Слова: $all"),
   td({-valign=>'TOP'},(' 'x 8).'Поля:'),
-  td({-valign=>'TOP'},$fields), td(" "x5),
+  td({-valign=>'TOP'},$fields), 
+  td({-valign=>'TOP'},(' 'x 1).'Типы:'),
+  td({-valign=>'TOP'},$types), td(" "x5),
   td({-valign=>'TOP'},$qnumber)
 ) 
 )
@@ -525,17 +534,19 @@ 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;
 	  } else {
 		$sstr = join " OR $f LIKE ", @sar;
     	  }
-
+    	  
    my $query;
                $query="SELECT QuestionId FROM Questions
-		WHERE $f LIKE $sstr ORDER BY QuestionId";
+		WHERE ($f LIKE $sstr) AND (".&makewhere.") ORDER BY QuestionId";
 
 
 print $query if $printqueries;
@@ -548,9 +559,23 @@ print $query if $printqueries;
 	}
         $sth->finish;
 print "@Questions" if $printqueries;
+        
 	return @Questions;
 }
 
+sub makewhere {
+      my @type=param('type');    
+      my $type='';
+
+      $type .= ($_=$TypeName{$_}) foreach @type;
+      my $where=' 0 ';
+      foreach (@type) {
+ 	     $where.= " OR (Type ='$_') OR (Type ='$_Д') ";
+      } 
+      $where.= "OR (Type='ЧБ')" if ($type=~/Ч|Б/);
+      return $where;
+}
+
  # Substitute every letter by a pair (for case insensitive search).
  my (@letters) = qw/аА бБ вВ гГ дД еЕ жЖ зЗ иИ йЙ кК лЛ мМ нН оО
  пП рР сС тТ уУ фФ хХ цЦ чЧ шШ щЩ ьЬ ыЫ эЭ юЮ яЯ/;
@@ -580,10 +605,10 @@ sub PrintList {
         my $qs=query_string;
 	$qs=~s/\;/\&/g;
         $qs=~s/\&first\=[^\&]+//g;
-        my $sstr=param('sstr');
+        my $sstr=param('sstr')||'';
         $qs=~s/sstr=[^\&]+/sstr=$sstr/;
         $qs=~s/\&was=[^\&]+//;
-        $qs.="&was=$was";
+        $qs.="&was=$was"||'';
         if ($first>$kvo*3+1)
         {
            $nav.=
@@ -646,7 +671,7 @@ sub PrintList {
 	print "$nav".br."\n";
 	for (my $i = $first; $i <= $last; $i++) {
 		my $output = &PrintQuestion($dbh, $$Questions[$i-1], 1, 0, 1);
-                if (param('metod') eq 'rus' || param('metod') eq 'proxy')
+                if (param('metod') && (param('metod') eq 'rus' || param('metod') eq 'proxy'))
                 {
 	             $output=~s/\b($shablon)\b/\<strong\>$1\<\/strong\>/gi;
 	        } else {
@@ -739,12 +764,14 @@ print "$query" if $printqueries;
 		$sstr = '[ 	\.\,:;]' . $sstr . '[  \.\,:\;]';
 	}
 
-	$sstr =~ s/(.)/&NoCase($1)/ge;
+#	$sstr =~ s/(.)/&NoCase($1)/ge;
 
 	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);
@@ -752,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);
 
@@ -766,14 +795,23 @@ 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;
 }
 
 sub PrintEditor {
        my $t=shift; #ссылка на Хэш с полями
-       my $ed=$$t{'Editors'};
+       my $ed=$$t{'Editors'}||'';
        my $edname=($ed=~/\,/ ) ? "Редакторы"  : "Редактор" ;
        return $ed? h4({align=>"center"},"$edname: $ed" ): '';
 }
@@ -787,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'};
@@ -798,7 +838,7 @@ sub PrintTournament {
 			/Г/ && do {
 				$output .= h2({align=>"center"},
 					      "Группа: $Tournament{'Title'} ",
-					      "$Tournament{'PlayedAt'}") . p . "\n";
+					      $Tournament{'PlayedAt'}||'') . p . "\n";
 				last;
 			};
 			/Ч/ && do {
@@ -874,17 +914,18 @@ sub PrintTournament {
                   "вопросы + ответы") . "]")
 				);
 		} else {
-			$list .= dd(#a({href=>url . "?tour=$textid&comp=1"},
-				#img({src=>'/icons/compressed.gif', alt=>'[ZIP]', border=>1})). " " . 
+			$list .= dd(a({href=>url . "?tour=$textid&comp=1"},
+				img({src=>'/icons/compressed.gif', alt=>'[ZIP]', border=>1})). " " . 
                                 img({src=>$imgsrc, alt=>$alt})
 				. " " . a({href=>url . "?tour=$textid&answer=0"},
 				$Tournament{'Title'}. " ".
-					  $Tournament{'PlayedAt'}) . $qnum);
+					  $Tournament{'PlayedAt'}||'') . $qnum);
 		}
 	}
 	$output .= dl($list);
 
 	if ($URL) {
+	        if (url=~/zaba\.ru/ && $URL=~/^\//){$URL="http://info.chgk.info$URL"}
 		$output .=
 		p("Дополнительная информация об этом турнире - по адресу " .
 			a({-'href'=>$URL}, $URL));
@@ -949,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);
@@ -1011,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;
@@ -1030,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'})));
@@ -1047,47 +1091,46 @@ 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);
-
-#                      while ((($AuthorId,$Name, $Surname,$Nicks)=$sth->fetchrow),$AuthorId)
-#                      {
-#                        my ($firstletter)=$Name=~m/^./g;
-#                         $Name=~s/\./\\\./g;
-#                          my $sha="(?:$Name\\s+$Surname)|(?:$Surname\\s+$Name)|(?:$firstletter\\.\\s*$Surname)|(?:$Surname\\s+$firstletter\\.)|(?:$Surname)|(?:$Name)";
-#                          if ($Nicks)
-#                          {
-#                            $Nicks=~s/^\|//;
-#                            foreach (split /\|/, $Nicks)
-#                            {
-#                              s/\s+/ /g;
-#                              s/\s+$//;
-#                              s/ /\\s+/g;
-#                              s/\./\\\./g;
-#                              if (s/>$//) {$sha="$sha|(?:$_)"}
-#                              else        {$sha="(?:$_)|$sha"}
-#                            }
-#                          }
-#                          $q=~s/($sha)/a({href=>url."?qofauthor=$AuthorId"},$1)/ei;
-#                      }
-
+###АВТОРА!!
+ 		      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;
+                          $Name=~s/\./\\\./g;
+                           my $sha="(?:$Name\\s+$Surname)|(?:$Surname\\s+$Name)|(?:$firstletter\\.\\s*$Surname)|(?:$Surname\\s+$firstletter\\.)|(?:$Surname)|(?:$Name)";
+                           if ($Nicks)
+                           {
+                             $Nicks=~s/^\|//;
+                             foreach (split /\|/, $Nicks)
+                             {
+                               s/\s+/ /g;
+                               s/\s+$//;
+                               s/ /\\s+/g;
+                               s/\./\\\./g;
+                               if (s/>$//) {$sha="$sha|(?:$_)"}
+                               else        {$sha="(?:$_)|$sha"}
+                             }
+                           }
+                           $q=~s/($sha)/a({href=>url."?qofauthor=$AuthorId"},$1)/ei;
+                       }
+                      }
 			$output .= &PrintField("Автор(ы)", $q, $text);
 
-#                        $output.= &PrintField("Другие вопросы", $other);
 		}
 
 		if ($Question{'Sources'}) {
@@ -1126,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;
+	$output.=br.a({href=> url."?metod=proxy&qid=$Id"}, 'Близкие вопросы').p
+             if $answer>0 && !$text;
 	return $output;
 }
 
@@ -1161,7 +1205,6 @@ sub Get12Random {
 	my ($qnum) = &GetMaxQId($dbh);
 	my (%chosen);
 	srand;
-
 	my $where=0;
 	my $r=int (rand(10000));
 
@@ -1173,7 +1216,6 @@ sub Get12Random {
 
    $q="select QuestionId, QuestionId/$r-floor(QuestionId/$r) as val 
        from Questions where $where order by val limit $num";
-
 # Когда на куличках появится mysql >=3.23 надо заменить на order by rand();
 
    $sth=$dbh->prepare($q);
@@ -1214,7 +1256,6 @@ sub PrintArchive {
 
 	my (%Tournament) = &GetTournament($dbh, $Id);
 	my (@Tours) = &GetTours($dbh, $Id);
-
 	if ($Tournament{'Type'} =~ /Г/ || $Id == 0) {
 		for ($i = 0; $i <= $#Tours; $i++) {
 			push(@list ,&PrintArchive($dbh, $Tours[$i]));
@@ -1253,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++) {
@@ -1287,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);
@@ -1391,8 +1432,11 @@ a({href=>url."?authors=surname"},"фамили
 
 sub WriteFile {
   my ($dbh,$fname) = @_;
+  $fname=~s/\s+$//;
+  $fname=~s/^\s+//;
   $fname=~s/\.txt$//;
   $fname=~s/.*\/(\w+)/$1/;
+
   my $query= "SELECT Id, Title, Copyright, Info, URL, 
                       Editors, EnteredBy, PlayedAt, CreatedAt 
                      from Tournaments where FileName=".$dbh->quote("$fname.txt");
@@ -1403,9 +1447,9 @@ sub WriteFile {
    $Editors, $EnteredBy, $PlayedAt, $CreatedAt)=
       $sth->fetchrow;
   return -1 unless $Id;
-  open (OUT, ">$TMPDIR/$fname.txt");
+  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);
@@ -1442,13 +1486,19 @@ sub WriteFile {
     my $eqauthor=1;
     my $qnumber=0;
     my @arr;
-    while ( @arr=$sth1->fetchrow, $arr[0])
+    while ( (@arr=$sth1->fetchrow), $arr[0])
     {
-	my($i, $name) = 0;
+	my($i, $name);
+	$i=0;
 	$qnumber++;
 	foreach $name (@{$sth1->{NAME}}) {
-	        $arr[$i]=~s/^(.*?)\s*$/$1/;
-		$Question{$tourid}[$qnumber]{$name} = $arr[$i++];
+	        if ($arr[$i]) {
+  	           $arr[$i]=~s/^(.*?)\s*$/$1/;
+		   $Question{$tourid}[$qnumber]{$name} = $arr[$i];
+		} else {
+  	            $Question{$tourid}[$qnumber]{$name} = 
+                   ''}
+                $i++;
 	}
 	if ($vid)
         {
@@ -1578,6 +1628,28 @@ if ((uc 'а') ne 'А') {print "Koi8-r loca
                   }
                   $sth->finish;
         }
+		$tour = (param('tour')) ? param('tour') : 0;
+		my $sth;
+		if ($tour !~ /^[0-9]*$/) {
+		    if ($tour=~/\./)
+		    {
+		        my ($fname,$n)= split /\./ , $tour;
+
+	                $sth = $dbh->prepare(
+                       "SELECT t2.Id FROM Tournaments as t1, 
+                        Tournaments as t2 
+			WHERE t1.FileName = '$fname.txt'
+                        AND t1.Id=t2.ParentId AND t2.Number=$n");
+		    }	
+		    else 
+		        {
+                          $sth = $dbh->prepare("SELECT Id FROM Tournaments
+			             WHERE FileName = '$tour.txt'");
+			}
+		    $sth->execute;
+	            $tour = ($sth->fetchrow)[0];
+                    $sth->finish;
+		}
 
 
 	if (param('rand')) {
@@ -1634,20 +1706,30 @@ $sstr=~s/[^йцукенгшщзхъфывапролджэячсмит
 #              print &PrintQuestion($dbh,$qid, 1, '!');
  	      &PrintSearch($dbh, $sstr, 'proxy');
  	}
-
-          elsif (param('all')) {
+ 	elsif (param('getfile')){
+          print &writefile
+ 	} elsif (param('all')) {
 		print &PrintAll($dbh, 0);
 	} elsif (param('from_year') && param('to_year')) {
 		print &PrintDates($dbh);
 	} elsif (param('comp')) {
-	    print header(
-			 -'Content-Type' => 'application/x-zip-compressed; name="db.zip"',
-			 -'Content-Disposition' => 'attachment; filename="db.zip"'
-			 );
-	    $tour = (param('tour')) ? param('tour') : 0;
+            print "Content-Type: application/octet-stream\n";
+            print "Content-Type: application/force-download\n";
+            print "Content-Type: application/download\n";
+            print "Content-Type: application/x-zip-compressed; name=db.zip\n";
+            print "Content-Disposition: attachment; filename=db.zip \n\n";
+#	    print header(
+#			 -'Content-Type' => 'application/x-zip-compressed; name="db.zip"',
+#			 -'Content-Type' => 'application/zip',
+#			 -'Content-Disposition' => 'attachment; filename="db.zip"'
+#			 );
+	    $tour ||= 0;
 	    my (@files) = &PrintArchive($dbh, $tour);
 	    WriteFile($dbh,$_) foreach @files;
-	    open F, "$ZIP -j - $SRCPATH/COPYRIGHT @files |";
+#	    open F, "$ZIP -j - $SRCPATH/COPYRIGHT @files |";
+	    open F, "$ZIP -j - @files |";
+	    binmode(F);
+	    binmode(STDOUT);
 	    print (<F>);
 	    close F;
 	    $dbh->disconnect;
@@ -1664,28 +1746,6 @@ $sstr=~s/[^йцукенгшщзхъфывапролджэячсмит
 	    exit;
 
 	} else {
-		$tour = (param('tour')) ? param('tour') : 0;
-		my $sth;
-		if ($tour !~ /^[0-9]*$/) {
-		    if ($tour=~/\./)
-		    {
-		        my ($fname,$n)= split /\./ , $tour;
-
-	                $sth = $dbh->prepare(
-                       "SELECT t2.Id FROM Tournaments as t1, 
-                        Tournaments as t2 
-			WHERE t1.FileName = '$fname.txt'
-                        AND t1.Id=t2.ParentId AND t2.Number=$n");
-		    }	
-		    else 
-		        {
-                          $sth = $dbh->prepare("SELECT Id FROM Tournaments
-			             WHERE FileName = '$tour.txt'");
-			}
-		    $sth->execute;
-	            $tour = ($sth->fetchrow)[0];
-                    $sth->finish;
-		}
 		my $QuestionNumber=0;
 		my $qnum;
 		if ($qnum=param('qnumber')){