--- db/prgsrc/db.cgi	2001/10/17 00:15:10	1.22
+++ db/prgsrc/db.cgi	2001/10/22 20:12:29	1.25
@@ -8,8 +8,8 @@ use Time::Local;
 use POSIX qw(locale_h);
 use locale;
 open STDERR, ">errors";
-my $printqueries=1;
-my %fieldname= (0,'Question', 1, 'Answer', 2, 'Comments');
+my $printqueries=0;
+my %fieldname= (0,'Question', 1, 'Answer', 2, 'Comments', 3, 'Authors', 4, 'Sources');
 my %searchin;
 
 
@@ -17,9 +17,12 @@ my %searchin;
 my $thislocale;
 
 
-$searchin{'question'}=param('question');
-$searchin{'answer'}=param('answer');
-$searchin{'comment'}=param('comment');
+$searchin{'question'}=param('Question');
+$searchin{'answer'}=param('Answer');
+$searchin{'comment'}=param('Comment');
+$searchin{'authors'}=param('Authors');
+$searchin{'sources'}=param('Sources');
+$printqueries||=param('debug');
 my $all=param('all');
 $all=0 if lc $all eq 'no';
 my ($PWD) = `pwd`;
@@ -216,7 +219,6 @@ print "$query\n",br if $printqueries;
               {
                 @blob=(@blob,unpack 'C*',$arr[0]);
               }
-print "blob=@blob";
               $query="select number from nf where ".(join ' OR ', @arr1);
 print "$query\n",br if $printqueries;
     	      $sth=$dbh -> prepare($query);
@@ -245,12 +247,10 @@ print "$query\n",br if $printqueries;
                              # виде хэша, ключи которого -- номера вопросов,
                              # а значения -- списки номеров вхождений. Вот.
                  {
-                    ($field,$hi,$lo,$wordnumber)=@blob[$ii..($ii+3)];
+                    ($field,$lo,$hi,$wordnumber)=@blob[$ii..($ii+3)];
                     $ii+=4;
                     $number=$lo+$hi*256;
-print "f1=$field\n";
                     $field=$fieldname{$field};
-print "f2=$field\n";
                     if ($searchin{lc $field})
                     {
 
@@ -269,7 +269,7 @@ print "f2=$field\n";
                }
             }    #foreach $i
 
-print "keys tasksof", keys %tasksof;
+print "keys tasksof", keys %tasksof if $printqueries;
 #Ищем пересечение или объединение списков вопросов (значений %tasksof)
            foreach $sf (keys %tasksof)
            {
@@ -292,7 +292,7 @@ foreach (keys %wordsof)
 
 ############
 
-print "tasks=@tasks";
+print "tasks=@tasks" if $printqueries;;
 
 #print "$_ $relevance{$_} | " foreach @tasks;
 #print br;