--- db/prgsrc/db.cgi	2001/12/11 12:19:31	1.49
+++ db/prgsrc/db.cgi	2001/12/17 11:47:23	1.52
@@ -70,12 +70,11 @@ sub GetTournament {
 	$sth->execute;
 
 	@arr = $sth->fetchrow;
-        $sth->finish;
 	my($i, $name) = 0;
 	foreach $name (@{$sth->{NAME}}) {
 		$Tournament{$name} = $arr[$i++];
 	}
-
+        $sth->finish;
 	return %Tournament;
 }
 
@@ -106,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;
 
@@ -158,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],
@@ -180,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)
 ) 
 )
  
@@ -559,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;
@@ -569,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.=
@@ -1287,13 +1292,14 @@ if ((uc 'а') ne 'А') {print "Koi8-r loca
 		$type .= 'Ч' if (param('chgk'));
 		$qnum = param('qnum') if (param('qnum') =~ /^\d+$/);
 		$qnum = 0 if (!$type);
-		if (param('email') && -x $SENDMAIL &&
-		open(F, "| $SENDMAIL -t -n")) {
-			my ($Email) = param('email');
+		my $Email;
+		*STDERR=*STDOUT;
+		if (($Email=param('email')) && -x $SENDMAIL &&
+		open(F, "| $SENDMAIL $Email")) {
 			my ($mime_type) = $text ? "plain" : "html";
 			print F <<EOT;
 To: $Email
-From: olegstemanov\@mail.ru
+From: olegstepanov\@mail.ru
 Subject: Sluchajnij Paket Voprosov "Chto? Gde? Kogda?"
 MIME-Version: 1.0
 Content-type: text/$mime_type; charset="koi8-r"
@@ -1301,7 +1307,7 @@ Content-type: text/$mime_type; charset="
 EOT
 			print F &PrintRandom($dbh, $type, $qnum, $text);
 			close F;
-			print "Пакет случайно выбранных вопросов послан. Нажмите
+			print "Пакет случайно выбранных вопросов послан по адресу $Email. Нажмите
 			на <B>Reload</B> для получения еще одного пакета";
 		} else {
 			print &PrintRandom($dbh, $type, $qnum, $text);