X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=vhost%2Fwebpac2.cgi;h=664669e72c0795a8fe5d10261e56546b1fac622b;hb=786e2eae96f21248824dc135cc315d98ca88ba46;hp=84b6a16de039d6feb1e200e7b8f07532ca398de3;hpb=eb8c405b3cf4b59bcd9bf2cf2798e1d7dd68a413;p=webpac2
diff --git a/vhost/webpac2.cgi b/vhost/webpac2.cgi
index 84b6a16..664669e 100755
--- a/vhost/webpac2.cgi
+++ b/vhost/webpac2.cgi
@@ -76,9 +76,13 @@ sub show_pager {
}
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,25 @@ my $stats;
my $db = $config->{databases}->{$database};
-my @attr = keys %{ $stats->{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;
+}
-# 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 +138,20 @@ foreach ( @{ $db->{input} } ) {
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 +165,30 @@ print
-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;
@@ -215,9 +226,13 @@ if ( my $search = param('search') ) {
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 +247,22 @@ if ( my $search = param('search') ) {
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};
@@ -255,9 +273,12 @@ if ( my $search = param('search') ) {
$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|;
@@ -269,6 +290,8 @@ if ( my $search = param('search') ) {
}
+print search_form;
+
dump_yaml( "config databases $database", $db );
dump_yaml( 'html_markup_skip', $html_markup_skip );