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

Search indexer appends asset keywords directly to content. Should

Browse source 
be separated by spaces.
Refactor out common code in create and addKeywords.
Use greedy regexps and drop one s///.
This commit is contained in:
Colin Kuskie 2009-07-24 18:11:20 +00:00
parent 4226ef211f
commit 1a4befc540
2 changed files with 34 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -83,13 +83,7 @@ sub addKeywords {
my $text = join(" ", @_);
$text = WebGUI::HTML::filter($text, "all");
#-------------------- added by zxp for chinese word segment
my @segs = split /([A-z|\d]+|\S)/, $text;
$text = join " ",@segs;
$text =~ s/\s{2,}/ /g;
$text =~ s/(^\s|\s$)//g;
$text =~ s/\s/\'\'/g;
#-------------------- added by zxp end
$text = $self->_filterKeywords($text);
my ($keywords) = $self->session->db->quickArray("select keywords from assetIndex where assetId=?",[$self->getId]);
$self->session->db->write("update assetIndex set keywords =? where assetId=?", [$keywords.' '.$text, $self->getId]);
}
@ -122,24 +116,16 @@ sub create {
my $asset = shift;
my $self = $class->new($asset);
$self->delete;
my $url = $asset->get("url");
$url =~ s/\/|\-|\_/ /g;
my $description = WebGUI::HTML::filter($asset->get('description'), "all");
my $keywords = join(" ",$asset->get("title"), $asset->get("menuTitle"), $asset->get("synopsis"), $url,
$description);
$keywords .= WebGUI::Keyword->new($self->session)->getKeywordsForAsset({asset=>$asset});
$keywords = WebGUI::HTML::filter($keywords, "all");
$description, WebGUI::Keyword->new($self->session)->getKeywordsForAsset({asset=>$asset}));
$keywords = $self->_filterKeywords($keywords);
my $synopsis = $asset->get("synopsis") || substr($description,0,255) || substr($keywords,0,255);
#-------------------- added by zxp for chinese word segment
utf8::decode($keywords);
my @segs = split /([A-z|\d]+|\S)/, $keywords;
$keywords = join " ",@segs;
$keywords =~ s/\s{2,}/ /g;
$keywords =~ s/(^\s|\s$)//g;
$keywords =~ s/\s/\'\'/g;
#-------------------- 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 (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )");
$add->execute([$asset->getId, $asset->get("title"), $asset->get("url"), $asset->get("creationDate"),
@ -178,6 +164,33 @@ sub DESTROY {
#-------------------------------------------------------------------
=head2 _filterKeywords ( $keywords )
Perform filtering and cleaning up of the keywords before submitting them.
=head3 $keywords
A string containing keywords.
=cut
sub _filterKeywords {
my $self = shift;
my $keywords = shift;
$keywords = WebGUI::HTML::filter($keywords, "all");
#-------------------- added by zxp for chinese word segment
utf8::decode($keywords);
my @segs = split /([A-z|\d]+|\S)/, $keywords;
my $newKeywords = join " ",@segs;
$newKeywords =~ s/(^\s+|\s+$)//g;
$newKeywords =~ s/\s+/\'\'/g;
#-------------------- added by zxp end
return $newKeywords;
}
#-------------------------------------------------------------------
=head2 getId ( )
Returns the ID used to create this object.