lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 02:44:52 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2011-01-11 17:51:13 -08:00
parent 94563832d9 3305fd81b6
commit 671fc84349
2 changed files with 54 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -341,5 +341,32 @@ namespace Orchard.Tests.Modules.Indexing {
Assert.That(_searchBuilder.WithField("tag-value", "tag").Count(), Is.EqualTo(1));
}
[Test]
public void ShouldReturnAllDocuments() {
_provider.CreateIndex("default");
for(var i = 1; i<100;i++) {
_provider.Store("default", _provider.New(i).Add("term-id", i).Store());
}
Assert.That(_searchBuilder.Count(), Is.EqualTo(99));
}
[Test]
public void NoClauseButAFilter() {
_provider.CreateIndex("default");
for (var i = 1; i < 50; i++) {
_provider.Store("default", _provider.New(i).Add("term-id", i / 10).Store());
}
Assert.That(_searchBuilder.Count(), Is.EqualTo(49));
Assert.That(_searchBuilder.WithField("term-id", 0).ExactMatch().AsFilter().Count(), Is.EqualTo(9));
Assert.That(_searchBuilder.WithField("term-id", 1).ExactMatch().AsFilter().Count(), Is.EqualTo(10));
Assert.That(_searchBuilder.WithField("term-id", 2).ExactMatch().AsFilter().Count(), Is.EqualTo(10));
Assert.That(_searchBuilder.WithField("term-id", 3).ExactMatch().AsFilter().Count(), Is.EqualTo(10));
Assert.That(_searchBuilder.WithField("term-id", 4).ExactMatch().AsFilter().Count(), Is.EqualTo(10));
}
}
}

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

@@ -217,29 +217,37 @@ namespace Lucene.Services {
private Query CreateQuery() {
CreatePendingClause();
var query = new BooleanQuery();
var booleanQuery = new BooleanQuery();
Query resultQuery = booleanQuery;
foreach( var clause in _clauses)
query.Add(clause);
if (_clauses.Count == 0) {
if (_filters.Count > 0) { // only filters applieds => transform to a boolean query
foreach (var clause in _filters) {
booleanQuery.Add(clause);
}
if ( query.Clauses().Count == 0 ) { // get all documents ?
query.Add(new TermRangeQuery("id", "0", "9", true, true), BooleanClause.Occur.SHOULD);
resultQuery = booleanQuery;
}
else { // search all documents, without filter or clause
resultQuery = new MatchAllDocsQuery(null);
}
}
else {
foreach (var clause in _clauses)
booleanQuery.Add(clause);
if (_filters.Count > 0) {
var filter = new BooleanQuery();
foreach (var clause in _filters)
filter.Add(clause);
var queryFilter = new QueryWrapperFilter(filter);
resultQuery = new FilteredQuery(booleanQuery, queryFilter);
}
}
Query finalQuery = query;
if(_filters.Count > 0) {
var filter = new BooleanQuery();
foreach( var clause in _filters)
filter.Add(clause);
var queryFilter = new QueryWrapperFilter(filter);
finalQuery = new FilteredQuery(query, queryFilter);
}
Logger.Debug("New search query: {0}", finalQuery.ToString());
return finalQuery;
Logger.Debug("New search query: {0}", resultQuery.ToString());
return resultQuery;
}
public IEnumerable<ISearchHit> Search() {