Fixes around boosting with multiple binary expressions in brackets

base33 · Feb 9, 2016 · 525524d · 525524d
1 parent 8da9e49
commit 525524d
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 5 deletions.
diff --git a/Blog/bin/Blog.dll b/Blog/bin/Blog.dll
diff --git a/Blog/bin/Blog.pdb b/Blog/bin/Blog.pdb
diff --git a/Blog/bin/Umbraco.Examine.Linq.dll b/Blog/bin/Umbraco.Examine.Linq.dll
diff --git a/Blog/bin/Umbraco.Examine.Linq.pdb b/Blog/bin/Umbraco.Examine.Linq.pdb
diff --git a/Blog/obj/Debug/Blog.csprojResolveAssemblyReference.cache b/Blog/obj/Debug/Blog.csprojResolveAssemblyReference.cache
diff --git a/Blog/obj/Debug/Blog.dll b/Blog/obj/Debug/Blog.dll
diff --git a/Blog/obj/Debug/Blog.pdb b/Blog/obj/Debug/Blog.pdb
diff --git a/LINQToExamine.1.3.nupkg b/LINQToExamine.1.3.nupkg
diff --git a/LINQToExamine.1.4.nupkg b/LINQToExamine.1.4.nupkg
diff --git a/LINQToExamine.nuspec b/LINQToExamine.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>LINQToExamine</id>
     <title>Linq To Examine for Umbraco</title>
-    <version>1.2</version>
+    <version>1.4</version>
     <authors>Craig Noble</authors>
     <description>This project allows you to query the Lucene indexes using LINQ based on your own classes.</description>
     <language>en-US</language>

diff --git a/Umbraco.Examine.Linq.Sandbox/App_Data/Umbraco.sdf b/Umbraco.Examine.Linq.Sandbox/App_Data/Umbraco.sdf
diff --git a/Umbraco.Examine.Linq.Sandbox/Views/BlogOverview.cshtml b/Umbraco.Examine.Linq.Sandbox/Views/BlogOverview.cshtml
@@ -7,17 +7,48 @@
 @{
     Layout = "Master.cshtml";
 
+    var searcher = new Searcher();
+
     var CurrentPage = (Umbraco.Core.Models.IPublishedContent)base.CurrentPage;
 
-    var results = new Umbraco.Examine.Linq.Index<Umbraco.Examine.Linq.Sandbox.Models.Content.BlogPost>(new Umbraco.Examine.Linq.Sandbox.Mapper.ConcreteMapper<Umbraco.Examine.Linq.Sandbox.Models.Content.BlogPost>())
-                    .Where(c => c.CreateDate < DateTime.Now);
+    var results = new Umbraco.Examine.Linq.Index<Umbraco.Examine.Linq.Sandbox.Models.Content.BlogPost>(searcher, new Umbraco.Examine.Linq.Sandbox.Mapper.ConcreteMapper<Umbraco.Examine.Linq.Sandbox.Models.Content.BlogPost>())
+                    .Where(c => c.Name.Contains("tall").Fuzzy(0.5) || c.Name.Contains("f*").Boost(10));
+    results = results.Where(c => c.CreateDate > DateTime.Now.AddYears(-2) && c.CreateDate < DateTime.Now);
+
+    results = results.ToList().AsQueryable();
+
+
+}
+
+@functions {
+    public class Searcher : Umbraco.Examine.Linq.ISearcher
+    {
+        public string Query { get; set; }
+
+        public IEnumerable<Examine.SearchResult> Search(string query)
+        {
+            Query = query;
+            try
+            {
+                return new Umbraco.Examine.Linq.SearchProviders.LuceneSearch("ExternalSearcher").Search(query);
+                }
+            catch (Exception)
+            {
+                Query = "invalid : " + query;
+            }
+
+            return new List<Examine.SearchResult>();
+        }
+    }
 }
 
 <div role="content">
 
 	<section class="light blogarchive equalizer">
 		<div class="container">
-
+            <div class="row">
+                <p>@searcher.Query</p>
+            </div>
 			<div class="row">
 				@*foreach (var post in new UmbracoNS.Examine.Linq.Sandbox.Repositories.BlogRepository().GetAllBlogPosts())*@
                 @foreach (var post in results)

diff --git a/Umbraco.Examine.Linq/ExpressionTreeVisitor.cs b/Umbraco.Examine.Linq/ExpressionTreeVisitor.cs
@@ -359,7 +359,8 @@ protected override Expression VisitMethodCallExpression(MethodCallExpression exp
                     bracketsEnabled = false;
                     VisitExpression(expression.Arguments[0]);
                     VisitExpression(expression.Object);
-                    //addEndBracket();
+                    if((expression.Arguments[0] is BinaryExpression) && expression.Arguments[0].GetType().FullName != "System.Linq.Expressions.LogicalBinaryExpression")
+                        addEndBracket();
                     currentPart.AppendFormat("^{0}", expression.Arguments[1]);
                     bracketsEnabled = false;
                     break;
@@ -369,6 +370,8 @@ protected override Expression VisitMethodCallExpression(MethodCallExpression exp
                     if (expression.Arguments.Any())
                         VisitExpression(expression.Arguments[0]);
                     VisitExpression(expression.Object);
+                    if (expression.Arguments[0] is BinaryExpression)
+                        addEndBracket();
                     fuzzy = 0;
                     bracketsEnabled = false;
                     break;