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

Allwing the content manager to get an optional set of predicates

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2011-11-10 17:53:15 -08:00
parent 971c685efb
commit 302226f10b
2 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/Orchard/ContentManagement/DefaultContentQuery.cs
View File

@@ -75,21 +75,36 @@ namespace Orchard.ContentManagement {
BindPartCriteria<TRecord>();
}
private void Where<TRecord>(Expression<Func<TRecord, bool>> predicate) where TRecord : ContentPartRecord {
// build a linq to nhibernate expression
var options = new QueryOptions();
var queryProvider = new NHibernateQueryProvider(BindSession(), options);
var queryable = new Query<TRecord>(queryProvider, options).Where(predicate);
// translate it into the nhibernate ICriteria implementation
var criteria = (CriteriaImpl)queryProvider.TranslateExpression(queryable.Expression);
private void Where<TRecord>(Expression<Func<TRecord, bool>> predicate, params Expression<Func<TRecord, bool>>[] orPredicates) where TRecord : ContentPartRecord {
// attach the criterion from the predicate to this query's criteria for the record
var recordCriteria = BindPartCriteria<TRecord>();
var predicates = Enumerable
.Empty<Expression<Func<TRecord, bool>>>()
.Union(new []{predicate})
.Union(orPredicates);
var disjunction = Restrictions.Disjunction();
foreach (var p in predicates) {
// build a linq to nhibernate expression
var options = new QueryOptions();
var queryProvider = new NHibernateQueryProvider(BindSession(), options);
var queryable = new Query<TRecord>(queryProvider, options).Where(p);
var conjunction = Restrictions.Conjunction();
// translate it into the nhibernate ICriteria implementation
var criteria = (CriteriaImpl) queryProvider.TranslateExpression(queryable.Expression);
foreach (var expressionEntry in criteria.IterateExpressionEntries()) {
recordCriteria.Add(expressionEntry.Criterion);
conjunction.Add(expressionEntry.Criterion);
}
disjunction.Add(conjunction);
}
recordCriteria.Add(disjunction);
}
private void Where(Action<IExpressionFactory> expression) {
@@ -220,8 +235,8 @@ namespace Orchard.ContentManagement {
return new ContentQuery<T>(_query);
}
IContentQuery<T, TRecord> IContentQuery<T>.Where<TRecord>(Expression<Func<TRecord, bool>> predicate) {
_query.Where(predicate);
IContentQuery<T, TRecord> IContentQuery<T>.Where<TRecord>(Expression<Func<TRecord, bool>> predicate, params Expression<Func<TRecord, bool>>[] orPredicates) {
_query.Where(predicate, orPredicates);
return new ContentQuery<T, TRecord>(_query);
}
@@ -253,8 +268,8 @@ namespace Orchard.ContentManagement {
return this;
}
IContentQuery<T, TR> IContentQuery<T, TR>.Where(Expression<Func<TR, bool>> predicate) {
_query.Where(predicate);
IContentQuery<T, TR> IContentQuery<T, TR>.Where(Expression<Func<TR, bool>> predicate, params Expression<Func<TR, bool>>[] orPredicates) {
_query.Where(predicate, orPredicates);
return this;
}

4
src/Orchard/ContentManagement/IContentQuery.cs
View File

@@ -21,7 +21,7 @@ namespace Orchard.ContentManagement {
IContentQuery<TPart, TRecord> Join<TRecord>() where TRecord : ContentPartRecord;
IContentQuery<TPart> Where(Action<IExpressionFactory> predicate);
IContentQuery<TPart, TRecord> Where<TRecord>(Expression<Func<TRecord, bool>> predicate) where TRecord : ContentPartRecord;
IContentQuery<TPart, TRecord> Where<TRecord>(Expression<Func<TRecord, bool>> predicate, params Expression<Func<TRecord, bool>>[] orPredicates) where TRecord : ContentPartRecord;
IContentQuery<TPart> OrderBy(Action<ISortFactory> order);
IContentQuery<TPart, TRecord> OrderBy<TRecord, TKey>(Expression<Func<TRecord, TKey>> keySelector) where TRecord : ContentPartRecord;
@@ -31,7 +31,7 @@ namespace Orchard.ContentManagement {
public interface IContentQuery<TPart, TRecord> : IContentQuery<TPart> where TPart : IContent where TRecord : ContentPartRecord {
new IContentQuery<TPart, TRecord> ForVersion(VersionOptions options);
IContentQuery<TPart, TRecord> Where(Expression<Func<TRecord, bool>> predicate);
IContentQuery<TPart, TRecord> Where(Expression<Func<TRecord, bool>> predicate, params Expression<Func<TRecord, bool>>[] orPredicates);
IContentQuery<TPart, TRecord> OrderBy<TKey>(Expression<Func<TRecord, TKey>> keySelector);
IContentQuery<TPart, TRecord> OrderByDescending<TKey>(Expression<Func<TRecord, TKey>> keySelector);
}