--- db/prgsrc/db.cgi	2001/12/04 01:17:12	1.41
+++ db/prgsrc/db.cgi	2001/12/05 01:55:21	1.44
@@ -152,14 +152,16 @@ sub printform
   my $inputstring=textfield(-name=>'sstr',
                          -default=>param('sstr')||'',
                          -size=>50);
-  my $fields=checkbox_group('searchin',['Question','Answer','Comments','Authors','Sources'], [grep $searchin{$_}, keys %searchin],
+  my @df=keys %searchin;
+  @df=('Question', 'Answer') unless @df;
+  my $fields=checkbox_group('searchin',['Question','Answer','Comments','Authors','Sources'], [@df],
              'false',\%rusfieldname);
 
   my $metod=radio_group(-name=>'metod',-values=>['old','rus'],
-                       -default=>param('metod')||'rus',
+                       -default=>(param('metod')||'rus'),
                        -labels=>\%rusfieldname);
   my $all=radio_group(-name=>'all',-values=>['yes','no'],
-                       -default=>param('all')||'no',
+                       -default=>(param('all')||'no'),
                        -labels=>{'yes'=>'÷ÓÅ','no'=>'ìÀÂÏÅ'});
 
 #################################################
@@ -193,7 +195,7 @@ sub proxy
       $text=~s/p(${RLrl})/Ò$1/gom;
       $text=~s/(${RLrl})p/$1Ò/gom;
       $text=~s/\s+/ /gmo;
-      $text=~s/[^ÊÃÕËÅÎÇÛÝÚÈßÆÙ×ÁÐÒÏÌÄÖÜÑÞÓÍÉÔØÂÀêãõëåîçûýúèÿæù÷áðòïìäöüñþóíéôøâàQWERTYUIOPASDFGHJKLZXCVBNM]/ /g;
+      $text=~s/[^ÊÃÕËÅÎÇÛÝÚÈßÆÙ×ÁÐÒÏÌÄÖÜÑÞÓÍÉÔØÂÀêãõëåîçûýúèÿæù÷áðòïìäöüñþóíéôøâàQWERTYUIOPASDFGHJKLZXCVBNM0-9]/ /g;
       $text=uc $text;
       my @list= $text=~m/(?:(?:${RLrl})+)|(?:[A-Za-z0-9]+)/gom;
       my (%c, %good,$sstr);
@@ -210,7 +212,7 @@ sub proxy
          $good{$_}=1 if $c{$_}<200;
       }
 
-      $good{$words[$_]}=0 foreach 11..$#words;
+      $good{$words[$_]}=0 foreach 16..$#words;
 
 #      foreach (@list)
 #      {