lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-21 03:14:10 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Incremental work on multiple indexes

Browse Source 
--HG--
branch : 1.x
extra : rebase_source : 39da1f112307ff02bf7a01ecabc95a43271d476c
This commit is contained in:
Sebastien Ros
2013-03-05 11:13:33 -08:00
parent 2015448c44
commit 08972b8cbb
31 changed files with 324 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexService.cs
View File

@@ -68,7 +68,7 @@ namespace Orchard.Indexing.Services
handler.UpdateIndex(indexName);
}
Services.Notifier.Information(T("The search index has been updated."));
Services.Notifier.Information(T("The index {0} has been updated.", indexName));
}
IndexEntry IIndexingService.GetIndexEntry(string indexName) {

26
src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs
View File

@@ -166,6 +166,13 @@ namespace Orchard.Indexing.Services {
foreach (var item in contentItems) {
try {
// skip items from types which are not indexed
var settings = GetTypeIndexingSettings(item);
if (!settings.Indexes.Contains(indexName)) {
continue;
}
IDocumentIndex documentIndex = ExtractDocumentIndex(item);
if (documentIndex != null && documentIndex.IsDirty) {
@@ -195,8 +202,17 @@ namespace Orchard.Indexing.Services {
foreach (var item in indexingTasks) {
try {
IDocumentIndex documentIndex = null;
// item.ContentItem can be null if the content item has been deleted
IDocumentIndex documentIndex = ExtractDocumentIndex(item.ContentItem);
if (item.ContentItem != null) {
// skip items from types which are not indexed
var settings = GetTypeIndexingSettings(item.ContentItem);
if (!settings.Indexes.Contains(indexName)) {
documentIndex = ExtractDocumentIndex(item.ContentItem);
}
}
if (documentIndex == null || item.Delete) {
deleteFromIndex.Add(item.Id);
@@ -284,12 +300,6 @@ namespace Orchard.Indexing.Services {
return null;
}
// skip items from types which are not indexed
var settings = GetTypeIndexingSettings(contentItem);
if (!settings.Included) {
return null;
}
var documentIndex = _indexProvider.New(contentItem.Id);
// call all handlers to add content to index
@@ -301,7 +311,7 @@ namespace Orchard.Indexing.Services {
if (contentItem == null ||
contentItem.TypeDefinition == null ||
contentItem.TypeDefinition.Settings == null) {
return new TypeIndexing {Included = false};
return new TypeIndexing {Indexes = ""};
}
return contentItem.TypeDefinition.Settings.GetModel<TypeIndexing>();
}