lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-23 21:13:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixing ContentItem.ContentType indexing so it can be queried by search

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2011-03-28 22:13:25 -07:00
parent d0af08fce9
commit f2586d06d2
5 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Orchard.Tests.Modules/Indexing/LuceneSearchBuilderTests.cs
View File

@@ -375,6 +375,42 @@ namespace Orchard.Tests.Modules.Indexing {
Assert.That(_searchBuilder.WithField("tag-value", "tag").Count(), Is.EqualTo(1));
}
[Test]
public void AnalyzedFieldsAreNotCaseSensitive() {
_provider.CreateIndex("default");
var documentIndex = _provider.New(1)
.Add("tag-id", 1)
.Add("tag-value", "Tag1").Analyze();
_provider.Store("default", documentIndex);
// trying in prefix mode
Assert.That(_searchBuilder.WithField("tag-value", "tag").Count(), Is.EqualTo(1));
Assert.That(_searchBuilder.WithField("tag-value", "Tag").Count(), Is.EqualTo(1));
// trying in full word match mode
Assert.That(_searchBuilder.WithField("tag-value", "tag1").ExactMatch().Count(), Is.EqualTo(1));
Assert.That(_searchBuilder.WithField("tag-value", "Tag1").ExactMatch().Count(), Is.EqualTo(1));
}
[Test]
public void NotAnalyzedFieldsAreSearchable() {
_provider.CreateIndex("default");
var documentIndex = _provider.New(1)
.Add("tag-id", 1)
.Add("tag-valueL", "tag1")
.Add("tag-valueU", "Tag1");
_provider.Store("default", documentIndex);
// a value which is not analyzed, is not lowered cased in the index
Assert.That(_searchBuilder.WithField("tag-valueL", "tag").Count(), Is.EqualTo(1));
Assert.That(_searchBuilder.WithField("tag-valueU", "tag").Count(), Is.EqualTo(0));
Assert.That(_searchBuilder.WithField("tag-valueL", "Tag").Count(), Is.EqualTo(1)); // queried term is lower cased
Assert.That(_searchBuilder.WithField("tag-valueU", "Tag").Count(), Is.EqualTo(0)); // queried term is lower cased
Assert.That(_searchBuilder.WithField("tag-valueL", "tag1").ExactMatch().Count(), Is.EqualTo(1));
Assert.That(_searchBuilder.WithField("tag-valueU", "tag1").ExactMatch().Count(), Is.EqualTo(0));
}
[Test]
public void ShouldReturnAllDocuments() {

4
src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs
View File

@@ -49,8 +49,8 @@ namespace Orchard.Core.Common.Handlers {
OnPublishing<ContentPart<CommonPartVersionRecord>>(AssignPublishingDates);
OnIndexing<CommonPart>((context, commonPart) => context.DocumentIndex
.Add("type", commonPart.ContentItem.ContentType).Store()
.Add("author", commonPart.Owner.UserName).Store()
.Add("type", commonPart.ContentItem.ContentType).Analyze().Store()
.Add("author", commonPart.Owner.UserName).Analyze().Store()
.Add("created", commonPart.CreatedUtc ?? _clock.UtcNow).Store()
.Add("published", commonPart.PublishedUtc ?? _clock.UtcNow).Store()
.Add("modified", commonPart.ModifiedUtc ?? _clock.UtcNow).Store()

8
src/Orchard.Web/Modules/Lucene/Services/LuceneSearchBuilder.cs
View File

@@ -103,7 +103,7 @@ namespace Lucene.Services {
public ISearchBuilder WithField(string field, bool value) {
CreatePendingClause();
_query = new TermQuery(new Term(field, value.ToString()));
_query = new TermQuery(new Term(field, value.ToString().ToLower()));
return this;
}
@@ -121,7 +121,7 @@ namespace Lucene.Services {
public ISearchBuilder WithinRange(string field, string min, string max) {
CreatePendingClause();
_query = new TermRangeQuery(field, QueryParser.Escape(min.ToLower()), QueryParser.Escape(min.ToLower()), true, true);
_query = new TermRangeQuery(field, QueryParser.Escape(min.ToLower()), QueryParser.Escape(max.ToLower()), true, true);
return this;
}
@@ -177,7 +177,9 @@ namespace Lucene.Services {
if(!_exactMatch) {
var termQuery = _query as TermQuery;
if(termQuery != null) {
_query = new PrefixQuery(termQuery.GetTerm());
var term = termQuery.GetTerm();
// prefixed queries are case sensitive
_query = new PrefixQuery(term);
}
}
if ( _asFilter ) {

8
src/Orchard.Web/Modules/Orchard.Tags/Handlers/TagsPartHandler.cs
View File

@@ -13,8 +13,12 @@ namespace Orchard.Tags.Handlers {
OnRemoved<TagsPart>((context, tags) =>
tagService.RemoveTagsForContentItem(context.ContentItem));
OnIndexing<TagsPart>((context, tagsPart) =>
context.DocumentIndex.Add("tags", String.Join(", ", tagsPart.CurrentTags.Select(t => t.TagName))).Analyze());
OnIndexing<TagsPart>(
(context, tagsPart) => {
foreach (var tag in tagsPart.CurrentTags) {
context.DocumentIndex.Add("tags", tag.TagName).Analyze();
}
});
}
}
}

2
src/Orchard.Web/Orchard.Web.csproj
View File

@@ -201,7 +201,7 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<UseIIS>False</UseIIS>
<UseIIS>True</UseIIS>
<AutoAssignPort>False</AutoAssignPort>
<DevelopmentServerPort>30320</DevelopmentServerPort>
<DevelopmentServerVPath>/OrchardLocal</DevelopmentServerVPath>