r1846@llin: dpavlin | 2009-04-26 00:26:04 +0200

[webpac2] / vhost / webpac2.cgi

diff --git a/vhost/webpac2.cgi b/vhost/webpac2.cgi
index 9d086a0..8cadc19 100755 (executable)
--- a/vhost/webpac2.cgi
+++ b/vhost/webpac2.cgi
@@ -22,7 +22,7 @@ print header(
 
 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 {
@@ -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];
@@ -93,11 +97,16 @@ if ( -e $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 @attr = keys %{ $estraier->{attr} }; # FIXME replace with real gnerated lookup
+my @attr = keys %{ $stats->{attr} }; # FIXME replace with real gnerated lookup
 
 # XXX pipe delimit list!
 my $select_attr_operators = << '__ATTR_OPERATORS__';
@@ -128,10 +137,14 @@ foreach ( @{ $db->{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|<div id=description>|, $db->{description}, qq|</div>|,
@@ -145,7 +158,8 @@ print
                popup_menu( -name => 'attr_operator', %$attr_operator ),
                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' ),
@@ -158,9 +172,6 @@ print
 
 ;
 
-dump_yaml( 'inputs', $db->{input} );
-dump_yaml( 'input names', map { $_->{name} } @{ $db->{input} } );
-
 print  end_form;
 
 if ( my $search = param('search') ) {
@@ -170,9 +181,7 @@ if ( my $search = param('search') ) {
        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 );
@@ -204,7 +213,7 @@ if ( my $search = param('search') ) {
                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) . ')';
@@ -216,6 +225,8 @@ if ( my $search = param('search') ) {
 
        $pager->total_entries( $swish_results->hits );
 
+       $swish_results->seek_result( $pager->first );
+
        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;
@@ -232,9 +243,15 @@ if ( my $search = param('search') ) {
                my $start = $pager->first;
                print qq|<ol start=$start>\n|;
 
+               my $limit = $pager->entries_on_this_page;
+
                while ( my $result = $swish_results->next_result ) {
+                       last if $limit-- == 0;
+
                        my $data = from_json $result->property('data');
 
+                       dump_yaml( 'data', $data );
+
                        print qq|<li>|;
                        foreach my $attr ( @attr ) {
                                next unless defined $data->{$attr};
@@ -260,7 +277,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;