--- db/prgsrc/db.cgi	2001/12/11 12:30:23	1.50
+++ db/prgsrc/db.cgi	2001/12/13 00:01:58	1.51
@@ -105,7 +105,7 @@ sub GetTourQuestions {
 	my (@arr, @Questions);
 
 	my ($sth) = $dbh->prepare("SELECT QuestionId FROM Questions
-		WHERE ParentId=$ParentId ORDER BY QuestionId");
+		WHERE ParentId=$ParentId");
 
 	$sth->execute;
 
@@ -157,6 +157,11 @@ sub printform
                          -default=>param('sstr')||'',
                          -size=>30,
                          -maxlength=>30);
+  my $qnumber="Выводить по".br. textfield(-name=>'kvo',
+                         -default=>param('kvo')||'150',
+                         -size=>3,
+                         -maxlength=>5). br."вопросов";
+
   my @df=keys %searchin;
   @df=('Question', 'Answer') unless @df;
   my $fields=checkbox_group('searchin',['Question','Answer','Comments','Authors','Sources'], [@df],
@@ -179,7 +184,8 @@ table(Tr
 (
   td({-valign=>'TOP'},$inputstring.$submit.p."Метод: $metod".p."Слова: $all"),
   td({-valign=>'TOP'},(' 'x 8).'Поля:'),
-  td({-valign=>'TOP'},$fields)
+  td({-valign=>'TOP'},$fields), td(" "x5),
+  td({-valign=>'TOP'},$qnumber)
 ) 
 )
  
@@ -558,7 +564,7 @@ sub PrintList {
    my ($dbh,$Questions,$shablon)=@_;
 
 	my $first=param('first') ||1;
-	my $kvo=param('kvo') ||30;
+	my $kvo=param('kvo') ||150;
 
 	$first=$first-($first-1)%$kvo;
 	my $last=$first+$kvo-1;
@@ -568,8 +574,8 @@ sub PrintList {
         my $qs=query_string;
 	$qs=~s/\;/\&/g;
         $qs=~s/\&first\=[^\&]+//g;
-
-
+        my $sstr=param('sstr');
+        $qs=~s/sstr=[^\&]+/sstr=$sstr/;
         if ($first>$kvo*3+1)
         {
            $nav.=