X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=vhost%2Fwebpac2.cgi;h=12ca195d783e7c26f477c48445ae37c4b457f429;hb=f82cbd6b16b44d428d7a1a3876db2766d4521747;hp=4079f3c5e614b7f71f62e64f35fae2317ce847e0;hpb=332902c2a6e9080a4d9ad6744cb34b7045399a51;p=webpac2

diff --git a/vhost/webpac2.cgi b/vhost/webpac2.cgi
index 4079f3c..12ca195 100755
--- a/vhost/webpac2.cgi
+++ b/vhost/webpac2.cgi
@@ -7,9 +7,10 @@ use CGI qw/:standard/;
 use CGI::Carp qw/fatalsToBrowser/;
 use File::Slurp;
 use YAML;
-use Search::Estraier;
 use Data::Page;
 use Data::Dump qw/dump/;
+use SWISH::API;
+use JSON;
 
 my $range_around = 5;
 my $entries_per_page = 30;
@@ -98,6 +99,35 @@ my $db = $config->{databases}->{$database};
 
 my @attr = keys %{ $estraier->{attr} }; # FIXME replace with real gnerated lookup
 
+# XXX pipe delimit list!
+my $select_attr_operators = << '__ATTR_OPERATORS__';
+Q*			|	Bilo koja riječ
+BW Q		|	Početak
+BW Q EW		|	Točan oblik
+__ATTR_OPERATORS__
+
+my $attr_operator;
+
+foreach ( split(/[\n\r]+/, $select_attr_operators ) ) {
+	my ( $operator,$label ) = split(/\s+\|\s+/,$_,2);
+	push @{ $attr_operator->{ '-values' } }, $operator;
+	        $attr_operator->{ '-labels' }->{$operator} = $label;
+}
+
+warn "## attr_operator = ", dump( $attr_operator );
+
+my $only_input;
+
+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;
+	}
+}
+
+warn "## only_input = ", dump( $only_input );
+
 print
 	start_html(
 		-title => $db->{name},
@@ -112,29 +142,33 @@ print
 #			-linebreak => 0,
 		),
 		textfield( -name => 'search' ),
-		popup_menu( -name => 'attr_operator', -values => [ '', 'STRBW', 'STREQ' ],
-			-labels => {
-				'' => 'Bilo koja riječ',
-				'STRBW' => 'Početak',
-				'STREQ' => 'Točan oblik',
-			},
-		),
+		popup_menu( -name => 'attr_operator', %$attr_operator ),
 		submit,
 		hidden( -name => 'entries_per_page', -default => $entries_per_page ),
 		hidden( -name => 'current_page', -default => 1 ),
 		checkbox( -name => 'debug', -default => 0 ), # FIXME hidden?
+		qq|<div id=inputs>|,
+		h2( 'Select input' ),
+		checkbox_group(
+			-name => 'only_input',
+			%$only_input,
+			-linebreak=> 'true',
+		),
+		qq|</div>|,
+
 ;
 
+dump_yaml( 'inputs', $db->{input} );
+dump_yaml( 'input names', map { $_->{name} } @{ $db->{input} } );
+
 print	end_form;
 
 if ( my $search = param('search') ) {
 
 	print qq|<div id="results">|;
 
-	my $node = Search::Estraier::Node->new(
-		url => $config->{hyperestraier}->{masterurl} . '/node/' . $database,
-		croak_on_error => 1,
-	);
+	my $swish = SWISH::API->new( "$dir/../var/swish/$database" );
+	$swish->abort_last_error if $swish->Error;
 
 	param( 'entries_per_page', $entries_per_page ) unless param('entries_per_page'); # FIXME not needed?
 	my $pager = Data::Page->new;
@@ -143,28 +177,53 @@ if ( my $search = param('search') ) {
 
 	dump_yaml( 'pager', $pager );
 
-	my $cond = Search::Estraier::Condition->new( debug => $debug );
-	$cond->set_phrase( $search );
-	$cond->set_skip( $pager->skipped );
-	$cond->set_max(  $pager->entries_per_page );
-
-	if ( my $op = param('attr_operator') ) {
-		$cond->add_attr( param('attr') . " $op " . param('search') );
+	my @search = (); 
+	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;
+	} else {
+		push @search, "all=\"$search\"";
 	}
 
-	my $nres = $node->search( $cond, 0 );
-	$pager->total_entries( $nres->hits );
+	my $q = '(' . join(') AND (', @search) . ')';
+	$q =~ s{\(\((.+)\)\)}{($1)};
+	warn "# query: $q\n";
+	my $swish_results = $swish->query( $q );
 
-	dump_yaml( 'cond', $cond );
-	dump_yaml( 'nres', $nres );
+	dump_yaml( 'swish_results', $swish_results );
 
-	if ( ! $nres ) {
-		my $no_results = "No results for search '%s'";
-		printf qq|<div class="error">$no_results</div>\n\n|, $search;
+	$pager->total_entries( $swish_results->hits );
+
+	if ( ! $pager->total_entries ) {
+		my $no_results = 'No results for search <b>%s</b>';
+		$no_results = $swish->error_string . '<br><b>%s</b>' if $swish->error;
+		printf qq|<div class="error">$no_results</div>\n\n|, $q;
 	} else {
 
-		my $results = "%d results for search '%s' showing results %d - %d on page %d";
-		printf qq|<div class="message">$results</div>\n\n|, $nres->hits, $search, $pager->first, $pager->last, $pager->current_page;
+		my $results = "<b>%d</b> results for search <b>%s</b> showing results %d - %d";
+		printf qq|<div class="message">$results</div>\n\n|, $pager->total_entries, $q, $pager->first, $pager->last;
 
 		my $pager_html = join("\n", show_pager( $pager ));
 
@@ -173,19 +232,20 @@ if ( my $search = param('search') ) {
 		my $start = $pager->first;
 		print qq|<ol start=$start>\n|;
 
-		foreach my $i ( 1 .. $nres->doc_num ) {
-			my $rdoc = $nres->get_doc( $i - 1 );
+		while ( my $result = $swish_results->next_result ) {
+			my $data = from_json $result->property('data');
+
 			print qq|<li>|;
 			foreach my $attr ( @attr ) {
-				my $v = $rdoc->attr( $attr );
-				if ( defined $v && $html_markup && ! $html_markup_skip->{$attr} ) {
+				next unless defined $data->{$attr};
+				my $v = $data->{$attr};
+				if ( $html_markup && ! $html_markup_skip->{$attr} ) {
 					eval "\$v = $html_markup->$attr( \$v );";
 					if ( $@ ) {
 						warn "disable html markup for $attr: $@";
 						$html_markup_skip->{$attr} = $@;
 					}
 				}
-				next unless defined $v;
 				print qq|<div><label>$attr</label><span class=$attr>$v</span></div>\n|;
 			}
 			print qq|</li>\n|;
@@ -200,7 +260,6 @@ if ( my $search = param('search') ) {
 
 }
 
-dump_yaml( 'estraier', $estraier );
 dump_yaml( 'db', $db );
 dump_yaml( 'html_markup_skip', $html_markup_skip );