put dashed lines between attributes in each result

[webpac2] / vhost / webpac2.cgi

diff --git a/vhost/webpac2.cgi b/vhost/webpac2.cgi
index a5a5c92..838cfd9 100755 (executable)
--- a/vhost/webpac2.cgi
+++ b/vhost/webpac2.cgi
@@ -109,7 +109,12 @@ my $db = $config->{databases}->{$database};
 sub read_config_txt {
        my ( $file ) = @_;
        my $input;
-       foreach ( split(/[\n\r]+/, read_file( "$dir/$path/$path-$file.txt" ) ) ) {
+       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;
@@ -142,13 +147,8 @@ 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 ],
-       ),
-       h1( $db->{name} ),
-       qq|<div id=description>|, $db->{description}, qq|</div>|,
+sub search_form {
+       qq|<a name="form"></a>|,
        start_form( -action => self_url( query => 0 ) ),
                radio_group(
                        -name => 'attr',
@@ -170,23 +170,30 @@ print
                        -linebreak=> 'true',
                ),
                qq|</div>|,
+               end_form,
+       ;
+}
 
-;
 
-print  end_form;
+print
+       start_html(
+               -title => $db->{name},
+               -style => [ @style ],
+       ),
+       h1( $db->{name} ),
+       qq|<div id=description>|, $db->{description}, qq|</div>|,
+;
 
 if ( my $search = param('search') ) {
 
-       print qq|<div id="results">|;
+       print qq|
+               <a href="#form" class="skip" title="skip to search form">#</a>
+               <div id="results">
+       |;
 
        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;
@@ -207,12 +214,18 @@ if ( my $search = param('search') ) {
                                $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\"";
        }
@@ -224,9 +237,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 <b>%s</b>';
@@ -241,19 +258,22 @@ if ( my $search = param('search') ) {
 
                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;
 
+               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|<li>|;
+                       my $li_class = '';
+                       $li_class = qq| class="z"| if $nr % 2 == 0;
+                       print qq|<li$li_class>|;
                        foreach my $attr ( @attr ) {
                                next unless defined $data->{$attr};
                                my $v = $data->{$attr};
@@ -263,11 +283,15 @@ if ( my $search = param('search') ) {
                                                warn "disable html markup for $attr: $@";
                                                $html_markup_skip->{$attr} = $@;
                                        }
+                               } else {
+                                       $v =~ s{(http://\S+)}{<a href="$1">$1</a>};
                                }
                                my $label = $attr_labels->{'-labels'}->{$attr} || $attr;
                                print qq|<div><label>$label</label><span class=$attr>$v</span></div>\n|;
                        }
                        print qq|</li>\n|;
+
+                       last if $nr++ == $pager->last;
                }
                print qq|</ol>\n\n|;
 
@@ -279,6 +303,8 @@ if ( my $search = param('search') ) {
 
 }
 
+print search_form;
+
 dump_yaml( "config databases $database", $db );
 dump_yaml( 'html_markup_skip', $html_markup_skip );