lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixing MatchMode in dynamic queries

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2011-10-11 15:52:26 -07:00
parent 190bac9ba8
commit 77eedb8f0d
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -297,15 +297,15 @@ namespace Orchard.ContentManagement {
}
public void Like(string propertyName, string value, MatchMode matchMode, char? escapeChar) {
Criterion = Restrictions.Like(propertyName, value);
Criterion = Restrictions.Like(propertyName, value, ToMatchMode(matchMode), escapeChar);
}
public void Like(string propertyName, string value, MatchMode matchMode) {
Criterion = Restrictions.Like(propertyName, value);
Criterion = Restrictions.Like(propertyName, value, ToMatchMode(matchMode));
}
public void InsensitiveLike(string propertyName, string value, MatchMode matchMode) {
Criterion = Restrictions.InsensitiveLike(propertyName, value);
Criterion = Restrictions.InsensitiveLike(propertyName, value, ToMatchMode(matchMode));
}
public void InsensitiveLike(string propertyName, object value) {
@@ -386,23 +386,23 @@ namespace Orchard.ContentManagement {
public void And(Action<IExpressionFactory> lhs, Action<IExpressionFactory> rhs) {
lhs(this);
ICriterion a = Criterion;
var a = Criterion;
rhs(this);
ICriterion b = Criterion;
var b = Criterion;
Criterion = Restrictions.And(a, b);
}
public void Or(Action<IExpressionFactory> lhs, Action<IExpressionFactory> rhs) {
lhs(this);
ICriterion a = Criterion;
var a = Criterion;
rhs(this);
ICriterion b = Criterion;
var b = Criterion;
Criterion = Restrictions.Or(a, b);
}
public void Not(Action<IExpressionFactory> expression) {
expression(this);
ICriterion a = Criterion;
var a = Criterion;
Criterion = Restrictions.Not(a);
}
@@ -434,6 +434,20 @@ namespace Orchard.ContentManagement {
Criterion = Restrictions.NaturalId();
}
private static NHibernate.Criterion.MatchMode ToMatchMode(MatchMode matchMode) {
switch(matchMode) {
case MatchMode.Anywhere:
return NHibernate.Criterion.MatchMode.Anywhere;
case MatchMode.End:
return NHibernate.Criterion.MatchMode.End;
case MatchMode.Start:
return NHibernate.Criterion.MatchMode.Start;
case MatchMode.Exact:
return NHibernate.Criterion.MatchMode.Exact;
}
return NHibernate.Criterion.MatchMode.Anywhere;
}
}
public class DefaultSortFactory : ISortFactory {