Was.OrcSearch – Diff between revs 1 and 3

Subversion Repositories:

?pathlinks?

Rev 1 – Details – Blame – Last modification – View Log

+ï»¿using System;
-ï»¿using System.Collections.Generic;
+using System.Collections.Generic;
+using System.Linq;
-using Lucene.Net.Analysis.Standard;
+using Lucene.Net.Analysis;
 using Lucene.Net.Index;
 using Lucene.Net.QueryParsers;
 using Lucene.Net.Search;
 using Was.OrcSearch.Extensions;
 using Was.OrcSearch.Metadata;
 using Was.OrcSearch.Metadata.Interfaces;
 using Was.OrcSearch.Services.Interfaces;
+using Version = Lucene.Net.Util.Version;
 namespace Was.OrcSearch.Services
 {
-    public class SearchQueryService : ISearchQueryService
+    public class SearchQueryService : ISearchQueryService, IDisposable
+    {
+        private readonly Analyzer _analyzer;
+        private readonly Version _version = LuceneDefaults.Version;
+        /// <summary>
+        ///     Default constructor using a default whitespace analyzer.
+        /// </summary>
+        public SearchQueryService()
+        {
+            _analyzer = new WhitespaceAnalyzer();
+        }
+        /// <summary>
+        ///     Instantiate an analyzer using a specific Lucene version.
+        /// </summary>
+        /// <param name="analyzer">The analyzer to use.</param>
+        /// <param name="version">The lucene version.</param>
+        public SearchQueryService(Analyzer analyzer, Version version)
+        {
+            _version = version;
+        }
+        /// <summary>
+        ///     Instantiate a per-field analyzer.
+        /// </summary>
+        /// <param name="default">The default analyzer to use.</param>
+        /// <param name="fieldAnalyzers">A collection of fields to analyzers.</param>
+        public SearchQueryService(Analyzer @default, Dictionary<string, Analyzer> fieldAnalyzers)
+        {
+            _analyzer = new PerFieldAnalyzerWrapper(@default, fieldAnalyzers);
+        }
+        public void Dispose()
+        {
+            _analyzer?.Dispose();
+        }
         public string GetSearchQuery(string filter, IEnumerable<ISearchableMetadata> searchableMetadatas)
         {
-            if (!filter.Contains(":"))
-            {
-                filter = filter.PrepareOrcSearchFilter();
-                using (var analyzer = new StandardAnalyzer(LuceneDefaults.Version))
+            if (filter.Contains(":"))
-                {
-                    var fields = new List<string>();
-                    foreach (var searchableMetadata in searchableMetadatas) fields.Add(searchableMetadata.SearchName);
+                return filter;
-                    var parser = new MultiFieldQueryParser(LuceneDefaults.Version, fields.ToArray(), analyzer);
-                    var query = parser.Parse(filter);
-                    filter = query.ToString();
-                }
+            filter = filter.PrepareOrcSearchFilter();
+            return new MultiFieldQueryParser(
+                    _version,
-            }
+                    searchableMetadatas
+                        .Select(searchableMetadata => searchableMetadata.SearchName).ToArray(),
                     _analyzer)
-            return filter;
+                .Parse(filter).ToString();
+        }