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

fixed a search indexer problem and a tabs.css conflict with tinymce

Browse source
This commit is contained in:
Martin Kamerbeek 2006-09-01 14:43:16 +00:00
parent 8045055d12
commit 518d820a5e
5 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/WebGUI/Search.pm
View file

@ -144,12 +144,14 @@ Returns a WebGUI::SQL::ResultSet object containing the search results with colum
sub getResultSet {
my $self = shift;
my $query = "select assetId, title, url, synopsis, ownerUserId, groupIdView, groupIdEdit, creationDate, revisionDate, className ";
my $query = "select t1.assetId, t1.title, t1.url, t1.synopsis, t1.ownerUserId, t1.groupIdView, t1.groupIdEdit, t1.creationDate, t1.revisionDate, t1.className ";
$query .= " , ".$self->{_score} if ($self->{_score});
$query .= " from assetIndex where ";
$query .= " from assetIndex as t1, asset as t2 where ";
$query .= " t1.assetId=t2.assetId and ";
$query .= "isPublic=1 and " if ($self->{_isPublic});
$query .= "(".$self->{_where}.")";
$query .= " order by score desc " if ($self->{_score});
my $rs = $self->session->db->prepare($query);
$rs->execute($self->{_params});
return $rs;
@ -298,7 +300,7 @@ sub search {
foreach my $lineage (@{$rules->{lineage}}) {
next unless defined $lineage;
push(@params, $lineage."%");
push(@phrases, "lineage like ?");
push(@phrases, "t2.lineage like ?");
}
push(@clauses, join(" or ", @phrases)) if (scalar(@phrases));
}

4
lib/WebGUI/Search/Index.pm
View file

@ -131,10 +131,10 @@ sub create {
#-------------------- added by zxp end
my $add = $self->session->db->prepare("insert into assetIndex (assetId, title, url, creationDate, revisionDate,
ownerUserId, groupIdView, groupIdEdit, lineage, className, synopsis, keywords) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )");
ownerUserId, groupIdView, groupIdEdit, className, synopsis, keywords) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
$add->execute([$asset->getId, $asset->get("title"), $asset->get("url"), $asset->get("creationDate"),
$asset->get("revisionDate"), $asset->get("ownerUserId"), $asset->get("groupIdView"), $asset->get("groupIdEdit"),
$asset->get("lineage"), $asset->get("className"), $synopsis, $keywords]);
$asset->get("className"), $synopsis, $keywords]);
return $self;
}