--- db/prgsrc/db.cgi	2003/04/10 00:05:04	1.96
+++ db/prgsrc/db.cgi	2003/04/20 11:42:59	1.104
@@ -6,14 +6,26 @@ use strict;
 use Time::Local;
 use POSIX qw(locale_h);
 use locale;
+use vars qw($opt_z);
+use Getopt::Std;
+getopts('z');
 open STDERR, ">/var/tmp/errors1";
 my $newsurl='http://news.chgk.info/';
+my $HTMLDIR="";
+my $realHTMLDIR;
+if ($^O =~ /win/i) {
+ $realHTMLDIR="/html/znatoki/baza/";
+} else 
+{
+  $realHTMLDIR="/home/znatoki/public_html/dimrub/db/baza/";
+}
+my $usehtml=1;
 my $usewas=0;
 my $cashednumber=500;
 my $outputnumber=10;
 my ($proxyptext,$proxysstr);
 my $printqueries=0;
-my $url=url;
+my $url=url||'';
 my $qs=query_string;
 my $globaloutput;
 my %forbidden=();
@@ -28,6 +40,11 @@ if ($url !~ /db\.chgk\.info/ && $url !~
    Redirect ($u);
    exit;
 }
+if (!param('sstr') && param('all')) {
+	   my $destination='http://db.chgk.info/all.html';
+		Redirect($destination);
+                exit;
+}
 my $thislocale;
 if ($^O =~ /win/i) {
 	$thislocale = "Russian_Russia.20866";
@@ -87,7 +104,8 @@ my @months=('000','Jan',"Feb","Mar","Apr
 sub NewEnough {
 	my ($a) = @_;
 	my ($year, $month, $day) = split('-', $a);
-
+	$month=0 if ($month<0);
+	$day=0 if ($month<0);
 	return (time - timelocal(0, 0, 0, $day, $month -1, $year) < $TMSECS);
 }
 
@@ -199,6 +217,23 @@ sub GetQuestion {
 	return %Question;
 }
 
+sub tourhref {
+   my ($t,$a,$gr)=@_;
+   my $res;
+   if ($usehtml) {
+   	$res=$t;
+   	$res.=$a?"-a":"-q" unless $gr;
+   	$res.=".html";
+      	return $res;
+   } else {
+   	$res=$url;
+   	$res.="?tour=$t";
+   	$res.=$a?"?answers=1":"";
+      	return $res;
+   }
+
+}
+
 # Gets numbers of all the questions from the given tour.
 sub GetTourQuestions {
 	my ($dbh, $ParentId) = @_;
@@ -713,8 +748,8 @@ sub PrintList {
         {
            $nav.=
             ("&nbsp;"x4).
-            a({href=>url."?".$qs."\&first=1"},"<<").("&nbsp;"x4).
-            a({href=>(url."?".$qs."\&first=".($first-$outputkvo))},"<").("&nbsp;"x4)
+            a({href=>$url."?".$qs."\&first=1"},"<<").("&nbsp;"x4).
+            a({href=>($url."?".$qs."\&first=".($first-$outputkvo))},"<").("&nbsp;"x4)
 	}
         else {$nav.='&nbsp;'x15;}
 
@@ -756,14 +791,14 @@ sub PrintList {
 	  $l=$fkvo if $l>$fkvo+1;
 	  if ($f==$first) {$nav.="[$f-$l] ";}
 	  else {
-                  $nav.= "[".a({href=>(url."?".$qs."\&first=$f")},"$f-$l")."] ";}
+                  $nav.= "[".a({href=>($url."?".$qs."\&first=$f")},"$f-$l")."] ";}
 	}
         if ($lprint+$outputkvo<$fkvo)
         {
            $nav.=
             ("&nbsp;"x4).
-            a({href=>(url."?".$qs."\&first=".($first+$outputkvo))},">").("&nbsp;"x4).
-            a({href=>url."?".$qs."\&first=$llprint"},">>").("&nbsp;"x4)
+            a({href=>($url."?".$qs."\&first=".($first+$outputkvo))},">").("&nbsp;"x4).
+            a({href=>$url."?".$qs."\&first=$llprint"},">>").("&nbsp;"x4)
         }
 	$Output.= "$nav".br."\n";
 	my @q=@$Questions[$first-1..$last-1];
@@ -938,7 +973,7 @@ sub PrintTournament {
 	%Tournament = &GetTournament($dbh, $Id) if ($Id);
 
 	my ($URL) = $Tournament{'URL'};
-	$URL=~s/http:\/znatoki\/boris\/reports\//$newsurl/ if url=~/kulichki/;
+	$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'};
@@ -993,7 +1028,7 @@ sub PrintTournament {
 		} else {
 			$qnum = '';
 		}
-		if ($Tournament{'Type'} =~ /Г/) {
+		if ($Tournament{'Type'} !~ /[ТЧ]/) {
 		    $SingleTour=0;
 			$imgsrc = "/icons/folder.gif";
 			$alt = "[*]";
@@ -1015,30 +1050,32 @@ sub PrintTournament {
 	       else {$textid=$Tournament{'Id'}};
 		
 
-		if ($SingleTour or $Tournament{'Type'} =~ /Т/) {
+		if ($SingleTour or ($Tournament{'Type'} =~ /Т/)) {
 			$list .= dd(img({src=>$imgsrc, alt=>$alt})
 				. " " . $Tournament{'Title'} . " " .
-				    $Tournament{'PlayedAt'} . $qnum) .
+				    ($Tournament{'PlayedAt'}||"") . $qnum) .
 				dl(
 					dd("["
-						. a({href=>url .  "?tour=$textid&answer=0"},
+						. a({href=>tourhref($textid,0)},
 						"вопросы") . "] ["
-                  . a({href=>url .  "?tour=$textid&answer=1"},
+                  . a({href=>tourhref($textid,1)},
                   "вопросы + ответы") . "]")
 				);
 		} 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"},
+				. " " . a({href=>tourhref($textid,0,1)},
 				$Tournament{'Title'}. " ".
-					  $Tournament{'PlayedAt'}||'') . $qnum);
+					  ($Tournament{'PlayedAt'}||'')) . $qnum); 
 		}
 	}
 	$output .= dl($list);
 
 	if ($URL) {
-	        if (url=~/zaba\.ru/ && $URL=~/^\//){$URL="http://info.chgk.info$URL"}
+	        if ($url=~/zaba\.ru/ && $URL=~/^\//){$URL="http://info.chgk.info$URL"}
 		$output .=
 		p("Дополнительная информация об этом турнире - по адресу " .
 			a({-'href'=>$URL}, $URL));
@@ -1135,22 +1172,23 @@ sub PrintTour {
 	my $n=$Tour{'Number'};
 	if ($answer == 0) {
 		$bottom .=
-			"[" . a({href=>url . "?tour=$fname.$n&answer=1"}, "ответы") .  "] " . br;
+			"[" . a({href=>tourhref($fname,1)}, 
+                         "ответы") .  "] " . br;
 	}
 	if ($n>1) {
 		$bottom .=
-			"[" . a({href=>url . "?tour=$fname." . ($n - 1) . "&answer=0"},
+			"[" . a({href=>tourhref("$fname.".($n-1),0)},
 			"предыдущий тур") . "] ";
 		$bottom .=
-			"[" . a({href=>url . "?tour=$fname." . ($n - 1) . "&answer=1"},
+			"[" . a({href=>tourhref("$fname.".($n-1),1)},
 			"предыдущий тур с ответами") . "] " . br;
 	}
 	if (&IsTour($dbh, $Tour{'ParentId'}, $n + 1)) {
 		$bottom .=
-			"[" . a({href=>url . "?tour=$fname." . ($n + 1) . "&answer=0"},
+			"[" . a({href=>tourhref("$fname.".($n+1),0)},
 			"следующий тур") . "] ";
 		$bottom .=
-			"[" . a({href=>url . "?tour=$fname." . ($n + 1) . "&answer=1"},
+			"[" . a({href=>tourhref("$fname.".($n+1),1)},
 			"следующий тур с ответами") . "] ";
 	}
 
@@ -1210,10 +1248,12 @@ sub PrintQuestion {
 			$fname=~s/\.txt//;
 			$titles .=
 				dd(img({src=>"/icons/folder.open.gif"}) . " " .
-					 a({href=>url . "?tour=$fname"}, $Question{'Title'}, $Question{'PlayedAt'}||''));
+					 a({href=>tourhref($fname,0,1)}, 
+                               $Question{'Title'}, $Question{'PlayedAt'}||''));
 			$titles .=
 				dl(dd(img({src=>"/icons/folder.open.gif"}) . " " .
-					a({href=>url . "?tour=$fname.$Question{TourNumber}#$qnum"}, $Question{'TourTitle'})));
+					a({href=>tourhref("$fname.$Question{'TourNumber'}#$qnum",1)}, 
+                          $Question{'TourTitle'})));
 		}
 		$output .= dl(strong($titles));
 	}
@@ -1311,7 +1351,7 @@ $output.="</span>"
 	$output=~s/\(pic: ([^\)]*)\)/<p><img src="\/znatoki\/images\/db\/$1"><p>/g unless $text;
 	my $qid=param('tour') ? (param('tour').".$Question{'Number'}" ): '';
 
-	$output.=br.a({href=> url."?metod=proxy&
+	$output.=br.a({href=> $url."?metod=proxy&
 qid=$qid"}, 'Близкие вопросы').p
              if $answer>0 && !$text && $qid;
 	return $output;
@@ -1376,7 +1416,7 @@ sub Include_virtual {
 	my ($fn, $output) = (@_, '');
 
 	open F , $fn
-		or return; #die "Can't open the file $fn: $!\n";
+		or return ""; #die "Can't open the file $fn: $!\n";
 
 	while (<F>) {
 		if (/<!--#include/o) {
@@ -1387,7 +1427,7 @@ sub Include_virtual {
 		}
 		$output .= $_;
 	}
-	return $output;
+	return $output||"";
 }
 
 sub PrintArchive {
@@ -1433,7 +1473,7 @@ sub PrintAll {
 
 
 		$output .= dd(img({src=>"/icons/folder.gif", alt=>"[*]"}) .
-      " " . a({href=>url . "?tour=$textid&answer=0"},
+      " " . a({href=>tourhref($textid,0,1)},
       $Tournament{'Title'}) ." " . ($Tournament{'PlayedAt'}||'') . " $New");
 	}
 	if ($Id == 0 or $Tournament{'Type'} =~ /Г/ or $Tournament{'Type'} eq '') {
@@ -1467,7 +1507,7 @@ sub PrintDates {
 			if (!$array[0]);
 		%Tournament = &GetTournament($dbh, $array[0]);
       $list .= dd(img({src=>"/icons/folder.gif", alt=>"[*]"}) .
-      " " . a({href=>url . "?tour=$Tournament{'Id'}&answer=0"},
+      " " . a({href=>tourhref($Tournament{'FileName'},0,1)},
       $Tournament{'Title'}, $Tournament{'PlayedAt'}||''));
 	}
         $sth->finish;
@@ -1548,10 +1588,10 @@ sub PrintAuthors
 
 
      $sth->execute;
-     $output.=Tr(th[a({href=>url."?authors=name"},"Имя")
+     $output.=Tr(th[a({href=>$url."?authors=name"},"Имя")
 .", ".
-a({href=>url."?authors=surname"},"фамилия")
-     , a({href=>url."?authors=kvo"},"Количество вопросов")]);
+a({href=>$url."?authors=surname"},"фамилия")
+     , a({href=>$url."?authors=kvo"},"Количество вопросов")]);
 
      $out1='';
 
@@ -1567,7 +1607,7 @@ a({href=>url."?authors=surname"},"фамили
            if (!$name || !$surname) {
               } else
            {
-             my $add=Tr(td([a({href=>url."?qofauthor=$id"},"$name $surname"), $kvo]))."\n";
+             my $add=Tr(td([a({href=>$url."?qofauthor=$id"},"$name $surname"), $kvo]))."\n";
              $output.=$add;
            }
      }
@@ -1727,6 +1767,26 @@ sub WriteFile {
 
 }
 
+sub Bottom
+{
+	my $output.=&Include_virtual("../dimrub/db/footer.html")||"";
+	$output.=p."<center><font size=-2>Обновление: ".&Include_virtual("../dimrub/db/date")."</center></font>";
+	$output.=<<EEE
+<SCRIPT LANGUAGE="JavaScript">
+function toggle(e) {
+  if (e.style.display == "none") {
+     e.style.display="";
+  } else {
+     e.style.display = "none";
+ }
+}
+</SCRIPT>
+EEE
+;
+	$output.=end_html;
+	return $output;
+}
+
 
 MAIN:
 {
@@ -1814,10 +1874,10 @@ td	{font-size: x-small; font-family : sa
 th	{font-size: x-small; font-family : sans-serif}
 </style>\n";
 
-		$globaloutput.=&Include_virtual("../dimrub/db/reklama.html");
+		$globaloutput.=&Include_virtual("../dimrub/db/reklama.html")||'';
 	}
 
-       if (length ($qs)<=255 && $qs !~ /(sstr)|(rand)|(comp)/i) {
+       if (length ($qs)<=255 && $qs !~ /(sstr)|(rand)|(comp)|(all=)/i) {
         	my $sth=$dbh->prepare("SELECT page,times,t from hash where query=".$dbh->quote($qs));
         	$sth->execute();
         	my ($p,$times,$t)=$sth->fetchrow();
@@ -1857,7 +1917,8 @@ th	{font-size: x-small; font-family : sa
 		    else 
 		        {
                           $sth = $dbh->prepare("SELECT Id FROM Tournaments
-			             WHERE FileName = '$tour.txt'");
+			             WHERE FileName = '$tour.txt' OR 
+                                       FileName = '$tour'");
 			}
 		    $sth->execute;
 	            $tour = ($sth->fetchrow)[0];
@@ -1910,7 +1971,10 @@ EOT
  	elsif (param('getfile')){
            $globaloutput.=&writefile
  	} elsif (param('all')) {
-		$globaloutput.=&PrintAll($dbh, 0);
+	   my $destination='http://db.chgk.info/all.html';
+		Redirect($destination);
+                exit;
+#		$globaloutput.=&PrintAll($dbh, 0);
 	} elsif (param('from_year') && param('to_year')) {
 		$globaloutput.=&PrintDates($dbh);
 	} elsif (param('comp')) {
@@ -1940,7 +2004,8 @@ EOT
 	    $dbh->disconnect;
 	    exit;
 
-	} else {
+	} 
+        elsif (!$opt_z) {
 		my $QuestionNumber=0;
 		my $qnum;
 		if ($qnum=param('qnumber')){
@@ -1956,29 +2021,73 @@ EOT
   		   $globaloutput.=&PrintTournament($dbh, $tour, param('answer'));
   		}
 	}
+	else {
+	          open TS, "timestamp";
+	          my $d=$dbh->quote(<TS>);
+	          close TS;
+		  open FF, ">${realHTMLDIR}index.html" or die "ERROR! - ${HTMLDIR}index.html\n";
+		       my $o=$globaloutput;
+		       $o.=&PrintTournament($dbh, 0, 0);
+		       $o.=&Bottom;
+		       print FF $o;
+		  close FF;
+		  open FF, ">${realHTMLDIR}all.html" or die "ERROR! - ${HTMLDIR}all.html\n";
+		       $o=$globaloutput;
+		       $o.=&PrintAll($dbh,0);
+		       $o.=&Bottom;
+		       print FF $o;
+		       close FF;
+
+
+#      	          my ($sth) = $dbh->prepare("SELECT t1.Id, t1.FileName, t1.Type, 
+#			count(t2.Id) 
+#                     FROM Tournaments as t1, Tournaments as t2
+#		     WHERE t1.CreatedAt>$d AND t2.ParentId=t1.Id GROUP BY t1.Id");
+my ($sth) = $dbh->prepare("SELECT t1.Id, t1.FileName, t1.Type, count(t2.Id)  FROM Tournaments as t1  LEFT JOIN Tournaments as t2 
+ ON t2.ParentId=t1.id WHERE t1.CreatedAt>$d GROUP BY t1.Id");
+		  $sth->execute;
+		  my ($Id,$fname,$type,$c);
+		  while (($Id,$fname,$type,$c)=$sth->fetchrow,$Id) {
+		     next unless $fname;
+		     print "$fname\n";
+		     $fname=~s/\.txt$//;
+		     if ($type=~/Т/ || $c<=1)
+		     {
+		       open FF, ">$realHTMLDIR$fname-q.html" or die "ERROR! - $HTMLDIR$fname-q.html\n";
+		       my $o=$globaloutput;
+		       $o.=&PrintTournament($dbh, $Id, 0);
+		       $o.=&Bottom;
+		       print FF $o;
+		       close FF;
+		       open FF, ">$realHTMLDIR$fname-a.html";
+		       $o=$globaloutput;
+		       $o.=&PrintTournament($dbh, $Id, 1);
+		       $o.=&Bottom;
+		       print FF $o;
+		       close FF;
+		     }
+		     else {
+		       open FF, ">$realHTMLDIR$fname.html" or die "ERROR! - $HTMLDIR$fname-q.html\n";
+		       my $o=$globaloutput;
+		       $o.=&PrintTournament($dbh, $Id, 0);
+		       $o.=&Bottom;
+		       print FF $o;
+		       close FF;
+
+		     }
+                  }
+        }
 	if (!$text) {
-		$globaloutput.=&Include_virtual("../dimrub/db/footer.html");
-		$globaloutput.=p."<center><font size=-2>Обновление: ".&Include_virtual("../dimrub/db/date")."</center></font>";
-print <<EEE
-  <SCRIPT LANGUAGE="JavaScript">
-function toggle(e) {
-  if (e.style.display == "none") {
-     e.style.display="";
-  } else {
-     e.style.display = "none";
- }
-}
-</SCRIPT>
-EEE
-;
-		print end_html;
+		$globaloutput.=&Bottom;
 	}
-	print $globaloutput;
-	if (($qs!~ /(rand)|(sstr)|(comp)/i) && (length $qs<=255)) {
+        if (!$opt_z){ 
+	  print $globaloutput;
+	  if (($qs!~ /(rand)|(sstr)|(comp)/i) && (length $qs<=255)) {
 		$globaloutput=  $dbh->quote($globaloutput);
 		$dbh->do("insert into hash (query,page) values (".
 		$dbh->quote($qs).
                     ",$globaloutput)");
+	  }
 	}
 
 	$dbh->disconnect;