--- db/prgsrc/db.cgi	2010/09/24 07:01:52	1.160
+++ db/prgsrc/db.cgi	2010/09/24 09:05:48	1.161
@@ -824,10 +824,11 @@ sub NoCase {
 
 sub PrintList {
    my ($dbh,$Questions,$shablon,$was)=@_;
+	my $total_found  = $totalfound||$#$Questions+1;
         my $Output;
 	my $first=param('first') ||1;
 	$first=$first-($first-1)%$outputkvo;
-        my $fkvo=param('fkvo')||($#$Questions+1);
+        my $fkvo=param('fkvo')||$total_found;
 	my $last=$first+$outputkvo-1;
 	$last=$fkvo if $fkvo<$last;
         my($f,$l);
@@ -899,7 +900,12 @@ sub PrintList {
             a({href=>$url."?".$qs."\&first=$llprint"},">>").("&nbsp;"x4)
         }
 	$Output.= "$nav".br."\n";
-	my @q=@$Questions[$first-1..$last-1];
+	my @q;
+	if ($totalfound) {
+	    @q = @$Questions;
+	} else {
+	    @q=@$Questions[$first-1..$last-1];
+	}
 	my %q=();
 	my $sth=SelectQuestions($dbh,\@q,1);
 	my $qq;
@@ -910,8 +916,8 @@ sub PrintList {
 		$q{$Q[$_]{'QuestionId'}}=$Q[$_];
 	}
 
-	for (my $i = $first; $i <= $last; $i++) {
-		my $q=$q{$$Questions[$i-1]};
+	for my $i(0..$#q) {
+		my $q=$q{$q[$i]};
 	        my $output;
 		$output = &PrintQuestion($dbh, $q, 1, 0, 1,$text,1  );
 #                if (param('metod') && (param('metod') eq 'rus' || param('metod') eq 'proxy'))
@@ -1235,8 +1241,8 @@ sub PrintTournament {
 		}
 	if (!$isGroup) {
   	    $output .= center("<font size='-1'>[".
-	     a({href=>'/v2/print/'.$textid, target=>'_blank'}, 'версия для печати')."] [".
-	     a({href=>'/v2/fb2/'.$textid, target=>'_blank'}, 'fb2')."]"."</font>");
+	     a({href=>"/v2/tour/$textid/print", target=>'_blank'}, 'версия для печати')."] [".
+	     a({href=>"/v2/tour/$textid/fb2", target=>'_blank'}, 'fb2')."]"."</font>");
         }
 	
 	return $output;
@@ -1355,8 +1361,8 @@ sub PrintTour {
 			"[" . a({href=>tourhref("$fname$nn",1)}, 
                          "ответы") .  "] " 
 	}
-	$bottom .= "[".a({href=>'/v2/print/'.$fname, target=>'_blank'}, 'версия для печати')."] [".
-	  a({href=>'/v2/fb2/'.$fname, target=>'_blank'}, 'fb2')."]".br;
+	$bottom .= "[".a({href=>"/v2/tour/$fname/print", target=>'_blank'}, 'версия для печати')."] [".
+	  a({href=>"/v2/tour/$fname/fb2/", target=>'_blank'}, 'fb2')."]".br;
 	
 #	$bottom .= "[".a({href=>'/v2/print/'.$fname.'.'.$Tour{'Number'}, target=>'_blank'}, 'версия для печати')."]".br;