--- trunk/vhost/webpac2.cgi 2009/04/25 09:28:44 1153
+++ trunk/vhost/webpac2.cgi 2009/04/29 18:06:15 1176
@@ -22,7 +22,7 @@
sub dump_yaml {
my $name = shift;
- print qq|
# $name\n|, YAML::Dump( @_ ), qq|
| if $debug;
+ print qq|$name|, YAML::Dump( @_ ), qq|
| if $debug;
}
sub show_pager {
@@ -76,9 +76,13 @@
}
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];
@@ -93,51 +97,82 @@
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( -action => self_url( query => 0 ) ),
radio_group(
-name => 'attr',
- -values => [ @attr ],
+ %$attr_labels,
# -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_operators ),
submit,
hidden( -name => 'entries_per_page', -default => $entries_per_page ),
- hidden( -name => 'current_page', -default => 1 ),
+ # 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',
- -values => [ map { $_->{name} } @{ $db->{input} } ],
+ %$only_input,
-linebreak=> 'true',
),
qq|
|,
;
-dump_yaml( 'inputs', $db->{input} );
-dump_yaml( 'input names', map { $_->{name} } @{ $db->{input} } );
-
print end_form;
if ( my $search = param('search') ) {
@@ -147,51 +182,80 @@
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;
- $pager->total_entries( param('current_page') * param('entries_per_page') );
- $pager->$_( param($_) ) foreach ( qw/entries_per_page current_page/ );
-
- dump_yaml( 'pager', $pager );
-
- my @search = ( "xml=$search" );
-
-# if ( my $op = param('attr_operator') ) {
-# $cond->add_attr( param('attr') . " $op " . param('search') );
-# }
-
- my @only_input = param('only_input');
-
- push @search, '(' . join(') or (', @only_input) . ')' if @only_input;
+ 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 $q = '(' . join(') and (', @search) . ')';
+ my $q = '(' . join(') AND (', @search) . ')';
+ $q =~ s{\(\((.+)\)\)}{($1)};
warn "# query: $q\n";
my $swish_results = $swish->query( $q );
- $swish->abort_last_error if $swish->Error;
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 );
+ dump_yaml( 'pager', $pager );
+
+ $swish_results->seek_result( $pager->first - 1 );
+
if ( ! $pager->total_entries ) {
- my $no_results = "No results for search '%s'";
- printf qq|$no_results
\n\n|, $search;
+ 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 {
my $results = "%d results for search %s showing results %d - %d";
- printf qq|$results
\n\n|, $pager->total_entries, $search, $pager->first, $pager->last;
+ 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 $start = $pager->first;
- print qq|\n|;
+ 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');
- print qq|- |;
+ dump_yaml( 'data', $data );
+
+ my $li_class = '';
+ $li_class = qq| class="z"| if $nr++ % 2 == 0;
+ print qq|
- |;
foreach my $attr ( @attr ) {
next unless defined $data->{$attr};
my $v = $data->{$attr};
@@ -202,9 +266,12 @@
$html_markup_skip->{$attr} = $@;
}
}
- 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|
\n\n|;
@@ -216,7 +283,7 @@
}
-dump_yaml( 'db', $db );
+dump_yaml( "config databases $database", $db );
dump_yaml( 'html_markup_skip', $html_markup_skip );
print end_html;