projects
/
webpac2
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more fixes and cleanups for pager
[webpac2]
/
vhost
/
webpac2.cgi
diff --git
a/vhost/webpac2.cgi
b/vhost/webpac2.cgi
index
9d086a0
..
8b9d844
100755
(executable)
--- a/
vhost/webpac2.cgi
+++ b/
vhost/webpac2.cgi
@@
-22,7
+22,7
@@
print header(
sub dump_yaml {
my $name = shift;
sub dump_yaml {
my $name = shift;
- print qq|<
pre># $name\n|, YAML::Dump( @_ ), qq|</pre
>| if $debug;
+ print qq|<
div class=dump><tt>$name</tt><pre>|, YAML::Dump( @_ ), qq|</pre></div
>| if $debug;
}
sub show_pager {
}
sub show_pager {
@@
-76,9
+76,13
@@
sub show_pager {
}
my $path = $ENV{PATH_INFO} || 'ecas';
}
my $path = $ENV{PATH_INFO} || 'ecas';
+$path =~ s{^/+}{};
+$path =~ s{/+$}{};
my $dir = $0;
$dir =~ s{/[^/]+.cgi}{};
my $dir = $0;
$dir =~ s{/[^/]+.cgi}{};
+dump_yaml( 'dir', $dir );
+
my $config = YAML::LoadFile( "$dir/$path/config.yml" );
my $database = (keys %{ $config->{databases} })[0];
my $config = YAML::LoadFile( "$dir/$path/config.yml" );
my $database = (keys %{ $config->{databases} })[0];
@@
-93,28
+97,34
@@
if ( -e $html_markup ) {
undef $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 $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;
+}
-# 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;
my $only_input;
@@
-128,24
+138,29
@@
foreach ( @{ $db->{input} } ) {
warn "## only_input = ", dump( $only_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},
print
start_html(
-title => $db->{name},
- -style =>
'../../style.css'
,
+ -style =>
[ @style ]
,
),
h1( $db->{name} ),
qq|<div id=description>|, $db->{description}, qq|</div>|,
start_form( -action => self_url( query => 0 ) ),
radio_group(
-name => 'attr',
),
h1( $db->{name} ),
qq|<div id=description>|, $db->{description}, qq|</div>|,
start_form( -action => self_url( query => 0 ) ),
radio_group(
-name => 'attr',
-
-values => [ @attr ]
,
+
%$attr_labels
,
# -linebreak => 0,
),
textfield( -name => 'search' ),
# -linebreak => 0,
),
textfield( -name => 'search' ),
- popup_menu( -name => 'attr_operator', %$attr_operator ),
+ popup_menu( -name => 'attr_operator', %$attr_operator
s
),
submit,
hidden( -name => 'entries_per_page', -default => $entries_per_page ),
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|<input type=hidden name=current_page value=1 >|,
checkbox( -name => 'debug', -default => 0 ), # FIXME hidden?
qq|<div id=inputs>|,
h2( 'Select input' ),
checkbox( -name => 'debug', -default => 0 ), # FIXME hidden?
qq|<div id=inputs>|,
h2( 'Select input' ),
@@
-158,9
+173,6
@@
print
;
;
-dump_yaml( 'inputs', $db->{input} );
-dump_yaml( 'input names', map { $_->{name} } @{ $db->{input} } );
-
print end_form;
if ( my $search = param('search') ) {
print end_form;
if ( my $search = param('search') ) {
@@
-170,13
+182,6
@@
if ( my $search = param('search') ) {
my $swish = SWISH::API->new( "$dir/../var/swish/$database" );
$swish->abort_last_error if $swish->Error;
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 = ();
if ( $search =~ m{(=|"|AND|OR)} ) {
push @search, $search;
my @search = ();
if ( $search =~ m{(=|"|AND|OR)} ) {
push @search, $search;
@@
-204,7
+209,7
@@
if ( my $search = param('search') ) {
my @only_input = param('only_input');
push @search, '(' . join(') OR (', map { "input=$_" } @only_input) . ')' if @only_input;
} else {
my @only_input = param('only_input');
push @search, '(' . join(') OR (', map { "input=$_" } @only_input) . ')' if @only_input;
} else {
- push @search, "
xml=$search
";
+ push @search, "
all=\"$search\"
";
}
my $q = '(' . join(') AND (', @search) . ')';
}
my $q = '(' . join(') AND (', @search) . ')';
@@
-214,8
+219,14
@@
if ( my $search = param('search') ) {
dump_yaml( 'swish_results', $swish_results );
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 );
$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 <b>%s</b>';
$no_results = $swish->error_string . '<br><b>%s</b>' if $swish->error;
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;
@@
-229,12
+240,17
@@
if ( my $search = param('search') ) {
print qq|<ul class="pager">$pager_html</ul>\n\n| if $pager_html;
print qq|<ul class="pager">$pager_html</ul>\n\n| if $pager_html;
- my $start = $pager->first;
- print qq|<ol start=$start>\n|;
+ my $nr = $pager->first;
+ print qq|<ol start=$nr>\n|;
+
+ my $limit = $pager->entries_on_this_page;
while ( my $result = $swish_results->next_result ) {
while ( my $result = $swish_results->next_result ) {
+
my $data = from_json $result->property('data');
my $data = from_json $result->property('data');
+ dump_yaml( 'data', $data );
+
print qq|<li>|;
foreach my $attr ( @attr ) {
next unless defined $data->{$attr};
print qq|<li>|;
foreach my $attr ( @attr ) {
next unless defined $data->{$attr};
@@
-246,9
+262,12
@@
if ( my $search = param('search') ) {
$html_markup_skip->{$attr} = $@;
}
}
$html_markup_skip->{$attr} = $@;
}
}
- 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|;
}
print qq|</li>\n|;
+
+ last if $nr++ == $pager->last;
}
print qq|</ol>\n\n|;
}
print qq|</ol>\n\n|;
@@
-260,7
+279,7
@@
if ( my $search = param('search') ) {
}
}
-dump_yaml(
'db'
, $db );
+dump_yaml(
"config databases $database"
, $db );
dump_yaml( 'html_markup_skip', $html_markup_skip );
print end_html;
dump_yaml( 'html_markup_skip', $html_markup_skip );
print end_html;