use Text::Unaccent;
use lib '..';
-use index_DBI;
+use index_DBI_cache;
use back2html;
-# configuration options
-# FIXME they really should go in configuration file!
-my $TEMPLATE_PATH = '/data/webpac/template_html';
-my $CHARSET = 'ISO-8859-2';
-my $SWISH = '/usr/bin/swish-e';
-my $INDEX = '/data/webpac/index/isis.index';
-my $MAX_HITS = 0;
-my $ON_PAGE = 10;
+
+# read global.conf configuration
+my $cfg_global = new Config::IniFiles( -file => '../global.conf' ) || die "can't open 'global.conf'";
+
+# configuration options from global.conf
+my $TEMPLATE_PATH = $cfg_global->val('webpac', 'template_html') || die "need template_html in global.conf, section webpac";
+my $CHARSET = $cfg_global->val('webpac', 'charset') || 'ISO-8859-1';
+my $SWISH = $cfg_global->val('webpac', 'swish') || '/usr/bin/swish-e';
+my $INDEX = $cfg_global->val('webpac', 'index') || die "need index in global.conf, section webpac";
+my $MAX_HITS = $cfg_global->val('webpac', 'max_hits') || 0;
+my $ON_PAGE =$cfg_global->val('webpac', 'on_page') || 10;
+my $MIN_WILDCARD =$cfg_global->val('webpac', 'min_wildcard') || 1;
+my $TEMPLATE =$cfg_global->val('webpac', 'template');
+
Text::Iconv->raise_error(0); # Conversion errors raise exceptions
my $from_utf8 = Text::Iconv->new('UTF8', $CHARSET);
-# read global.conf configuration
-my $cfg_global = new Config::IniFiles( -file => '../global.conf' ) || die "can't open 'global.conf'";
-
sub setup {
my $self = shift;
$self->header_props(-charset=>$CHARSET);
}
+sub in_template {
+ my $html = shift || "This page is left unintentionally blank";
+ return $html if (! defined($TEMPLATE));
+ if (open(T, $TEMPLATE)) {
+ my $template_html = join("\n",<T>);
+ close(T);
+ $template_html =~ s/##webpac##/$html/gsi;
+ return $template_html;
+ } else {
+ return "Can't read template '$TEMPLATE'";
+ }
+}
+
sub show_search_form {
my $self = shift;
my $fif = new HTML::FillInForm;
- return $fif->fill(scalarref => \$html, fobject => $q,
- target => 'search');
+ return in_template($fif->fill(scalarref => \$html, fobject => $q,
+ target => 'search'));
}
sub show_results_list {
my @path_arr = $q->param('path');
my $full = $q->param('full');
- for(my $i = 1; $i <=30; $i++) {
+ my @persist_vars = ( 'rm' );
+ my @url_params = ( 'rm=results', 'show_full=1', 'last_PAGER_offset='.$q->param('PAGER_offset') || 0 );
+
+ # support parametars "f" and "v" for start
+ for(my $i = ""; $i <=30; $i++) {
return show_index($self, $i) if ($q->param("f".$i."_index"));
+
next if (! $q->param("v$i"));
next if (! $q->param("f$i"));
+ push @persist_vars, "f$i";
+ push @persist_vars, "v$i";
+
+ push @url_params,"f$i=".$q->url_param("f$i");
+ foreach my $v ($q->url_param("v$i")) {
+ push @url_params,"v$i=$v";
+ }
+
+ my $wc="*"; # swish wildcard
+ $wc="" if ($i eq ""); # don't apply wildcard on field 0
+
# re-write query from +/- to and/and not
my @param_vals = $q->param("v$i");
my @swish_q;
if (m/^([+-])(\S+)/) {
$s.= ($s) ? "and " : "";
$s.="not " if ($1 eq "-");
- $s.="$2* ";
- } elsif (m/(and|or|not)/i) {
+ $s.="$2$wc ";
+ } elsif (m/^\s*(and|or|not)\s*$/i) {
+ $s.="$_ ";
+ # don't add * to words with less than x chars
+ } elsif (length($_) <= $MIN_WILDCARD) {
$s.="$_ ";
} else {
- $s.="$_* ";
+ $s.="$_$wc ";
}
}
$s =~ s/\*+/*/g;
push @s_arr, $q->param("f$i")."_swish=(".join(" or ",@swish_q).")";
}
- my $tmpl = $self->load_tmpl('results.html');
+ my $tmpl = $self->load_tmpl('results.html', global_vars => 1);
+
+ sub esc_html {
+ my $html = shift;
+ $html =~ s/</</g;
+ $html =~ s/>/>/g;
+ return $html;
+ }
# call swish
my $sh = SWISH->connect('Fork',
push @swish_results, {
nr => ($#swish_results + 2),
path => $hit->swishdocpath,
- headline => $from_utf8->convert($hit->headline),
+ headline => esc_html($from_utf8->convert($hit->headline)),
html => back2html($from_utf8->convert($hit->html)),
rank => $hit->swishrank };
die $SWISH::errstr unless $sh;
# construct swish query
my $sw_q = join(" and ",@s_arr);
- if (@path_arr) {
+ if (@path_arr && $q->param('show_full')) {
$sw_q .= "and (swishdocpath=\"";
$sw_q .= join("\" or swishdocpath=\"",@path_arr);
$sw_q .= "\")";
$tmpl->param('full',1); # show full records
+ } elsif ($q->param('show_full')) {
+ # just show full path, no path defined
+ $tmpl->param('full',1);
+ } else {
+ $tmpl->param('full',0);
}
my $hits = $sh->query($sw_q);
$tmpl->param('hits',$hits);
$tmpl->param('search',$sw_q);
- $tmpl->param('PAGER_offset',$q->param("PAGER_offset") || 1);
- $tmpl->param('last_PAGER_offset',$q->param("last_PAGER_offset") || 1);
+ $tmpl->param('PAGER_offset',$q->param("PAGER_offset") || 0);
+ $tmpl->param('last_PAGER_offset',$q->param("last_PAGER_offset") || 0);
+
+ $tmpl->param('url_params',"?".join("&",@url_params));
# create a Pager object
my $pager = HTML::Pager->new(
my @result;
for (my $i=0; $i<$rows; $i++) {
- push @result, $swish_results[$offset+$i] if $swish_results[$offset+$i];
+ my $r = $swish_results[$offset+$i];
+ if ($r && $tmpl->param('full')) {
+ push @result, $r;
+ } elsif ($r) {
+ # if not full output, skip html
+ delete $r->{html};
+ push @result, $r;
+ }
}
return \@result;
},
rows => $hits,
page_size => $ON_PAGE,
# some optional parameters
- persist_vars => [
- 'rm',
- 'f1', 'v1',
- 'f2', 'v2',
- 'f3', 'v3',
- 'f4', 'v4',
- 'f5', 'v5',
- 'f6', 'v6',
- 'f7', 'v7',
- 'f8', 'v8',
- 'f9', 'v9',
- ],
+ persist_vars => [ @persist_vars ],
#cell_space_color => '#000000',
#cell_background_color => '#ffffff',
#nav_background_color => '#dddddd',
my $html = $pager->output;
- return $html;
+ return in_template($html);
}
sub show_index {
$cfg_global->val('global', 'dbi_passwd') || ''
);
- my $total = $index->check($field);
+ my $total = $index->count($field,$limit);
if (! $total) {
my $tmpl = $self->load_tmpl('no_index.html');
$tmpl->param('field',$field);
return $html;
}
- my $tmpl = $self->load_tmpl('index_res.html');
+ my $tmpl = $self->load_tmpl('index_res.html', global_vars => 1);
$tmpl->param('field',$field);
$tmpl->param('limit',$limit);
$tmpl->param('total',$total);
get_data_callback => sub {
my ($offset, $rows) = @_;
- my @result = $index->fetch($field,'item',$limit, $offset, $rows);
+ my @result = $index->fetch($field,$limit, $offset, $rows);
return \@result;
},
rows => $total,
template => $tmpl,
);
- return $pager->output;
+ return in_template($pager->output);
}
1;