oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing a bug that was caused by double quoting.

Browse source
This commit is contained in:
Martin Kamerbeek 2004-08-29 16:11:13 +00:00
parent 3679c31973
commit 2968314d9b
1 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/WebGUI/Wobject/IndexedSearch.pm
View file

@ -255,13 +255,11 @@ sub www_view {
# Do the search # Do the search
my $startTime = Time::HiRes::time(); my $startTime = Time::HiRes::time();
my $filter = $self->_buildFilter; my $filter = $self->_buildFilter;
my $search = WebGUI::Wobject::IndexedSearch::Search->new($self->getValue('indexName')); my $search = WebGUI::Wobject::IndexedSearch::Search->new($self->getValue('indexName'));
$search->open; $search->open;
my $results = $search->search($var{query},$filter); my $results = $search->search($var{query},$filter);
$var{duration} = Time::HiRes::time() - $startTime; $var{duration} = Time::HiRes::time() - $startTime;
$var{duration} = sprintf("%.3f", $var{duration}); # Duration rounded to 3 decimal places $var{duration} = sprintf("%.3f", $var{duration}); # Duration rounded to 3 decimal places
# Let's see if the search returned any results # Let's see if the search returned any results
if (defined ($results)) { if (defined ($results)) {
$var{numberOfResults} = scalar(@$results); $var{numberOfResults} = scalar(@$results);
@ -423,7 +421,6 @@ sub _buildPageList {
push (@roots, $_) if (isIn($_, @allowedRoots)); push (@roots, $_) if (isIn($_, @allowedRoots));
} }
} }
foreach $pageId (@roots) { foreach $pageId (@roots) {
WebGUI::Page->new($pageId)->traversePreOrder( WebGUI::Page->new($pageId)->traversePreOrder(
sub { sub {
@ -447,9 +444,9 @@ sub _buildFilter {
# languages # languages
if($session{form}{languages} && ! isIn('any', $session{cgi}->param('languages'))) { if($session{form}{languages} && ! isIn('any', $session{cgi}->param('languages'))) {
$filter{languageId} = [ map { quote($_) } $session{cgi}->param('languages') ]; $filter{languageId} = [ $session{cgi}->param('languages') ];
} elsif ($self->getValue('languages') !~ /any/i) { } elsif ($self->getValue('languages') !~ /any/i) {
$filter{languageId} = [ map { quote($_) } split(/\n/, $self->getValue('languages')) ]; $filter{languageId} = [ split(/\n/, $self->getValue('languages')) ];
} }
push(@{$filter{languageId}}, '0') if (exists $filter{languageId}); # Some content (i.e. profiles) push(@{$filter{languageId}}, '0') if (exists $filter{languageId}); # Some content (i.e. profiles)
# don't have a language. They # don't have a language. They
@ -457,14 +454,14 @@ sub _buildFilter {
# content-types # content-types
if($session{form}{contentTypes} && ! isIn('any', $session{cgi}->param('contentTypes'))) { if($session{form}{contentTypes} && ! isIn('any', $session{cgi}->param('contentTypes'))) {
$filter{contentType} = [ map { quote($_) } $session{cgi}->param('contentTypes') ]; $filter{contentType} = [ $session{cgi}->param('contentTypes') ];
# contentType "content" is a shortcut for "page", "wobject" and "wobjectDetail" # contentType "content" is a shortcut for "page", "wobject" and "wobjectDetail"
if (isIn('content', $session{cgi}->param('contentTypes'))) { if (isIn('content', $session{cgi}->param('contentTypes'))) {
push(@{$filter{contentType}}, map { quote($_) } qw/page wobject wobjectDetail/); push(@{$filter{contentType}}, qw/page wobject wobjectDetail/);
} }
} elsif ($self->getValue('contentTypes') !~ /any/i) { } elsif ($self->getValue('contentTypes') !~ /any/i) {
$filter{contentType} = [ map { quote($_) } split(/\n/, $self->getValue('contentTypes')) ]; $filter{contentType} = [ split(/\n/, $self->getValue('contentTypes')) ];
} }
# users # users
@ -478,14 +475,14 @@ sub _buildFilter {
push(@{$filter{ownerId}}, quote($user)) if ($user =~ /^\d+$/); push(@{$filter{ownerId}}, quote($user)) if ($user =~ /^\d+$/);
} }
} elsif ($self->getValue('users') !~ /any/i) { } elsif ($self->getValue('users') !~ /any/i) {
$filter{ownerId} = [ map { quote($_) } split(/\n/, $self->getValue('users')) ]; $filter{ownerId} = [ split(/\n/, $self->getValue('users')) ];
} }
# namespaces # namespaces
if($session{form}{namespaces} && ! isIn('any', $session{cgi}->param('namespaces'))) { if($session{form}{namespaces} && ! isIn('any', $session{cgi}->param('namespaces'))) {
$filter{namespace} = [ map { quote($_) } $session{cgi}->param('namespaces') ]; $filter{namespace} = [ $session{cgi}->param('namespaces') ];
} elsif ($self->getValue('namespaces') !~ /any/i) { } elsif ($self->getValue('namespaces') !~ /any/i) {
$filter{namespace} = [ map { quote($_) } split(/\n/, $self->getValue('namespaces')) ]; $filter{namespace} = [ split(/\n/, $self->getValue('namespaces')) ];
} }
# delete $filter{ownerId} if it is an empty array reference # delete $filter{ownerId} if it is an empty array reference