From 7f93cf197985839a202fb6176c4a49aa0580c988 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Sun, 29 Feb 2004 20:58:52 +0000 Subject: [PATCH] fixed search problems --- lib/WebGUI/Wobject/IndexedSearch.pm | 3 ++- lib/WebGUI/Wobject/IndexedSearch/Search.pm | 19 +++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/lib/WebGUI/Wobject/IndexedSearch.pm b/lib/WebGUI/Wobject/IndexedSearch.pm index 03dd3d42e..df3e56629 100644 --- a/lib/WebGUI/Wobject/IndexedSearch.pm +++ b/lib/WebGUI/Wobject/IndexedSearch.pm @@ -282,7 +282,8 @@ sub www_view { map {$url .= "&languages=".WebGUI::URL::escape($_)} $session{cgi}->param('languages'); map {$url .= "&contentTypes=".WebGUI::URL::escape($_)} $session{cgi}->param('contentTypes'); $url .= "&paginateAfter=".$self->getValue("paginateAfter"); - my $p = WebGUI::Paginator->new(WebGUI::URL::page($url), $results, $self->getValue("paginateAfter")); + my $p = WebGUI::Paginator->new(WebGUI::URL::page($url), $self->getValue("paginateAfter")); + $p->setDataByArrayRef($results); $var{startNr} = 1; if($session{form}{pn}) { $var{startNr} = (($session{form}{pn} - 1) * $self->getValue("paginateAfter")) + 1; diff --git a/lib/WebGUI/Wobject/IndexedSearch/Search.pm b/lib/WebGUI/Wobject/IndexedSearch/Search.pm index 3dc6a2f13..8462fb70e 100644 --- a/lib/WebGUI/Wobject/IndexedSearch/Search.pm +++ b/lib/WebGUI/Wobject/IndexedSearch/Search.pm @@ -61,6 +61,21 @@ These methods are available from this package: =cut +#------------------------------------------------------------------- +sub _recurseCrumbTrail { + my ($sth, %data, $output); + tie %data, 'Tie::CPHash'; + %data = WebGUI::SQL->quickHash("select pageId,parentId,menuTitle,urlizedTitle from page where pageId=$_[0]"); + if ($data{pageId} > 1) { + $output .= _recurseCrumbTrail($data{parentId}); + } + if ($data{menuTitle} ne "") { + $output .= ''.$data{menuTitle}.' > '; + } + return $output; +} + #------------------------------------------------------------------- =head2 close ( ) @@ -213,8 +228,8 @@ sub getDetails { $data{header} = $self->highlight($data{header},undef, $options{highlightColors}) if ($options{highlight}); $data{location} = WebGUI::URL::gateway($data{location}); } - # $data{crumbTrail} = WebGUI::Macro::C_crumbTrail::_recurseCrumbTrail($data{pageId}, ' > '); - # $data{crumbTrail} =~ s/\s*>\s*$//; + $data{crumbTrail} = _recurseCrumbTrail($data{pageId}); + $data{crumbTrail} =~ s/\s*\>\s*$//; push(@searchDetails, \%data); } $sth->finish;