X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=vhost%2Fwebpac2.cgi;h=45f2ee28a929f961b8b4bc3e8cd597676d1909c4;hb=cc0a6710aba095d4867ef198e3ebefb3176797d3;hp=7368de2635ef0a34d1e714261a30a37b1b6254f7;hpb=992036ed5be628e0ac437b9156ccc7224d888684;p=webpac2

diff --git a/vhost/webpac2.cgi b/vhost/webpac2.cgi
index 7368de2..45f2ee2 100755
--- a/vhost/webpac2.cgi
+++ b/vhost/webpac2.cgi
@@ -132,12 +132,14 @@ my @attr = @{ $attr_labels->{'-values'} };
 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++;
 	}
 }
 
@@ -156,19 +158,20 @@ sub search_form {
 #			-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,
 	;
@@ -195,43 +198,53 @@ if ( my $search = param('search') ) {
 	$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') || 'all';
-		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 );