--- db/prgsrc/db.cgi	2004/03/17 10:26:31	1.132
+++ db/prgsrc/db.cgi	2004/05/02 20:48:30	1.134
@@ -616,7 +616,12 @@ $sstr=~tr/йцукенгшщзхъфывапролджэячсмить
 #Ищем пересечение или объединение списков вопросов (значений %tasksof)
        	    foreach $sf (keys %tasksof)
            {
-              $count{$_}++ foreach keys %{$tasksof{$sf}};
+		foreach (keys %{$tasksof{$sf}})
+                {
+  		     next if $forbidden{$_};
+                     $count{$_}++ 
+                }
+
            }
              @tasks= ($all ? (grep {$count{$_}==$kvo} keys %count) :
                              keys %count) ;
@@ -1334,6 +1339,7 @@ sub PrintField {
 sub PrintQuestion {
 	my ($dbh, $Id, $answer, $qnum, $title, $text,$h) = @_;
 	my ($output, $titles) = ('', '');
+	my $fname;
 	my (%Question);
 	if ($h) {
 	  %Question=%$Id;
@@ -1355,7 +1361,7 @@ sub PrintQuestion {
 	if (!$text) {
 		$output .= hr({width=>"50%"}) if $answer>=0;
 		if ($title) {
-			my $fname=$Question{'FileName'};
+			$fname=$Question{'FileName'};
 			$fname=~s/\.txt//;
 			$titles .=
 				dd(img({src=>"/icons/folder.open.gif"}) . " " .
@@ -1461,7 +1467,9 @@ $output.="</span>"
 	}
 	$output=~s/\(pic: ([^\)]*)\)/<p><img src="\/znatoki\/images\/db\/$1"><p>/g unless $text;
 	$paramtour||=param("tour");
-	my $qid=$paramtour ? ($paramtour.".$Question{'Number'}" ): '';
+	$fname=$fname.".$Question{'TourNumber'}" if $fname && $Question{'TourNumber'};
+$fname||=param('tour');
+	my $qid=$fname ? ($fname.".$Question{'Number'}" ): '';
 
 	$output.=br.a({href=> $url."?metod=proxy&
 qid=$qid"}, 'Близкие вопросы').p
@@ -2097,6 +2105,7 @@ th	{font-size: x-small; font-family : sa
         }
 
 
+
 	if (param('rand')) {
 		my ($type, $qnum) = ('', 12);
 		$type.=$TypeName{$_} foreach param('type');