--- trunk/vhost/webpac2.cgi 2009/04/21 23:17:23 1137
+++ trunk/vhost/webpac2.cgi 2009/04/29 18:06:15 1176
@@ -7,19 +7,82 @@
use CGI::Carp qw/fatalsToBrowser/;
use File::Slurp;
use YAML;
-use Search::Estraier;
-
-print header;
+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(
+ -charset => 'utf-8',
+);
sub dump_yaml {
my $name = shift;
- print qq|
# $name\n|, YAML::Dump( @_ ), qq|
|;
+ print qq|$name|, YAML::Dump( @_ ), qq|
| if $debug;
+}
+
+sub show_pager {
+ my ($pager) = @_;
+
+ my @show_pages;
+ my $after_current = 0;
+
+ if ( $pager->current_page <= $range_around + 2 ) {
+ @show_pages = ( $pager->first_page .. $pager->current_page );
+ $after_current = $range_around - $pager->current_page;
+ } else {
+ @show_pages = ( $pager->first_page, '', $pager->current_page - $range_around .. $pager->current_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 );
+ }
+
+# dump_yaml( 'show_pages', \@show_pages );
+
+ return '' unless $#show_pages;
+
+ my ( $prev, $next ) = ( '<<', '>>' );
+
+ sub li_a_href {
+ my ( $page, $label, $attr ) = @_;
+ param( 'current_page', $page );
+ my $url = self_url( -query => 1 );
+ $attr ||= '';
+ $label ||= $page;
+ qq|$label|;
+ }
+
+ return
+ $pager->previous_page ? li_a_href( $pager->previous_page, $prev ) : qq|$prev|
+ , ( map {
+ if ( $_ eq $pager->current_page ) {
+ qq|$_|;
+ } elsif ( $_ eq '' ) {
+ qq|...|;
+ } else {
+ li_a_href( $_ );
+ }
+ } @show_pages )
+ , $pager->next_page ? li_a_href( $pager->next_page, $next ) : qq|$next|
+ ;
+
}
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];
@@ -34,27 +97,80 @@
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;
+}
+
+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 );
print
start_html(
-title => $db->{name},
- -style => '../../style.css',
+ -style => [ @style ],
),
h1( $db->{name} ),
qq||, $db->{description}, qq|
|,
- start_form,
+ start_form( -action => self_url( query => 0 ) ),
radio_group(
-name => 'attr',
- -values => [ @attr ],
+ %$attr_labels,
# -linebreak => 0,
),
textfield( -name => 'search' ),
- submit
+ 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||,
+ checkbox( -name => 'debug', -default => 0 ), # FIXME hidden?
+ qq||,
+ h2( 'Select input' ),
+ checkbox_group(
+ -name => 'only_input',
+ %$only_input,
+ -linebreak=> 'true',
+ ),
+ qq|
|,
+
;
print end_form;
@@ -63,48 +179,111 @@
print qq||;
- my $node = Search::Estraier::Node->new(
- url => $config->{hyperestraier}->{masterurl} . '/node/' . $database,
- croak_on_error => 1,
- );
-
- my $cond = Search::Estraier::Condition->new;
- $cond->set_phrase( $search );
- my $nres = $node->search( $cond, 0 );
-
- if ( ! $nres ) {
- my $no_results = "No results for search '%s'";
- printf qq|
$no_results
|, $search;
+ 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 . '"';
+ ;
+ };
+ $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 {
- my $results = "Got %d results for search '%s'";
- printf qq|
$results
|, $nres->hits, $search;
+ push @search, "all=\"$search\"";
+ }
+
+ my $q = '(' . join(') AND (', @search) . ')';
+ $q =~ s{\(\((.+)\)\)}{($1)};
+ warn "# query: $q\n";
+ my $swish_results = $swish->query( $q );
+
+ dump_yaml( 'swish_results', $swish_results );
+
+ my $pager = Data::Page->new;
+ $pager->$_( param($_) ) foreach ( qw/entries_per_page current_page/ );
+ $pager->total_entries( $swish_results->hits );
- print qq|
|;
+ dump_yaml( 'pager', $pager );
+
+ $swish_results->seek_result( $pager->first - 1 );
+
+ if ( ! $pager->total_entries ) {
+ my $no_results = 'No results for search %s';
+ $no_results = $swish->error_string . '
%s' if $swish->error;
+ printf qq|$no_results
\n\n|, $q;
+ } else {
- foreach my $i ( 1 .. $nres->doc_num ) {
- my $rdoc = $nres->get_doc( $i - 1 );
- print qq|- |;
+ my $results = "%d results for search %s showing results %d - %d";
+ printf qq|
$results
\n\n|, $pager->total_entries, $q, $pager->first, $pager->last;
+
+ my $pager_html = join("\n", show_pager( $pager ));
+
+ print qq|\n\n| if $pager_html;
+
+ my $nr = $pager->first;
+ print qq|\n|;
+
+ my $limit = $pager->entries_on_this_page;
+
+ 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|- |;
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|
$v
\n|;
+ my $label = $attr_labels->{'-labels'}->{$attr} || $attr;
+ print qq|$v
\n|;
}
print qq| \n|;
+
+ last if $nr++ == $pager->last;
}
- print qq|
|;
+ print qq|
\n\n|;
+
+ print qq|\n\n| if $pager_html;
}
print qq|
|;
+
+ dump_yaml( 'pager', $pager );
+
}
-dump_yaml( 'estraier', $estraier );
-dump_yaml( 'db', $db );
+dump_yaml( "config databases $database", $db );
dump_yaml( 'html_markup_skip', $html_markup_skip );
print end_html;