--- trunk/vhost/webpac2.cgi 2009/04/25 22:07:59 1171
+++ trunk/vhost/webpac2.cgi 2009/06/09 21:36:22 1219
@@ -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];
@@ -102,24 +106,30 @@
my $db = $config->{databases}->{$database};
-my @attr = keys %{ $stats->{attr} }; # FIXME replace with real gnerated lookup
+sub read_config_txt {
+ my ( $file ) = @_;
+ my $input;
+ 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;
+ }
+ return $input;
+}
-# 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_labels = read_config_txt 'labels';
+my $attr_operators = read_config_txt 'operators';
-my $attr_operator;
+my @attr = @{ $attr_labels->{'-values'} };
+@attr = keys %{ $stats->{attr} } unless @attr;
-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 );
+warn dump( $attr_labels, $attr_operators );
my $only_input;
@@ -133,21 +143,20 @@
warn "## only_input = ", dump( $only_input );
-print
- start_html(
- -title => $db->{name},
- -style => '../../style.css',
- ),
- h1( $db->{name} ),
- qq|
|, $db->{description}, qq|
|,
+my @style = ( '../../style.css' );
+push @style, "../../$path/$path.css" if -e "$dir/$path/$path.css";
+dump_yaml( 'style', \@style );
+
+sub search_form {
+ 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', %$attr_operator ),
+ 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
@@ -161,23 +170,30 @@
-linebreak=> 'true',
),
qq||,
+ end_form,
+ ;
+}
-;
-print end_form;
+print
+ start_html(
+ -title => $db->{name},
+ -style => [ @style ],
+ ),
+ h1( $db->{name} ),
+ qq||, $db->{description}, qq|
|,
+;
if ( my $search = param('search') ) {
- print qq||;
+ print qq|
+
#
+
+ |;
my $swish = SWISH::API->new( "$dir/../var/swish/$database" );
$swish->abort_last_error if $swish->Error;
- my $pager = Data::Page->new;
- $pager->$_( param($_) ) foreach ( qw/entries_per_page current_page/ );
-
- dump_yaml( 'pager', $pager );
-
my @search = ();
if ( $search =~ m{(=|"|AND|OR)} ) {
push @search, $search;
@@ -198,12 +214,18 @@
$attr . '="' . $template . '"';
;
};
- $v =~ s{(\s*)(\S+)}{rewrite($1,$2)}ge;
+ if ( $op =~ m{\s} ) {
+ my $template = $op;
+ $template =~ s{Q}{$v};
+ $v = $attr . '="' . $template . '"';
+ } else {
+ $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;
+ push @search, '((' . join(') OR (', map { "input=\"$_\"" } @only_input) . '))' if @only_input;
} else {
push @search, "all=\"$search\"";
}
@@ -215,9 +237,13 @@
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 );
- $swish_results->seek_result( $pager->first );
+ dump_yaml( 'pager', $pager );
+
+ $swish_results->seek_result( $pager->first - 1 );
if ( ! $pager->total_entries ) {
my $no_results = 'No results for search
%s';
@@ -232,19 +258,22 @@
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 ) {
- last if $limit-- == 0;
my $data = from_json $result->property('data');
dump_yaml( 'data', $data );
- print qq|- |;
+ 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};
@@ -254,10 +283,15 @@
warn "disable html markup for $attr: $@";
$html_markup_skip->{$attr} = $@;
}
+ } else {
+ $v =~ s{(http://\S+)}{$1};
}
- 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|;
@@ -269,6 +303,8 @@
}
+print search_form;
+
dump_yaml( "config databases $database", $db );
dump_yaml( 'html_markup_skip', $html_markup_skip );