--- db/prgsrc/db.cgi	2003/01/12 11:17:23	1.83
+++ db/prgsrc/db.cgi	2003/01/27 10:58:56	1.84
@@ -160,51 +160,84 @@ print "timee0=".time.br if $debug;
 sub printform
 {
 
-  my $submit=submit(-value=>'Поиск');
-  my $inputstring=textfield(-name=>'sstr',
-                         -default=>param('sstr')||'',
-                         -size=>30,
-                         -maxlength=>50);
-  my $qnumber="Выводить по".br. textfield(-name=>'kvo',
+  my $qnumber=(" "x10)."Выводить по ". textfield(-name=>'kvo',
                          -default=>param('kvo')||'150',
                          -size=>3,
-                         -maxlength=>5). br."вопросов";
-
+                         -maxlength=>5)." вопросов";
+  my $sstr=param('sstr');
   my @df=keys %searchin;
+  my %checked;
   @df=('Question', 'Answer') unless @df;
+  $checked{lc $_}="checked" foreach @df;
   my $fields=checkbox_group('searchin',['Question','Answer','Comments','Authors','Sources'], [@df],
              'false',\%rusfieldname);
   @df=param('type');
   @df=('chgk','brain','igp','game','ehruditka','beskrylka') unless @df;
-
-  my $types=checkbox_group('type',['chgk','brain','igp','game','ehruditka','beskrylka'], [@df],
-             'false',\%rusfieldname);
-  my $metod=radio_group(-name=>'metod',-values=>['old','rus'],
-                       -default=>(param('metod')||'rus'),
-                       -labels=>\%rusfieldname);
-  my $all=radio_group(-name=>'all',-values=>['yes','no'],
-                       -default=>(param('all')||'no'),
-                       -labels=>{'yes'=>'Все','no'=>'Любое'});
+  $checked{lc $_}="checked" foreach @df;
+  $checked{'all'}=param('all')?"checked":"";
+  $checked{'any'}=param('all')?"":"checked";
+  $checked{lc param('metod')}="checked";
+  $checked{'russian'}=1 unless $checked{'russian'} || $checked{'old'};
 
 #################################################
-return   start_form(-method=>'get',
-                       -action=>url,
-                       -enctype=>
-                "application/x-www-form-urlencoded"
-).br.
-table(Tr
-(
-  td({-valign=>'TOP'},$inputstring.$submit.p."Метод: $metod".p."Слова: $all"),
-  td({-valign=>'TOP'},(' 'x 8).'Поля:'),
-  td({-valign=>'TOP'},$fields), 
-  td({-valign=>'TOP'},(' 'x 1).'Типы:'),
-  td({-valign=>'TOP'},$types), td(" "x5),
-  td({-valign=>'TOP'},$qnumber)
-) 
-)
- 
-#$fields.
-#$inputstring.$submit.br.$metod.$all
+return   
+<<EOT
+<form method="get" enctype="application/x-www-form-urlencoded"
+action="/znatoki/cgi-bin/db.cgi">
+<h2>Поиск в базе данных</h2>
+
+<input type="text" name="sstr" value=$sstr size="30" maxlength="50"> 
+<input type="submit" value="Поиск"> $qnumber
+<p>
+
+<table border="1" cellpadding=4 cellspacing=0>
+<tr>
+<th align="left" rowspan=3 width="20%"> Вариант поиска:
+</td><td rowspan=2 colspan=2>
+<input type="radio" $checked{'old'} name="metod" value="old"> Простой (старый)
+</td><td>
+<input type="checkbox" $checked{'chgk'} name="type" value="chgk">&nbsp;"Что?&nbsp;Где?&nbsp;Когда?"
+</td><td><nobr>
+<input type="checkbox" $checked{'brain'} name="type" value="brain">&nbsp;"Брейн-Ринг"</nobr>
+</td><td>
+<input type="checkbox" $checked{'igp'} name="type" value="igp">&nbsp;"Интернет"
+</td>
+</tr><tr>
+<td>
+<input type="checkbox" $checked{'game'} name="type" value="game">&nbsp;"Своя&nbsp;игра"
+</td><td>
+<input type="checkbox"  $checked{'ehruditka'} name="type" value="ehruditka">&nbsp;"Эрудитка"
+</td><td>
+<input type="checkbox" $checked{'beskrylka'} name="type" value="beskrylka">&nbsp;"Бескрылка"
+</td>
+</tr><tr>
+<td colspan=5><input type="radio" $checked{'russian'} name="metod" value="rus"> Расширенный (с учетом грамматики, в вопросах всех типов)
+</td>
+</tr><tr>
+<th align="left">Искать:
+</td><td colspan=2>
+<input type="radio" $checked{'all'} name="all" value="yes">Все слова
+</td><td colspan=3>
+<input type="radio" $checked{'any'} name="all" value="no">Любое слово
+</td>
+</tr><tr>
+<th align="left">Поля для поиска:
+</td><td width="15%">
+<input type="checkbox" name="searchin" value="Question" $checked{'question'}>Вопрос
+</td><td width="15%">
+<input type="checkbox" name="searchin" value="Answer" $checked{'answer'}>Ответ<br> 
+</td><td width="15%">
+<input type="checkbox" name="searchin" value="Comments" $checked{'comments'}>Комментарии<br> 
+</td><td width="15%">
+<input type="checkbox" name="searchin" value="Authors" $checked{'authors'}>Автор<br>
+</td><td width="15%">
+<input type="checkbox" name="searchin" value="Sources" $checked{'sources'}>Источник<br>
+</td>
+</tr>
+</table>
+</center>
+
+EOT
 .endform
 .hr
 
@@ -688,7 +721,7 @@ sub PrintList {
 sub PrintSearch {
 	my ($dbh, $sstr, $metod,$was) = @_;
 	my $t=time;
-	print h2("Поиск в базе вопросов");
+#	print h2("Поиск в базе вопросов");
 	print printform;
 	my @allnf;
 	my @Questions;
@@ -1602,6 +1635,11 @@ MAIN:
 	           -author=>'dimrub@icomverse.com',
 	           -bgcolor=>'#fff0e0',
 				  -vlink=>'#800020');
+print "<style>
+td	{font-size: 9pt; font-family : sans-serif}
+th	{font-size: 9pt; font-family : sans-serif}
+</style>\n";
+
 		print &Include_virtual("../dimrub/db/reklama.html");
 	}