lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-22 03:37:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixing search unit tests

Browse Source 
--HG--
branch : dev
This commit is contained in:
Sebastien Ros
2011-01-31 17:30:45 -08:00
parent 82cf888a42
commit cb1f86da7a
4 changed files with 63 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@ namespace Lucene.Services {
private int _count;
private int _skip;
private string _sort;
private int _comparer;
private bool _sortDescending;
private bool _asFilter;
@@ -43,6 +44,7 @@ namespace Lucene.Services {
_clauses = new List<BooleanClause>();
_filters = new List<BooleanClause>();
_sort = String.Empty;
_comparer = 0;
_sortDescending = true;
InitPendingClause();
@@ -107,13 +109,13 @@ namespace Lucene.Services {
public ISearchBuilder WithField(string field, DateTime value) {
CreatePendingClause();
_query = new TermQuery(new Term(field, DateTools.DateToString(value, DateTools.Resolution.SECOND)));
_query = new TermQuery(new Term(field, DateTools.DateToString(value, DateTools.Resolution.MILLISECOND)));
return this;
}
public ISearchBuilder WithinRange(string field, DateTime min, DateTime max) {
CreatePendingClause();
_query = new TermRangeQuery(field, DateTools.DateToString(min, DateTools.Resolution.SECOND), DateTools.DateToString(max, DateTools.Resolution.SECOND), true, true);
_query = new TermRangeQuery(field, DateTools.DateToString(min, DateTools.Resolution.MILLISECOND), DateTools.DateToString(max, DateTools.Resolution.MILLISECOND), true, true);
return this;
}
@@ -159,6 +161,8 @@ namespace Lucene.Services {
_query = null;
_boost = 0;
_asFilter = false;
_sort = String.Empty;
_comparer = 0;
}
private void CreatePendingClause() {
@@ -184,12 +188,40 @@ namespace Lucene.Services {
}
}
public ISearchBuilder SortBy(string name) {
public ISearchBuilder SortBy(string name)
{
_sort = name;
_comparer = 0;
return this;
}
public ISearchBuilder Ascending() {
public ISearchBuilder SortByInteger(string name) {
_sort = name;
_comparer = SortField.INT;
return this;
}
public ISearchBuilder SortByString(string name) {
_sort = name;
_comparer = SortField.STRING;
return this;
}
public ISearchBuilder SortByFloat(string name) {
_sort = name;
_comparer = SortField.FLOAT;
return this;
}
public ISearchBuilder SortByDateTime(string name)
{
_sort = name;
_comparer = SortField.LONG;
return this;
}
public ISearchBuilder Ascending()
{
_sortDescending = false;
return this;
}
@@ -267,7 +299,7 @@ namespace Lucene.Services {
try {
var sort = String.IsNullOrEmpty(_sort)
? Sort.RELEVANCE
: new Sort(new SortField(_sort, CultureInfo.InvariantCulture, _sortDescending));
: new Sort(new SortField(_sort, _comparer, _sortDescending));
var collector = TopFieldCollector.create(
sort,
_count + _skip,