Improved search with "and", partial match U4-2509

Myster · Myster · commit a64efb93b3f8 · 2013-09-12T14:30:42.000+12:00
- added partial matching on each word.
- fixed bug so 'all' words match rather than 'any' words.
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx.cs
@@ -59,7 +59,11 @@ public void ProcessRequest(HttpContext context)
             }
             else
             {
-				var operation = criteria.GroupedAnd(new[] { "__nodeName" }, txt.Split(' '));
+				var words = txt.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries).Select(w => w.ToLower().MultipleCharacterWildcard()).ToList();
+				var operation = criteria.GroupedOr(new[] { "__nodeName" }, new[] { words[0] });
+				words.RemoveAt(0);
+				foreach (var word in words)
+					operation = operation.And().GroupedOr(new[] { "__nodeName" }, new[] { word });
 
                 // ensure the user can only find nodes they are allowed to see
                 if (UmbracoContext.Current.UmbracoUser.StartNodeId > 0)

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,11 @@ public void ProcessRequest(HttpContext context)`
`59`	`59`	`}`
`60`	`60`	`else`
`61`	`61`	`{`
`62`		`- var operation = criteria.GroupedAnd(new[] { "__nodeName" }, txt.Split(' '));`
	`62`	`+ var words = txt.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries).Select(w => w.ToLower().MultipleCharacterWildcard()).ToList();`
	`63`	`+ var operation = criteria.GroupedOr(new[] { "__nodeName" }, new[] { words[0] });`
	`64`	`+ words.RemoveAt(0);`
	`65`	`+ foreach (var word in words)`
	`66`	`+ operation = operation.And().GroupedOr(new[] { "__nodeName" }, new[] { word });`
`63`	`67`
`64`	`68`	`// ensure the user can only find nodes they are allowed to see`
`65`	`69`	`if (UmbracoContext.Current.UmbracoUser.StartNodeId > 0)`