ported 257:258 from hidra branch

[webpac] / WebPac.pm

diff --git a/WebPac.pm b/WebPac.pm
index 3ed8a33..28f69ea 100644 (file)
--- a/WebPac.pm
+++ b/WebPac.pm
@@ -28,12 +28,47 @@ 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');
+my $UNAC_FILTER =$cfg_global->val('global', 'unac_filter');
+my $BASE_PATH =$cfg_global->val('webpac', 'base_path');
 
+if ($UNAC_FILTER) {
+       require $UNAC_FILTER;
+}
 
 Text::Iconv->raise_error(0);     # Conversion errors raise exceptions
 
 my $from_utf8 = Text::Iconv->new('UTF8', $CHARSET);
 
+# use path from cgi script to support templates in subdirs
+sub url_ex {
+       my $q = shift || die "suff2file needs CGI object!";
+       my $tpl = shift || die "url_ex needs template name!";
+       return suff2file($BASE_PATH, $q->url(-path => 1),$TEMPLATE_PATH,$tpl);
+}
+
+sub suff2file($$$$) {
+       my ($base_path, $p, $path, $tpl) = @_;
+
+       return $tpl if (! $base_path);
+
+       # strip everything to and including base path, leaving only
+       # additional (virtual) path
+       if ($p =~ s,^.*?$base_path,,) {
+               $p =~ s,/*,,g;
+               my ($name,$ext) = split(/\./,$tpl);
+               $p = $name . $p . "." . $ext;
+       } else {
+               # if unable reset it!
+               $p = $tpl;
+       }
+
+       if ( -e "$path/$p") {
+               return $p;
+       } else {
+               return $tpl;
+       }
+
+}
 
 sub setup {
        my $self = shift;
@@ -51,15 +86,25 @@ sub setup {
 }
 
 sub in_template {
-       my $html = shift || "This page is left unintentionally blank";
+       my $q = shift || die "need CGI object!";
+       my $html = shift || die "This page is left unintentionally blank";
        return $html if (! defined($TEMPLATE));
-       if (open(T, $TEMPLATE)) {
+
+       my ($dir,$tpl);
+       if ($TEMPLATE =~ m,^(.*?/*)([^/]+)$,) {
+               ($dir,$tpl) = ($1,$2);
+       } else {
+               die "can't parse TEMPLATE path";
+       }
+
+       my $master_tpl = suff2file($BASE_PATH, $q->url(-path => 1),$dir,$tpl);
+       if (open(T, $master_tpl)) {
                my $template_html = join("\n",<T>);
                close(T);
                $template_html =~ s/##webpac##/$html/gsi;
                return $template_html;
        } else {
-               return "Can't read template '$TEMPLATE'";
+               return "Can't read template '$master_tpl'";
        }
 }
 
@@ -69,12 +114,12 @@ sub show_search_form {
        # Get the CGI.pm query object
        my $q = $self->query();
 
-       my $tmpl = $self->load_tmpl('search.html');
+       my $tmpl = $self->load_tmpl(url_ex($q,'search.html'));
        my $html = $tmpl->output;
 
        my $fif = new HTML::FillInForm;
 
-       return in_template($fif->fill(scalarref => \$html, fobject => $q,
+       return in_template($q,$fif->fill(scalarref => \$html, fobject => $q,
                target => 'search'));
 }
  
@@ -105,11 +150,13 @@ sub show_results_list {
 
                push @persist_vars, "f$i";
                push @persist_vars, "v$i";
+               push @persist_vars, "e$i" if ($q->param("e$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";
                }
+               push @url_params,"e$i=".$q->url_param("e$i");
 
                my $wc="*";     # swish wildcard
                $wc="" if ($i eq "");   # don't apply wildcard on field 0
@@ -136,7 +183,9 @@ sub show_results_list {
                        if ($q->param("e$i")) {
                                $pre = '"' if (! $pre);
                                $post = '"' if (! $post);
-                               $wc = '';       # don't use windcard in exact
+                               # what about wildcards?
+                               $wc = '';
+                               $wc = '*' if ($q->param("e$i") & 4);
                                $exact = '_exact';
                        }
 
@@ -163,7 +212,7 @@ sub show_results_list {
                push @s_arr, $q->param("f$i")."_swish".$exact."=(".join(" or ",@swish_q).")";
        }
 
-       my $tmpl = $self->load_tmpl('results.html', global_vars => 1);
+       my $tmpl = $self->load_tmpl(url_ex($q,'results.html'), global_vars => 1);
 
        sub esc_html {
                my $html = shift;
@@ -172,6 +221,12 @@ sub show_results_list {
                return $html;
        }
 
+       my $sort = 'swishrank';
+       if ($q->param("sort")) {
+               $sort = 'headline';
+               push @persist_vars, "sort";
+       }
+
        # call swish
        my $sh = SWISH->connect('Fork',
                prog     => $SWISH,
@@ -189,7 +244,8 @@ sub show_results_list {
 
                },
                #startnum => 0,
-               maxhits => $MAX_HITS
+               maxhits => $MAX_HITS,
+               sortorder => $sort,
        );
 
        die $SWISH::errstr unless $sh;
@@ -251,7 +307,7 @@ sub show_results_list {
 
        my $html = $pager->output;
 
-       return in_template($html);
+       return in_template($q,$html);
 }
  
 sub show_index {
@@ -274,13 +330,13 @@ sub show_index {
 
        my $total = $index->count($field,$limit);
        if (! $total) {
-               my $tmpl = $self->load_tmpl('no_index.html');
+               my $tmpl = $self->load_tmpl(url_ex($q,'no_index.html'));
                $tmpl->param('field',$field);
                $html = $tmpl->output;
                return $html;
        }
 
-       my $tmpl = $self->load_tmpl('index_res.html', global_vars => 1);
+       my $tmpl = $self->load_tmpl(url_ex($q,'index_res.html'), global_vars => 1);
        $tmpl->param('field',$field);
        $tmpl->param('limit',$limit);
        $tmpl->param('total',$total);
@@ -309,7 +365,7 @@ sub show_index {
                template => $tmpl,
        );
 
-       return in_template($pager->output);
+       return in_template($q,$pager->output);
 }
 
 1;