Merge pull request umbraco#135 from Myster/master

Shazwazza · Shazwazza · commit a353f6fb745f · 2013-09-11T19:33:47.000-07:00
Fix multiple words in search U4-2509
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Search/QuickSearchHandler.ashx.cs
@@ -60,7 +60,11 @@ public void ProcessRequest(HttpContext context)
             }
             else
             {
-                var operation = criteria.Field("__nodeName", txt.MultipleCharacterWildcard());
+				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
`@@ -60,7 +60,11 @@ public void ProcessRequest(HttpContext context)`
`60`	`60`	`}`
`61`	`61`	`else`
`62`	`62`	`{`
`63`		`- var operation = criteria.Field("__nodeName", txt.MultipleCharacterWildcard());`
	`63`	`+ var words = txt.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries).Select(w => w.ToLower().MultipleCharacterWildcard()).ToList();`
	`64`	`+ var operation = criteria.GroupedOr(new[] { "__nodeName" }, new[] { words[0] });`
	`65`	`+ words.RemoveAt(0);`
	`66`	`+ foreach (var word in words)`
	`67`	`+ operation = operation.And().GroupedOr(new[] { "__nodeName" }, new[] { word });`
`64`	`68`
`65`	`69`	`// ensure the user can only find nodes they are allowed to see`
`66`	`70`	`if (UmbracoContext.Current.UmbracoUser.StartNodeId > 0)`