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;
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(
+ checkbox_group(
-name => 'attr',
%$attr_labels,
# -linebreak => 0,
),
textfield( -name => 'search' ),
- popup_menu( -name => 'attr_operator', %$attr_operators ),
+ $attr_operators ? 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
-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 = ();
+ my @attrs = param('attr');
+ my $op = param('attr_operator');
+
if ( $search =~ m{(=|"|AND|OR)} ) {
push @search, $search;
- } elsif ( my $op = param('attr_operator') ) {
- my $attr = param('attr');
- my $v = $search;
- $v =~ s/^\s+//;
- warn "-- v: $v\n";
- sub rewrite {
- my ( $whitespace, $v ) = @_;
- warn "## filter $op $whitespace $v\n";
- my $template = $op;
- $template =~ s{Q}{$v};
- $whitespace = " AND " if $whitespace;
-
- return
- $whitespace .
- $attr . '="' . $template . '"';
- ;
- };
- $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;
+ } elsif ( @attrs ) {
+
+ $op ||= 'Q*';
+ my @or;
+ foreach my $attr ( @attrs ) {
+ my $v = $search;
+ $v =~ s/^\s+//;
+ warn "-- v: $v\n";
+ sub rewrite {
+ my ( $attr, $whitespace, $v ) = @_;
+ warn "## filter $op $whitespace $v\n";
+ my $template = $op;
+ $template =~ s{Q}{$v};
+ $whitespace = " AND " if $whitespace;
+
+ return
+ $whitespace .
+ $attr . '="' . $template . '"';
+ ;
+ };
+ if ( $op =~ m{\s} ) {
+ my $template = $op;
+ $template =~ s{Q}{$v};
+ $v = $attr . '="' . $template . '"';
+ } else {
+ $v =~ s{(\s*)(\S+)}{rewrite($attr,$1,$2)}ge;
+ }
+
+ push @or, $v;
+
+ }
+ push @search, '(' . join(') OR (', @or) . ')';
+
} else {
push @search, "all=\"$search\"";
}
my $q = '(' . join(') AND (', @search) . ')';
- $q =~ s{\(\((.+)\)\)}{($1)};
+
+ my @only_input = param('only_input');
+ $q .= ' AND ((' . join(') OR (', map { "input=\"$_\"" } @only_input) . '))' if @only_input;
+
warn "# query: $q\n";
my $swish_results = $swish->query( $q );
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>';
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};
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|;
}
+print search_form;
+
dump_yaml( "config databases $database", $db );
dump_yaml( 'html_markup_skip', $html_markup_skip );