--- trunk/vhost/webpac2.cgi	2009/04/29 18:06:19	1177
+++ trunk/vhost/webpac2.cgi	2009/07/10 14:37:35	1237
@@ -109,7 +109,12 @@
 sub read_config_txt {
 	my ( $file ) = @_;
 	my $input;
-	foreach ( split(/[\n\r]+/, read_file( "$dir/$path/$path-$file.txt" ) ) ) {
+	my $path ="$dir/$path/$path-$file.txt";
+	if ( ! -e $path ) {
+		warn "missing $path";
+		return;
+	}
+	foreach ( split(/[\n\r]+/, read_file( $path ) ) ) {
 		my ( $val,$label ) = split(/\s*\t\s*/,$_,2);
 		push @{ $input->{ '-values' } }, $val;
 				$input->{ '-labels' }->{$val} = $label;
@@ -120,19 +125,21 @@
 my $attr_labels    = read_config_txt 'labels';
 my $attr_operators = read_config_txt 'operators';
 
-my @attr = @{ $attr_labels->{'-values'} };
+my @attr = @{ $attr_labels->{'-values'} } if $attr_labels;
 @attr = keys %{ $stats->{attr} } unless @attr;
 
 
 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++;
 	}
 }
 
@@ -145,25 +152,26 @@
 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,
 	;
@@ -190,37 +198,53 @@
 	$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 . '"';
-				;
-		};
-		$v =~ s{(\s*)(\S+)}{rewrite($1,$2)}ge;
-
-		push @search, $v;
-	
-		my @only_input = param('only_input');
-		push @search, '(' . join(') OR (', map { "input=$_" } @only_input) . ')' if @only_input;
+	} 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) . ')';
+
 	} 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 );
 
@@ -272,6 +296,8 @@
 						warn "disable html markup for $attr: $@";
 						$html_markup_skip->{$attr} = $@;
 					}
+				} else {
+					$v =~ s{(http://\S+)}{<a href="$1">$1</a>};
 				}
 				my $label = $attr_labels->{'-labels'}->{$attr} || $attr;
 				print qq|<div><label>$label</label><span class=$attr>$v</span></div>\n|;