--- db/prgsrc/db.cgi	2003/06/23 02:09:35	1.121
+++ db/prgsrc/db.cgi	2003/08/29 21:52:25	1.124
@@ -176,12 +176,12 @@ sub GetTournament {
 sub fetchquestion {
 	my ($sth,$q,$WithTour)=@_;
 	if ($WithTour) {
-		($$q{'QuestionId'}, $$q{'Question'},$$q{'Answer'},$$q{'Comments'},$$q{'Authors'},
+		($$q{'QuestionId'}, $$q{'Question'},$$q{'Answer'},$$q{'Comments'},$$q{'Authors'},$$q{'Sources'},
          	$$q{'Number'}, 
          	$$q{'Title'}, $$q{'TourTitle'}, $$q{'FileName'},$$q{'PlayedAt'},$$q{'TourNumber'}) = 
 	        $sth->fetchrow;
 	} else {
-		($$q{'QuestionId'}, $$q{'Question'},$$q{'Answer'},$$q{'Comments'},$$q{'Authors'},
+		($$q{'QuestionId'}, $$q{'Question'},$$q{'Answer'},$$q{'Comments'},$$q{'Authors'},$$q{'Sources'},
          	$$q{'Number'})= 
 	        $sth->fetchrow;
 	}
@@ -203,13 +203,13 @@ sub SelectQuestions {
 
 	my $query;
 	if ($WithTour) {
- 		$query="SELECT QuestionId, Questions.Question, Answer, Comments, Authors,
+ 		$query="SELECT QuestionId, Questions.Question, Answer, Comments, Authors, Sources,
                         Questions.Number
 			, t2.Title, t1.Title, t2.FileName,  t2.PlayedAt,t1.Number
 			from Questions,Tournaments as t1, Tournaments as t2 
                         WHERE $where";
 	} else {
- 		$query="SELECT QuestionId, Questions.Question, Answer, Comments, Authors,
+ 		$query="SELECT QuestionId, Questions.Question, Answer, Comments, Authors, Sources,
                         Questions.Number from Questions 
                         WHERE $where";
 	}
@@ -250,6 +250,12 @@ sub tourhref {
    	$res.=$a?"-a":"-q" unless $gr;
    	$res.=".html";
    	$res=~s/(\#\d+)(.*)$/$2$1/;
+        my $t=$res;
+        $t=~s/\#.*$//;
+   	$res=~s/\.1// unless -e "$realHTMLDIR$t";
+        $t=$res;
+        $t=~s/\#.*$//;
+   	$res=~s/\.html/-q\.html/ unless -e "$realHTMLDIR$t";
    	$res="$HTMLDIR$res" unless $opt_z;
       	return $res;
    } else {
@@ -1548,8 +1554,19 @@ sub PrintDates {
 		next
 			if (!$array[0]);
 		%Tournament = &GetTournament($dbh, $array[0]);
+	         my $textid;
+		 if ($textid=$Tournament{'FileName'})
+		 {
+		   $textid=~s/\.txt//;
+		 }
+		 elsif ($textid=$Tournament{'Number'})
+		 {
+		      $fname=~s/\.txt//;
+		      $textid="$fname.$textid";
+		 }
+	         else {$textid=$Tournament{'Id'}};
       $list .= dd(img({src=>"/icons/folder.gif", alt=>"[*]"}) .
-      " " . a({href=>tourhref($Tournament{'FileName'},0,1)},
+      " " . a({href=>tourhref($textid,0,1)},
       $Tournament{'Title'}, $Tournament{'PlayedAt'}||''));
 	}
         $sth->finish;
@@ -2121,7 +2138,7 @@ EOT
 #                     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");
+ 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) {