yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'temp8' into temp8-3675-variant-tags

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
This commit is contained in:
Shannon
2018-12-10 14:07:20 +11:00
parent db1a535af4 bcd908e47d
commit 5d028eea04
39 changed files with 139 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Web/Search/UmbracoIndexesCreator.cs
View File

@@ -57,10 +57,10 @@ namespace Umbraco.Web.Search
private IIndex CreateInternalIndex()
{
var index = new UmbracoContentIndexer(
var index = new UmbracoContentIndex(
Constants.UmbracoIndexes.InternalIndexName,
//fixme - how to deal with languages like in UmbracoContentIndexer.CreateFieldValueTypes
UmbracoExamineIndexer.UmbracoIndexFieldDefinitions,
UmbracoExamineIndex.UmbracoIndexFieldDefinitions,
GetFileSystemLuceneDirectory(Constants.UmbracoIndexes.InternalIndexPath),
new CultureInvariantWhitespaceAnalyzer(),
ProfilingLogger,
@@ -71,10 +71,10 @@ namespace Umbraco.Web.Search
private IIndex CreateExternalIndex()
{
var index = new UmbracoContentIndexer(
var index = new UmbracoContentIndex(
Constants.UmbracoIndexes.ExternalIndexName,
//fixme - how to deal with languages like in UmbracoContentIndexer.CreateFieldValueTypes
UmbracoExamineIndexer.UmbracoIndexFieldDefinitions,
UmbracoExamineIndex.UmbracoIndexFieldDefinitions,
GetFileSystemLuceneDirectory(Constants.UmbracoIndexes.ExternalIndexPath),
new StandardAnalyzer(Lucene.Net.Util.Version.LUCENE_30),
ProfilingLogger,
@@ -85,10 +85,10 @@ namespace Umbraco.Web.Search
private IIndex CreateMemberIndex()
{
var index = new UmbracoMemberIndexer(
var index = new UmbracoMemberIndex(
Constants.UmbracoIndexes.MembersIndexName,
//fixme - how to deal with languages like in UmbracoContentIndexer.CreateFieldValueTypes
UmbracoExamineIndexer.UmbracoIndexFieldDefinitions,
UmbracoExamineIndex.UmbracoIndexFieldDefinitions,
GetFileSystemLuceneDirectory(Constants.UmbracoIndexes.MembersIndexPath),
new CultureInvariantWhitespaceAnalyzer(),
ProfilingLogger,