--- db/prgsrc/db.cgi	2003/04/20 08:06:44	1.101
+++ db/prgsrc/db.cgi	2003/04/20 12:27:29	1.111
@@ -11,13 +11,13 @@ use Getopt::Std;
 getopts('z');
 open STDERR, ">/var/tmp/errors1";
 my $newsurl='http://news.chgk.info/';
-my $HTMLDIR="";
+my $HTMLDIR="/znatoki/dimrub/db/baza/";
 my $realHTMLDIR;
 if ($^O =~ /win/i) {
- $realHTMLDIR="/html/znatoki/baza";
+ $realHTMLDIR="/html/znatoki/baza/";
 } else 
 {
-  $realHTMLDIR="/home/znatoki/public_html/dimrub/db/baza";
+  $realHTMLDIR="/home/znatoki/public_html/dimrub/db/baza/";
 }
 my $usehtml=1;
 my $usewas=0;
@@ -35,7 +35,7 @@ $outputkvo=100 if $outputkvo>100;
 
 if (param('debug')) {$debug=1; $printqueries=1}
 *STDERR=*STDOUT if $debug;
-if ($url !~ /db\.chgk\.info/ && $url !~ /localhost/ ) {
+if ($url !~ /db\.chgk\.info/ && $url !~ /localhost/ && $url !~ /bilbo/) {
    my $u="http://db.chgk.info/cgi-bin/db.cgi?$qs";
    Redirect ($u);
    exit;
@@ -104,7 +104,8 @@ my @months=('000','Jan',"Feb","Mar","Apr
 sub NewEnough {
 	my ($a) = @_;
 	my ($year, $month, $day) = split('-', $a);
-
+	$month=1 if ($month<=0);
+	$day=1 if ($day<=0);
 	return (time - timelocal(0, 0, 0, $day, $month -1, $year) < $TMSECS);
 }
 
@@ -223,6 +224,8 @@ sub tourhref {
    	$res=$t;
    	$res.=$a?"-a":"-q" unless $gr;
    	$res.=".html";
+   	$res=~s/(\#\d+)(.*)$/$2$1/;
+   	$res="$HTMLDIR$res" unless $opt_z;
       	return $res;
    } else {
    	$res=$url;
@@ -1049,10 +1052,10 @@ 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=>tourhref($textid,0)},
@@ -1063,11 +1066,12 @@ sub PrintTournament {
 		} else {
 			$list .= dd(a({href=>
                                  $url . "?tour=$textid&comp=1"},
-				img({src=>'/icons/compressed.gif', alt=>'[ZIP]', border=>1})). " " . 
+				img({src=>'/icons/compressed.gif', alt=>'[ZIP]', border=>1})). 
+                                " " . 
                                 img({src=>$imgsrc, alt=>$alt})
 				. " " . a({href=>tourhref($textid,0,1)},
 				$Tournament{'Title'}. " ".
-					  $Tournament{'PlayedAt'}||'') . $qnum);
+					  ($Tournament{'PlayedAt'}||'')) . $qnum); 
 		}
 	}
 	$output .= dl($list);
@@ -1414,7 +1418,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) {
@@ -1425,7 +1429,7 @@ sub Include_virtual {
 		}
 		$output .= $_;
 	}
-	return $output;
+	return $output||"";
 }
 
 sub PrintArchive {
@@ -1450,6 +1454,8 @@ sub PrintAll {
 
 	my (%Tournament) = &GetTournament($dbh, $Id);
 	my (@Tours) = &GetTours($dbh, $Id);
+	my $SingleTour = $#Tours == 0;
+
 	my ($New) = ($Id and $Tournament{'Type'} eq 'Ч' and
 		&NewEnough($Tournament{"CreatedAt"})) ?
 		img({src=>"/znatoki/dimrub/db/new-sml.gif", alt=>"NEW!"}) : "";
@@ -1471,7 +1477,7 @@ sub PrintAll {
 
 
 		$output .= dd(img({src=>"/icons/folder.gif", alt=>"[*]"}) .
-      " " . a({href=>tourhref($textid,0,1)},
+      " " . a({href=>tourhref($textid,0,!$SingleTour)},
       $Tournament{'Title'}) ." " . ($Tournament{'PlayedAt'}||'') . " $New");
 	}
 	if ($Id == 0 or $Tournament{'Type'} =~ /Г/ or $Tournament{'Type'} eq '') {
@@ -1767,7 +1773,7 @@ sub WriteFile {
 
 sub Bottom
 {
-	my $output.=&Include_virtual("../dimrub/db/footer.html");
+	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">
@@ -2023,19 +2029,35 @@ EOT
 	          open TS, "timestamp";
 	          my $d=$dbh->quote(<TS>);
 	          close TS;
-      	          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");
+		  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$//;
-print "  c=$c\n";	
 		     if ($type=~/Т/ || $c<=1)
 		     {
-		       open FF, ">$realHTMLDIR$fname-q.html" or die "ERROR! - $HTMLDIR$fname-q.html\n";
+		       open FF, ">$realHTMLDIR$fname-q.html" or die "ERROR! - $fname-q.html\n";
 		       my $o=$globaloutput;
 		       $o.=&PrintTournament($dbh, $Id, 0);
 		       $o.=&Bottom;
@@ -2049,7 +2071,7 @@ print "  c=$c\n";
 		       close FF;
 		     }
 		     else {
-		       open FF, ">$realHTMLDIR$fname.html" or die "ERROR! - $HTMLDIR$fname-q.html\n";
+		       open FF, ">$realHTMLDIR$fname.html" or die "ERROR! - $fname-q.html\n";
 		       my $o=$globaloutput;
 		       $o.=&PrintTournament($dbh, $Id, 0);
 		       $o.=&Bottom;