--- no_pager/index.cgi 2006/08/16 21:34:37 15
+++ no_pager/index.cgi 2006/08/16 22:26:45 17
@@ -27,17 +27,26 @@
#warn "config = ", dump($config);
+sub json {
+ return
+ '';
+}
+
sub get_results {
my ($search, $page) = @_;
- if (! $search) {
+ warn "get_results( $search , $page )\n";
+
+ if (! $search || $search =~ m/^\s*$/) {
$v->{status} = 'Enter search query';
- return;
+ return('', json);
}
if (! $page) {
$v->{status} = 'Error: no page number?';
- return;
+ return('', json);
}
$search = join(" AND ", split(/\s+/, $search)) unless ($search =~ m/(?:AND|OR|\[|\])/);
@@ -119,11 +128,7 @@
$out .= 'error: ' . $node->status;
}
- $json = '';
-
- return ($out,$json);
+ return ($out,json);
}
@@ -139,7 +144,14 @@
} else {
- my ($get_results, $json) = get_results( $q->param('search'), 1 );
+ my ($get_results,$json);
+
+ if ($q->param('search')) {
+ ($get_results, $json) = get_results( $q->param('search'), 1 );
+ } else {
+ $v->{status} = 'Enter search query';
+ ($get_results, $json) = ('', json);
+ }
my $f = $q->path_info;
$f =~ s/\W+//g;