X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fsearch.cgi;h=d728542ef3fdd60485c3bd3efc559cdc489c18ab;hb=64267ddd252ea24e5aeb4bb999a22a1b1f0f2d85;hp=cf89c5b5e891124b62a258ebd55a6bb646585caa;hpb=a54f07e01f95b7ab702a9f08375dc8dad3394ac9;p=debbugs.git
diff --git a/cgi/search.cgi b/cgi/search.cgi
index cf89c5b..d728542 100755
--- a/cgi/search.cgi
+++ b/cgi/search.cgi
@@ -14,24 +14,29 @@ BEGIN{
use CGI::Simple;
-use CGI::Alert 'don@donarmstrong.com';
+# use CGI::Alert 'nobody@example.com';
use Search::Estraier;
use Debbugs::Config qw(:config);
use Debbugs::Estraier;
-use Debbugs::CGI qw(htmlize_packagelinks html_escape);
+use Debbugs::CGI qw(htmlize_packagelinks html_escape cgi_parameters);
use HTML::Entities qw(encode_entities);
my $q = new CGI::Simple;
#my %var_defaults = (attr => 1,);
-my %cgi_var = cgi_parameters($q);
+my %cgi_var = cgi_parameters(query => $q,
+ single => [qw(phrase max_results order_field order_operator),
+ qw(skip prev next),
+ ],
+ default => {phrase => '',
+ max_results => 10,
+ skip => 0,
+ },
+ );
-$cgi_var{phrase} = '' if not defined $cgi_var{phrase};
-$cgi_var{max_results} = 10 if not defined $cgi_var{max_results};
$cgi_var{attribute} = parse_attribute(\%cgi_var) || [];
-$cgi_var{skip} = 0 if not defined $cgi_var{skip};
my @results;
@@ -88,6 +93,7 @@ print <
\n);
+ print qq(
\n);
$attr_num++;
}
-print qq(
);
+print qq(
);
# order
@@ -233,11 +239,11 @@ print qq(
Max results:
\n); -print qq(\n); +print qq(\n); @@ -263,9 +269,9 @@ if (defined $nres) { my $showseverity; $showseverity = "Severity: $attr{severity};\n"; print <