X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=vhost%2Fwebpac2.cgi;h=f09b0e4c67dcdf4b2c810ecb8f01fd8ac79aabd1;hb=9d8a7dcaa3e178e606ba11e01298e69619656cfd;hp=7b18776115f5db6b64787215c31897cd4f91530f;hpb=f85c81e14185233d0ea5f32ac731ad95562c9421;p=webpac2

diff --git a/vhost/webpac2.cgi b/vhost/webpac2.cgi
index 7b18776..f09b0e4 100755
--- a/vhost/webpac2.cgi
+++ b/vhost/webpac2.cgi
@@ -7,22 +7,26 @@ 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;
+my $debug = param('debug');
 
-print header;
+print header(
+	-charset => 'utf-8',
+);
 
 sub dump_yaml {
 	my $name = shift;
-	print qq|<pre># $name\n|, YAML::Dump( @_ ), qq|</pre>|;
+	print qq|<div class=dump><tt>$name</tt><pre>|, YAML::Dump( @_ ), qq|</pre></div>| if $debug;
 }
 
-sub show_pages {
-	my ($pager,$coderef) = @_;
+sub show_pager {
+	my ($pager) = @_;
 
 	my @show_pages;
 	my $after_current = 0;
@@ -34,29 +38,51 @@ sub show_pages {
 		@show_pages = ( $pager->first_page, '', $pager->current_page - $range_around .. $pager->current_page );
 	}
 
-	if ( $pager->current_page + $range_around + 1 >= $pager->last_page ) {
+	if ( $pager->current_page + $after_current + $range_around + 1 >= $pager->last_page ) {
 		push @show_pages, ( $pager->current_page + 1 .. $pager->last_page );
 	} else {
 		push @show_pages, ( $pager->current_page + 1 .. $pager->current_page + $after_current + $range_around, '', $pager->last_page );
 	}
 
-	warn "## show_pages = ",dump( @show_pages );
+#	dump_yaml( 'show_pages', \@show_pages );
 
-	return join( ' ', map {
-		if ( $_ == $pager->current_page ) {
-			qq|<b>$_</b>|;
-		} elsif ( $_ eq '' ) {
-			qq|...|;
-		} else {
-			$coderef->( $_ );
-		}
-	} @show_pages );
+	return '' unless $#show_pages;
+
+	my ( $prev, $next ) = ( '&lt;&lt;', '&gt;&gt;' );
+
+	sub li_a_href {
+		my ( $page, $label, $attr ) = @_;
+		param( 'current_page', $page );
+		my $url = self_url( -query => 1 );
+		$attr ||= '';
+		$label ||= $page;
+		qq|<li$attr><a href="$url" title="$page">$label</a></li>|;
+	}
+
+	return
+		  $pager->previous_page ? li_a_href( $pager->previous_page, $prev ) : qq|<li class=skip>$prev</li>|
+		, ( map {
+			if ( $_ eq $pager->current_page ) {
+				qq|<li class=current_page>$_</li>|;
+			} elsif ( $_ eq '' ) {
+				qq|<li class=skip>...</li>|;
+			} else {
+				li_a_href( $_ );
+			}
+		} @show_pages )
+		, $pager->next_page ? li_a_href( $pager->next_page, $next ) : qq|<li class=skip>$next</li>|
+		;
+		
 }
 
 my $path = $ENV{PATH_INFO} || 'ecas';
+$path =~ s{^/+}{};
+$path =~ s{/+$}{};
 my $dir = $0;
 $dir =~ s{/[^/]+.cgi}{};
 
+dump_yaml( 'dir', $dir );
+
 my $config = YAML::LoadFile( "$dir/$path/config.yml" );
 
 my $database = (keys %{ $config->{databases} })[0];
@@ -71,94 +97,198 @@ if ( -e $html_markup ) {
 	undef $html_markup;
 }
 
-my $estraier = YAML::LoadFile( "$dir/../var/estraier/$database.yaml" );
+my $stats;
+{
+	my $path = "$dir/../var/swish/$database.yaml";
+	$stats = YAML::LoadFile( $path );
+	dump_yaml( "stats $path", $stats );
+}
 
 my $db = $config->{databases}->{$database};
 
-my @attr = keys %{ $estraier->{attr} }; # FIXME replace with real gnerated lookup
+sub read_config_txt {
+	my ( $file ) = @_;
+	my $input;
+	foreach ( split(/[\n\r]+/, read_file( "$dir/$path/$path-$file.txt" ) ) ) {
+		my ( $val,$label ) = split(/\s*\t\s*/,$_,2);
+		push @{ $input->{ '-values' } }, $val;
+				$input->{ '-labels' }->{$val} = $label;
+	}
+	return $input;
+}
 
-print
-	start_html(
-		-title => $db->{name},
-		-style => '../../style.css',
-	),
-	h1( $db->{name} ),
-	qq|<div id=description>|, $db->{description}, qq|</div>|,
-	start_form,
+my $attr_labels    = read_config_txt 'labels';
+my $attr_operators = read_config_txt 'operators';
+
+my @attr = @{ $attr_labels->{'-values'} };
+@attr = keys %{ $stats->{attr} } unless @attr;
+
+
+warn dump( $attr_labels, $attr_operators );
+
+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 );
+
+my @style = ( '../../style.css' );
+push @style, "../../$path/$path.css" if -e "$dir/$path/$path.css";
+dump_yaml( 'style', \@style );
+
+sub search_form {
+	qq|<a name="form"></a>|,
+	start_form( -action => self_url( query => 0 ) ),
 		radio_group(
 			-name => 'attr',
-			-values => [ @attr ],
+			%$attr_labels,
 #			-linebreak => 0,
 		),
 		textfield( -name => 'search' ),
+		popup_menu( -name => 'attr_operator', %$attr_operators ),
 		submit,
-		textfield( -name => 'entries_per_page', -default => $entries_per_page ),
-		textfield( -name => 'current_page', -default => 1 ),
-;
+		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' ),
+		checkbox_group(
+			-name => 'only_input',
+			%$only_input,
+			-linebreak=> 'true',
+		),
+		qq|</div>|,
+		end_form,
+	;
+}
 
-print	end_form;
+
+print
+	start_html(
+		-title => $db->{name},
+		-style => [ @style ],
+	),
+	h1( $db->{name} ),
+	qq|<div id=description>|, $db->{description}, qq|</div>|,
+;
 
 if ( my $search = param('search') ) {
 
-	print qq|<div id="results">|;
+	print qq|
+		<a href="#form" class="skip" title="skip to search form">#</a>
+		<div id="results">
+	|;
+
+	my $swish = SWISH::API->new( "$dir/../var/swish/$database" );
+	$swish->abort_last_error if $swish->Error;
+
+	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 . '"';
+				;
+		};
+		if ( $op =~ m{\s} ) {
+			my $template = $op;
+			   $template =~ s{Q}{$v};
+			$v = $attr . '="' . $template . '"';
+		} else {
+			$v =~ s{(\s*)(\S+)}{rewrite($1,$2)}ge;
+		}
 
-	my $node = Search::Estraier::Node->new(
-		url => $config->{hyperestraier}->{masterurl} . '/node/' . $database,
-		croak_on_error => 1,
-	);
+		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\"";
+	}
 
