warn dump( $attr_labels, $attr_operators );
my $only_input;
+my $inputs_available = 0;
foreach ( @{ $db->{input} } ) {
my $input = $_->{name} || die "no name in ",dump( $_ );
if ( ! $only_input->{'-labels'}->{$input} ) {
push @{ $only_input->{'-values'} }, $input;
$only_input->{'-labels'}->{$input} = $_->{description} || $input;
+ $inputs_available++;
}
}
sub search_form {
qq|<a name="form"></a>|,
start_form( -action => self_url( query => 0 ) ),
- radio_group(
+ checkbox_group(
-name => 'attr',
%$attr_labels,
# -linebreak => 0,
),
textfield( -name => 'search' ),
- popup_menu( -name => 'attr_operator', %$attr_operators ),
+ $attr_operators ? popup_menu( -name => 'attr_operator', %$attr_operators ) : '',
submit,
hidden( -name => 'entries_per_page', -default => $entries_per_page ),
# we need current_page fixed at 1 so that every submit through form will reset it
qq|<input type=hidden name=current_page value=1 >|,
checkbox( -name => 'debug', -default => 0 ), # FIXME hidden?
qq|<div id=inputs>|,
- h2( 'Select input' ),
+ $inputs_available > 1 ?
+ h2( 'Select input' ) .
checkbox_group(
-name => 'only_input',
%$only_input,
-linebreak=> 'true',
- ),
+ ) : '',
qq|</div>|,
end_form,
;
$swish->abort_last_error if $swish->Error;
my @search = ();
+ my @attrs = param('attr');
+ my $op = param('attr_operator');
+
if ( $search =~ m{(=|"|AND|OR)} ) {
push @search, $search;
- } elsif ( my $op = param('attr_operator') ) {
- my $attr = param('attr');
- my $v = $search;
- $v =~ s/^\s+//;
- warn "-- v: $v\n";
- sub rewrite {
- my ( $whitespace, $v ) = @_;
- warn "## filter $op $whitespace $v\n";
- my $template = $op;
- $template =~ s{Q}{$v};
- $whitespace = " AND " if $whitespace;
-
- return
- $whitespace .
- $attr . '="' . $template . '"';
- ;
- };
- if ( $op =~ m{\s} ) {
- my $template = $op;
- $template =~ s{Q}{$v};
- $v = $attr . '="' . $template . '"';
- } else {
- $v =~ s{(\s*)(\S+)}{rewrite($1,$2)}ge;
+ } elsif ( @attrs ) {
+
+ $op ||= 'Q*';
+ my @or;
+ foreach my $attr ( @attrs ) {
+ my $v = $search;
+ $v =~ s/^\s+//;
+ warn "-- v: $v\n";
+ sub rewrite {
+ my ( $attr, $whitespace, $v ) = @_;
+ warn "## filter $op $whitespace $v\n";
+ my $template = $op;
+ $template =~ s{Q}{$v};
+ $whitespace = " AND " if $whitespace;
+
+ return
+ $whitespace .
+ $attr . '="' . $template . '"';
+ ;
+ };
+ if ( $op =~ m{\s} ) {
+ my $template = $op;
+ $template =~ s{Q}{$v};
+ $v = $attr . '="' . $template . '"';
+ } else {
+ $v =~ s{(\s*)(\S+)}{rewrite($attr,$1,$2)}ge;
+ }
+
+ push @or, $v;
+
}
+ push @search, '(' . join(') OR (', @or) . ')';
- push @search, $v;
-
- my @only_input = param('only_input');
- push @search, '((' . join(') OR (', map { "input=\"$_\"" } @only_input) . '))' if @only_input;
} else {
push @search, "all=\"$search\"";
}
my $q = '(' . join(') AND (', @search) . ')';
- $q =~ s{\(\((.+)\)\)}{($1)};
+
+ my @only_input = param('only_input');
+ $q .= ' AND ((' . join(') OR (', map { "input=\"$_\"" } @only_input) . '))' if @only_input;
+
warn "# query: $q\n";
my $swish_results = $swish->query( $q );