From f329d055c859424b6640cd03c919f64c6cfc199c Mon Sep 17 00:00:00 2001 From: KennethLavrsen Date: Wed, 31 Mar 2010 12:27:40 +0000 Subject: [PATCH] Item8809: SEARCH newline $n does not work Still need to add unit test to verify this special case git-svn-id: http://svn.foswiki.org/trunk@7011 0b4bb1d4-4e5a-0410-9cc4-b2b747904278 --- core/lib/Foswiki/Search.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/lib/Foswiki/Search.pm b/core/lib/Foswiki/Search.pm index 3e18834608..c796330e0f 100644 --- a/core/lib/Foswiki/Search.pm +++ b/core/lib/Foswiki/Search.pm @@ -399,6 +399,10 @@ sub searchWeb { my $prefs = $session->{prefs}; my $mixedAlpha = $Foswiki::regex{mixedAlpha}; + + # separator defines what separates each search result + # excluding header and footer + # Replace $n and $n() with \n for separator my $separator = $params{separator}; if ( defined($separator) ) { $separator =~ s/\$n\(\)/\n/gos; # expand "$n()" to new line @@ -406,12 +410,14 @@ sub searchWeb { } $params{separator} = $separator; -#TODO: this code ($newLine) does not seem to be used. Fix needed. + # newline feature replaces newlines within each search result + # Replace $n and $n() with \n for newLine my $newLine = $params{newline} || ''; if ($newLine) { $newLine =~ s/\$n\(\)/\n/gos; # expand "$n()" to new line $newLine =~ s/\$n([^$mixedAlpha]|$)/\n$1/gos; } + $params{newline} = $newLine; my ( $numberOfResults, $web_searchResult ) = $this->formatResults( $query, $infoCache, \%params );