-	param( 'entries_per_page', $entries_per_page ) unless param('entries_per_page'); # FIXME not needed?
+	my $q = '(' . join(') AND (', @search) . ')';
+	$q =~ s{\(\((.+)\)\)}{($1)};
+	warn "# query: $q\n";
+	my $swish_results = $swish->query( $q );
 
-	my $cond = Search::Estraier::Condition->new;
-	$cond->set_phrase( $search );
-	$cond->set_skip( param('current_page') );
-	$cond->set_max( param('entries_per_page') );
-	my $nres = $node->search( $cond, 0 );
+	dump_yaml( 'swish_results', $swish_results );
 
-	my $pager = Data::Page->new( $nres->hits, param('entries_per_page'), param('current_page') );
+	my $pager = Data::Page->new;
+	$pager->$_( param($_) ) foreach ( qw/entries_per_page current_page/ );
+	$pager->total_entries( $swish_results->hits );
 
-	if ( ! $nres ) {
-		my $no_results = "No results for search '%s'";
-		printf qq|<div class="error">$no_results</div>|, $search;
+	dump_yaml( 'pager', $pager );
+
+	$swish_results->seek_result( $pager->first - 1 );
+
+	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 = "Got %d results for search '%s'";
-		printf qq|<div class="message">$results</div>|, $nres->hits, $search;
-
-		print
-			qq|<div class=pager>|,
-			show_pages( $pager,
-				sub {
-					my ($page) = @_;
-					param( 'current_page', $page );
-					my $url = self_url( -query => 1 );
-					qq|<a href="$url">$_</a>|;
-				}
-			),
-			qq|</div>|
-		;
+		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 ));
+
+		print qq|<ul class="pager">$pager_html</ul>\n\n| if $pager_html;
+
+		my $nr = $pager->first;
+		print qq|<ol start=$nr>\n|;
 
-		my $start = $pager->first;
-		print qq|<ol start=$start>|;
+		my $limit = $pager->entries_on_this_page;
 
-		foreach my $i ( 1 .. $nres->doc_num ) {
-			my $rdoc = $nres->get_doc( $i - 1 );
-			print qq|<li>|;
+		my $nr = 1;
+
+		while ( my $result = $swish_results->next_result ) {
+
+			my $data = from_json $result->property('data');
+
+			dump_yaml( 'data', $data );
+
+			my $li_class = '';
+			$li_class = qq| class="z"| if $nr % 2 == 0;
+			print qq|<li$li_class>|;
 			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|;
+				my $label = $attr_labels->{'-labels'}->{$attr} || $attr;
+				print qq|<div><label>$label</label><span class=$attr>$v</span></div>\n|;
 			}
 			print qq|</li>\n|;
+
+			last if $nr++ == $pager->last;
 		}
-		print qq|</ol>|;
+		print qq|</ol>\n\n|;
+
+		print qq|<ul class="pager bottom">$pager_html</ul>\n\n| if $pager_html;
 	}
 	print qq|</div>|;
 
@@ -166,8 +296,9 @@ if ( my $search = param('search') ) {
 
 }
 
-dump_yaml( 'estraier', $estraier );
-dump_yaml( 'db', $db );
+print search_form;
+
+dump_yaml( "config databases $database", $db );
 dump_yaml( 'html_markup_skip', $html_markup_skip );
 
 print	end_html;