From 8fbcdebdf7f2c10c525eb6b4dd16eddb04a4a10b Mon Sep 17 00:00:00 2001 From: Alex Schroeder Date: Mon, 26 Dec 2005 12:51:12 +0000 Subject: [PATCH] (SearchFreeTextTitleAndBody): Correct handling of raw parameter. --- modules/search-freetext.pl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/search-freetext.pl b/modules/search-freetext.pl index 1149b827..8a09ad5f 100644 --- a/modules/search-freetext.pl +++ b/modules/search-freetext.pl @@ -16,7 +16,7 @@ # 59 Temple Place, Suite 330 # Boston, MA 02111-1307 USA -$ModulesDescription .= '

$Id: search-freetext.pl,v 1.17 2005/09/24 10:13:01 as Exp $

'; +$ModulesDescription .= '

$Id: search-freetext.pl,v 1.18 2005/12/26 12:51:12 as Exp $

'; use vars qw($SearchFreeTextNewForm); @@ -88,6 +88,7 @@ my $SearchFreeTextMax = 10; # max. number of pages sub SearchFreeTextTitleAndBody { my ($term, $func, @args) = @_; ReportError(T('Search term missing.'), '400 BAD REQUEST') unless $term; + my $raw = GetParam('raw',''); require Search::FreeText; my $file = $DataDir . '/word.db'; my $page = GetParam('page', 1); @@ -138,8 +139,8 @@ sub SearchFreeTextTitleAndBody { } unshift(@links, ScriptLink($prev, T('Previous'))) if $prev; push(@links, ScriptLink($next, T('Next'))) if $next; - print $q->p({-class=>'top pages'}, - T('Result pages: '), @links, Ts("(%s results)", $#result + 1)); + print $q->p({-class=>'top pages'}, T('Result pages: '), @links, + Ts("(%s results)", $#result + 1)) unless $raw; } # print result foreach my $id (@items) { @@ -147,8 +148,8 @@ sub SearchFreeTextTitleAndBody { } # repeat result pages at the bottom if (GetParam('search', '') and @items) { - print $q->p({-class=>'bottom pages'}, - T('Result pages: '), @links, Ts("(%s results)", $#result + 1)); + print $q->p({-class=>'bottom pages'}, T('Result pages: '), @links, + Ts("(%s results)", $#result + 1)) unless $raw; } return @items; }