From 0f2f4394777343ebc43238f64c18b9042823a9d7 Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 27 Apr 2016 12:58:43 +0200 Subject: [PATCH] Updates examine, fixes more tests, ensures the correct FieldDefinitions are set --- .../PublishedContent/PublishedMediaTests.cs | 50 +++++++++---- src/Umbraco.Tests/Umbraco.Tests.csproj | 2 +- .../UmbracoExamine/EventsTest.cs | 73 ++++++++----------- .../UmbracoExamine/IndexInitializer.cs | 10 +-- src/Umbraco.Tests/UmbracoExamine/IndexTest.cs | 33 +-------- .../UmbracoExamine/SearchTests.cs | 51 +++++++++---- src/Umbraco.Tests/packages.config | 2 +- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 2 +- src/Umbraco.Web.UI/packages.config | 2 +- .../XmlPublishedCache/PublishedMediaCache.cs | 9 ++- src/Umbraco.Web/Umbraco.Web.csproj | 2 +- src/Umbraco.Web/packages.config | 2 +- src/UmbracoExamine/BaseUmbracoIndexer.cs | 43 +++++------ src/UmbracoExamine/LegacyExtensions.cs | 2 +- src/UmbracoExamine/UmbracoExamine.csproj | 2 +- src/UmbracoExamine/UmbracoMemberIndexer.cs | 1 + src/UmbracoExamine/packages.config | 2 +- 17 files changed, 140 insertions(+), 148 deletions(-) diff --git a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs index 50fb1e9817..19a995bcbf 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs @@ -13,6 +13,7 @@ using Umbraco.Web; using Umbraco.Web.PublishedCache; using Umbraco.Web.PublishedCache.XmlPublishedCache; using System.Linq; +using Examine.Session; using LightInject; using Umbraco.Core.Logging; using Umbraco.Core.Strings; @@ -103,10 +104,13 @@ namespace Umbraco.Tests.PublishedContent public void Ensure_Children_Sorted_With_Examine() { using (var luceneDir = new RAMDirectory()) + using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, luceneDir)) + using (var session = new ThreadScopedIndexSession(indexer.SearcherContext)) { - var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, luceneDir); indexer.RebuildIndex(); - var searcher = IndexInitializer.GetUmbracoSearcher(luceneDir); + session.WaitForChanges(); + + var searcher = indexer.GetSearcher(); var ctx = GetUmbracoContext("/test", 1234); var cache = new ContextualPublishedMediaCache(new PublishedMediaCache(ctx.Application, searcher, indexer), ctx); @@ -132,10 +136,13 @@ namespace Umbraco.Tests.PublishedContent public void Do_Not_Find_In_Recycle_Bin() { using (var luceneDir = new RAMDirectory()) + using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, luceneDir)) + using (var session = new ThreadScopedIndexSession(indexer.SearcherContext)) { - var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, luceneDir); indexer.RebuildIndex(); - var searcher = IndexInitializer.GetUmbracoSearcher(luceneDir); + session.WaitForChanges(); + + var searcher = indexer.GetSearcher(); var ctx = GetUmbracoContext("/test", 1234); var cache = new ContextualPublishedMediaCache(new PublishedMediaCache(ctx.Application, searcher, indexer), ctx); @@ -172,10 +179,13 @@ namespace Umbraco.Tests.PublishedContent public void Children_With_Examine() { using (var luceneDir = new RAMDirectory()) + using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, luceneDir)) + using (var session = new ThreadScopedIndexSession(indexer.SearcherContext)) { - var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, luceneDir); indexer.RebuildIndex(); - var searcher = IndexInitializer.GetUmbracoSearcher(luceneDir); + session.WaitForChanges(); + + var searcher = indexer.GetSearcher(); var ctx = GetUmbracoContext("/test", 1234); var cache = new ContextualPublishedMediaCache(new PublishedMediaCache(ctx.Application, searcher, indexer), ctx); @@ -194,10 +204,13 @@ namespace Umbraco.Tests.PublishedContent public void Descendants_With_Examine() { using (var luceneDir = new RAMDirectory()) + using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, luceneDir)) + using (var session = new ThreadScopedIndexSession(indexer.SearcherContext)) { - var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, luceneDir); indexer.RebuildIndex(); - var searcher = IndexInitializer.GetUmbracoSearcher(luceneDir); + session.WaitForChanges(); + + var searcher = indexer.GetSearcher(); var ctx = GetUmbracoContext("/test", 1234); var cache = new ContextualPublishedMediaCache(new PublishedMediaCache(ctx.Application, searcher, indexer), ctx); @@ -216,10 +229,13 @@ namespace Umbraco.Tests.PublishedContent public void DescendantsOrSelf_With_Examine() { using (var luceneDir = new RAMDirectory()) + using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, luceneDir)) + using (var session = new ThreadScopedIndexSession(indexer.SearcherContext)) { - var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, luceneDir); indexer.RebuildIndex(); - var searcher = IndexInitializer.GetUmbracoSearcher(luceneDir); + session.WaitForChanges(); + + var searcher = indexer.GetSearcher(); var ctx = GetUmbracoContext("/test", 1234); var cache = new ContextualPublishedMediaCache(new PublishedMediaCache(ctx.Application, searcher, indexer), ctx); @@ -238,11 +254,14 @@ namespace Umbraco.Tests.PublishedContent public void Ancestors_With_Examine() { using (var luceneDir = new RAMDirectory()) + using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, luceneDir)) + using (var session = new ThreadScopedIndexSession(indexer.SearcherContext)) { - var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, luceneDir); indexer.RebuildIndex(); + session.WaitForChanges(); + var ctx = GetUmbracoContext("/test", 1234); - var searcher = IndexInitializer.GetUmbracoSearcher(luceneDir); + var searcher = indexer.GetSearcher(); var cache = new ContextualPublishedMediaCache(new PublishedMediaCache(ctx.Application, searcher, indexer), ctx); //we are using the media.xml media to test the examine results implementation, see the media.xml file in the ExamineHelpers namespace @@ -257,11 +276,14 @@ namespace Umbraco.Tests.PublishedContent public void AncestorsOrSelf_With_Examine() { using (var luceneDir = new RAMDirectory()) + using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, luceneDir)) + using (var session = new ThreadScopedIndexSession(indexer.SearcherContext)) { - var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, luceneDir); indexer.RebuildIndex(); + session.WaitForChanges(); + var ctx = GetUmbracoContext("/test", 1234); - var searcher = IndexInitializer.GetUmbracoSearcher(luceneDir); + var searcher = indexer.GetSearcher(); var cache = new ContextualPublishedMediaCache(new PublishedMediaCache(ctx.Application, searcher, indexer), ctx); //we are using the media.xml media to test the examine results implementation, see the media.xml file in the ExamineHelpers namespace diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index 21aefb9023..8a50f648f0 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -56,7 +56,7 @@ True - ..\packages\Examine.2.0.0-beta019\lib\net45\Examine.dll + ..\packages\Examine.2.0.0-beta021\lib\net45\Examine.dll True diff --git a/src/Umbraco.Tests/UmbracoExamine/EventsTest.cs b/src/Umbraco.Tests/UmbracoExamine/EventsTest.cs index e9e7d4a700..0552ecfffa 100644 --- a/src/Umbraco.Tests/UmbracoExamine/EventsTest.cs +++ b/src/Umbraco.Tests/UmbracoExamine/EventsTest.cs @@ -1,61 +1,52 @@ using System; using System.Linq; using Examine; +using Examine.Session; using Lucene.Net.Store; using NUnit.Framework; using UmbracoExamine; namespace Umbraco.Tests.UmbracoExamine { - [TestFixture] - public class EventsTest : ExamineBaseTest - { - [Test] - public void Events_Ignoring_Node() - { - //change the parent id so that they are all ignored - var existingCriteria = _indexer.IndexerData; - _indexer.IndexerData = new IndexCriteria(existingCriteria.StandardFields, existingCriteria.UserFields, existingCriteria.IncludeNodeTypes, existingCriteria.ExcludeNodeTypes, - 999); //change to 999 + [TestFixture] + public class EventsTest : ExamineBaseTest + { + [Test] + public void Events_Ignoring_Node() + { + using (var luceneDir = new RAMDirectory()) + using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, luceneDir, + //make parent id 999 so all are ignored + options: new UmbracoContentIndexerOptions(false, false, 999))) + using (var session = new ThreadScopedIndexSession(indexer.SearcherContext)) + { + var searcher = indexer.GetSearcher(); + + var isIgnored = false; - var isIgnored = false; + EventHandler ignoringNode = (s, e) => + { + isIgnored = true; + }; - EventHandler ignoringNode = (s, e) => - { - isIgnored = true; - }; + indexer.IgnoringNode += ignoringNode; - _indexer.IgnoringNode += ignoringNode; + var contentService = new ExamineDemoDataContentService(); + //get a node from the data repo + var node = contentService.GetPublishedContentByXPath("//*[string-length(@id)>0 and number(@id)>0]") + .Root + .Elements() + .First(); - //get a node from the data repo - var node = _contentService.GetPublishedContentByXPath("//*[string-length(@id)>0 and number(@id)>0]") - .Root - .Elements() - .First(); - - _indexer.ReIndexNode(node, IndexTypes.Content); + indexer.ReIndexNode(node, IndexTypes.Content); - Assert.IsTrue(isIgnored); + Assert.IsTrue(isIgnored); + } - } - private readonly ExamineDemoDataContentService _contentService = new ExamineDemoDataContentService(); - private static UmbracoContentIndexer _indexer; - private Lucene.Net.Store.Directory _luceneDir; - public override void TestSetup() - { - base.TestSetup(); - _luceneDir = new RAMDirectory(); - _indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, _luceneDir); - _indexer.RebuildIndex(); - } + } - public override void TestTearDown() - { - base.TestTearDown(); - _luceneDir.Dispose(); - } - } + } } \ No newline at end of file diff --git a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs index 05eacf6cc2..b6b321f316 100644 --- a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs +++ b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs @@ -158,15 +158,7 @@ namespace Umbraco.Tests.UmbracoExamine return i; } - public static UmbracoExamineSearcher GetUmbracoSearcher(Directory luceneDir, Analyzer analyzer = null) - { - if (analyzer == null) - { - analyzer = new StandardAnalyzer(Version.LUCENE_29); - } - return new UmbracoExamineSearcher(luceneDir, analyzer); - } - + public static LuceneSearcher GetLuceneSearcher(Directory luceneDir) { return new LuceneSearcher(luceneDir, new StandardAnalyzer(Version.LUCENE_29)); diff --git a/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs b/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs index 74a134e2f5..5167340491 100644 --- a/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs +++ b/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs @@ -255,36 +255,7 @@ namespace Umbraco.Tests.UmbracoExamine } } - #region Private methods and properties + private readonly ExamineDemoDataMediaService _mediaService = new ExamineDemoDataMediaService(); - private readonly ExamineDemoDataMediaService _mediaService = new ExamineDemoDataMediaService(); - - //private static UmbracoExamineSearcher _searcher; - //private static UmbracoContentIndexer _indexer; - - #endregion - - #region Initialize and Cleanup - - //private Lucene.Net.Store.Directory _luceneDir; - - public override void TestTearDown() - { - base.TestTearDown(); - //_luceneDir.Dispose(); - } - - public override void TestSetup() - { - base.TestSetup(); - //_luceneDir = new RAMDirectory(); - - // _indexer = IndexInitializer.GetUmbracoIndexer(_luceneDir); - //_indexer.RebuildIndex(); - //_searcher = IndexInitializer.GetUmbracoSearcher(_luceneDir); - } - - - #endregion - } + } } \ No newline at end of file diff --git a/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs b/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs index 558f027bd0..12047f2c5a 100644 --- a/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs +++ b/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs @@ -8,6 +8,11 @@ using Examine.LuceneEngine.Providers; using Lucene.Net.Store; using NUnit.Framework; using Examine.LuceneEngine.SearchCriteria; +using Examine.Session; +using Moq; +using Umbraco.Core.Models; +using Umbraco.Core.Persistence.DatabaseModelDefinitions; +using Umbraco.Core.Services; namespace Umbraco.Tests.UmbracoExamine { @@ -18,25 +23,43 @@ namespace Umbraco.Tests.UmbracoExamine [Test] public void Test_Sort_Order_Sorting() { - //var newIndexFolder = new DirectoryInfo(Path.Combine("App_Data\\SearchTests", Guid.NewGuid().ToString())); - //System.IO.Directory.CreateDirectory(newIndexFolder.FullName); + + long totalRecs; + var demoData = new ExamineDemoDataContentService(TestFiles.umbraco_sort); + var allRecs = demoData.GetLatestContentByXPath("//*[@isDoc]") + .Root + .Elements() + .Select(x => Mock.Of( + m => + m.Id == (int)x.Attribute("id") && + m.ParentId == (int)x.Attribute("parentID") && + m.Level == (int)x.Attribute("level") && + m.CreatorId == 0 && + m.SortOrder == (int)x.Attribute("sortOrder") && + m.CreateDate == (DateTime)x.Attribute("createDate") && + m.UpdateDate == (DateTime)x.Attribute("updateDate") && + m.Name == (string)x.Attribute("nodeName") && + m.Path == (string)x.Attribute("path") && + m.Properties == new PropertyCollection() && + m.ContentType == Mock.Of(mt => + mt.Icon == "test" && + mt.Alias == x.Name.LocalName && + mt.Id == (int)x.Attribute("nodeType")))) + .ToArray(); + var contentService = Mock.Of( + x => x.GetPagedDescendants( + It.IsAny(), It.IsAny(), It.IsAny(), out totalRecs, It.IsAny(), It.IsAny(), It.IsAny()) + == + allRecs); using (var luceneDir = new RAMDirectory()) - //using (var luceneDir = new SimpleFSDirectory(newIndexFolder)) + using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, luceneDir, contentService: contentService)) + using (var session = new ThreadScopedIndexSession(indexer.SearcherContext)) { - var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, luceneDir, null - //new TestDataService() - // { - // ContentService = new TestContentService(TestFiles.umbraco_sort) - // }); - ); - indexer.RebuildIndex(); - var searcher = IndexInitializer.GetUmbracoSearcher(luceneDir); + session.WaitForChanges(); - var s = (LuceneSearcher)searcher; - var luceneSearcher = s.GetSearcher(); - var i = (LuceneIndexer)indexer; + var searcher = indexer.GetSearcher(); var numberSortedCriteria = searcher.CreateSearchCriteria() .ParentId(1148).And() diff --git a/src/Umbraco.Tests/packages.config b/src/Umbraco.Tests/packages.config index 5901df76d5..88dbd6f6ac 100644 --- a/src/Umbraco.Tests/packages.config +++ b/src/Umbraco.Tests/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 450767bfef..409cc514cc 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -121,7 +121,7 @@ True - ..\packages\Examine.2.0.0-beta019\lib\net45\Examine.dll + ..\packages\Examine.2.0.0-beta021\lib\net45\Examine.dll True diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config index 4c7d260db2..78b0c1d4f1 100644 --- a/src/Umbraco.Web.UI/packages.config +++ b/src/Umbraco.Web.UI/packages.config @@ -3,7 +3,7 @@ - + diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs index be277a3185..98ecc18058 100644 --- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs @@ -6,6 +6,7 @@ using System.IO; using System.Linq; using System.Xml.XPath; using Examine; +using Examine.LuceneEngine.Providers; using Examine.LuceneEngine.SearchCriteria; using Examine.Providers; using Lucene.Net.Documents; @@ -45,7 +46,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache /// /// /// - internal PublishedMediaCache(ApplicationContext applicationContext, BaseSearchProvider searchProvider, BaseIndexProvider indexProvider) + internal PublishedMediaCache(ApplicationContext applicationContext, ILuceneSearcher searchProvider, BaseIndexProvider indexProvider) { if (applicationContext == null) throw new ArgumentNullException("applicationContext"); if (searchProvider == null) throw new ArgumentNullException("searchProvider"); @@ -62,7 +63,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache } private readonly ApplicationContext _applicationContext; - private readonly BaseSearchProvider _searchProvider; + private readonly ILuceneSearcher _searchProvider; private readonly BaseIndexProvider _indexProvider; public virtual IPublishedContent GetById(UmbracoContext umbracoContext, bool preview, int nodeId) @@ -146,7 +147,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache return null; } - private BaseSearchProvider GetSearchProviderSafe() + private ILuceneSearcher GetSearchProviderSafe() { if (_searchProvider != null) return _searchProvider; @@ -157,7 +158,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache try { //by default use the InternalSearcher - return eMgr.SearchProviderCollection["InternalSearcher"]; + return eMgr.GetSearcher("InternalSearcher"); } catch (FileNotFoundException) { diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 6d1bd1d2a2..77ab3ba929 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -114,7 +114,7 @@ ..\packages\dotless.1.4.1.0\lib\dotless.Core.dll - ..\packages\Examine.2.0.0-beta019\lib\net45\Examine.dll + ..\packages\Examine.2.0.0-beta021\lib\net45\Examine.dll True diff --git a/src/Umbraco.Web/packages.config b/src/Umbraco.Web/packages.config index b39d1537e9..0b93a154a4 100644 --- a/src/Umbraco.Web/packages.config +++ b/src/Umbraco.Web/packages.config @@ -3,7 +3,7 @@ - + diff --git a/src/UmbracoExamine/BaseUmbracoIndexer.cs b/src/UmbracoExamine/BaseUmbracoIndexer.cs index aeb5c9f06c..3f6d62ec15 100644 --- a/src/UmbracoExamine/BaseUmbracoIndexer.cs +++ b/src/UmbracoExamine/BaseUmbracoIndexer.cs @@ -72,6 +72,7 @@ namespace UmbracoExamine /// Alot of standard umbraco fields shouldn't be tokenized or even indexed, just stored into lucene /// for retreival after searching. /// + [Obsolete("IndexFieldPolicies is not really used apart for some legacy reasons - use FieldDefinition's instead")] internal static readonly List IndexFieldPolicies = new List { @@ -107,6 +108,22 @@ namespace UmbracoExamine var fd = base.InitializeFieldDefinitions(originalDefinitions).ToList(); fd.AddRange(new[] { + new FieldDefinition("parentID", FieldDefinitionTypes.Integer), + new FieldDefinition("level", FieldDefinitionTypes.Integer), + new FieldDefinition("writerID", FieldDefinitionTypes.Integer), + new FieldDefinition("creatorID", FieldDefinitionTypes.Integer), + new FieldDefinition("sortOrder", FieldDefinitionTypes.Integer), + + new FieldDefinition("createDate", FieldDefinitionTypes.DateTime), + new FieldDefinition("updateDate", FieldDefinitionTypes.DateTime), + + new FieldDefinition("key", FieldDefinitionTypes.Raw), + new FieldDefinition("version", FieldDefinitionTypes.Raw), + new FieldDefinition("nodeType", FieldDefinitionTypes.Raw), + new FieldDefinition("template", FieldDefinitionTypes.Raw), + new FieldDefinition("urlName", FieldDefinitionTypes.Raw), + new FieldDefinition("path", FieldDefinitionTypes.Raw), + new FieldDefinition(IndexPathFieldName, FieldDefinitionTypes.Raw), new FieldDefinition(NodeTypeAliasFieldName, FieldDefinitionTypes.Raw), new FieldDefinition(IconFieldName, FieldDefinitionTypes.Raw) @@ -509,31 +526,5 @@ namespace UmbracoExamine } - /// - /// Called when a duplicate field is detected in the dictionary that is getting indexed. - /// - /// - /// - /// - protected override void OnDuplicateFieldWarning(int nodeId, string indexSetName, string fieldName) - { - base.OnDuplicateFieldWarning(nodeId, indexSetName, fieldName); - - ProfilingLogger.Logger.Debug( - GetType(), - "Field \"{0}\" is listed multiple times in the index set \"{1}\". Please ensure all names are unique. Node id {2}", - () => fieldName, () => indexSetName, () => nodeId); - } - - /// - /// return the index policy for the field name passed in, if not found, return normal - /// - /// - /// - protected override FieldIndexTypes GetPolicy(string fieldName) - { - var def = IndexFieldPolicies.Where(x => x.Name == fieldName).ToArray(); - return (def.Any() == false ? FieldIndexTypes.ANALYZED : def.Single().IndexType); - } } } diff --git a/src/UmbracoExamine/LegacyExtensions.cs b/src/UmbracoExamine/LegacyExtensions.cs index 62c6949a24..8f228db8a5 100644 --- a/src/UmbracoExamine/LegacyExtensions.cs +++ b/src/UmbracoExamine/LegacyExtensions.cs @@ -30,7 +30,7 @@ namespace UmbracoExamine lock (Locker) { //we need to add all system fields to the collection if it is empty (this is the default if none are specified) - var sysFields = UmbracoContentIndexer.IndexFieldPolicies.Select(x => x.Name); + var sysFields = BaseUmbracoIndexer.IndexFieldPolicies.Select(x => x.Name); foreach (var s in sysFields) { set.IndexAttributeFields.Add(new IndexField() { Name = s }); diff --git a/src/UmbracoExamine/UmbracoExamine.csproj b/src/UmbracoExamine/UmbracoExamine.csproj index 764a3d2c6d..d231ee4d6c 100644 --- a/src/UmbracoExamine/UmbracoExamine.csproj +++ b/src/UmbracoExamine/UmbracoExamine.csproj @@ -83,7 +83,7 @@ - ..\packages\Examine.2.0.0-beta019\lib\net45\Examine.dll + ..\packages\Examine.2.0.0-beta021\lib\net45\Examine.dll True diff --git a/src/UmbracoExamine/UmbracoMemberIndexer.cs b/src/UmbracoExamine/UmbracoMemberIndexer.cs index f8f8a43959..40a91c5630 100644 --- a/src/UmbracoExamine/UmbracoMemberIndexer.cs +++ b/src/UmbracoExamine/UmbracoMemberIndexer.cs @@ -70,6 +70,7 @@ namespace UmbracoExamine /// /// /// + [Obsolete("IIndexCriteria is obsolete, this method is used only for configuration based indexes it is recommended to configure indexes on startup with code instead of config")] protected override IIndexCriteria GetIndexerData(IndexSet indexSet) { //TODO: This is only required for config based index delcaration - We need to change this! diff --git a/src/UmbracoExamine/packages.config b/src/UmbracoExamine/packages.config index 6431190dac..37c785fb96 100644 --- a/src/UmbracoExamine/packages.config +++ b/src/UmbracoExamine/packages.config @@ -1,6 +1,6 @@  - +