From cb3ab26859668c79aa49fe44e2fce17224d8ea99 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Wed, 2 Jun 2010 16:52:52 -0700 Subject: [PATCH] Populate search index snapshots from main handlers (common, body and routable) --HG-- branch : dev --- src/Orchard.Web/Core/Common/Handlers/BodyAspectHandler.cs | 6 +++--- .../Core/Common/Handlers/CommonAspectHandler.cs | 8 ++++++++ .../Core/Common/Handlers/RoutableAspectHandler.cs | 4 ++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/Orchard.Web/Core/Common/Handlers/BodyAspectHandler.cs b/src/Orchard.Web/Core/Common/Handlers/BodyAspectHandler.cs index 8368eb77b..f26177e97 100644 --- a/src/Orchard.Web/Core/Common/Handlers/BodyAspectHandler.cs +++ b/src/Orchard.Web/Core/Common/Handlers/BodyAspectHandler.cs @@ -9,9 +9,9 @@ namespace Orchard.Core.Common.Handlers { public BodyAspectHandler(IRepository bodyRepository) { Filters.Add(StorageFilter.For(bodyRepository)); - OnIndexing((context, bodyAspect) => { - context.IndexDocument.Add("body", bodyAspect.Record.Text); - }); + OnIndexing((context, bodyAspect) => context.IndexDocument + .Add("body", bodyAspect.Record.Text) + .Add("format", bodyAspect.Record.Format)); } } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Common/Handlers/CommonAspectHandler.cs b/src/Orchard.Web/Core/Common/Handlers/CommonAspectHandler.cs index 99c652d12..17803b66d 100644 --- a/src/Orchard.Web/Core/Common/Handlers/CommonAspectHandler.cs +++ b/src/Orchard.Web/Core/Common/Handlers/CommonAspectHandler.cs @@ -54,6 +54,14 @@ namespace Orchard.Core.Common.Handlers { //OnGetDisplayViewModel(); OnGetEditorViewModel(GetEditor); OnUpdateEditorViewModel(UpdateEditor); + + OnIndexing((context, commonAspect) => context.IndexDocument + .Add("type", commonAspect.ContentItem.ContentType) + .Add("author", commonAspect.Owner.UserName) + .Add("created", commonAspect.CreatedUtc ?? _clock.UtcNow) + .Add("published", commonAspect.PublishedUtc ?? _clock.UtcNow) + .Add("modified", commonAspect.ModifiedUtc ?? _clock.UtcNow) + ); } public Localizer T { get; set; } diff --git a/src/Orchard.Web/Core/Common/Handlers/RoutableAspectHandler.cs b/src/Orchard.Web/Core/Common/Handlers/RoutableAspectHandler.cs index 8f654378b..c2cfacd93 100644 --- a/src/Orchard.Web/Core/Common/Handlers/RoutableAspectHandler.cs +++ b/src/Orchard.Web/Core/Common/Handlers/RoutableAspectHandler.cs @@ -36,6 +36,10 @@ namespace Orchard.Core.Common.Handlers { OnCreated((context, ra) => routableService.ProcessSlug(ra)); + OnIndexing((context, part) => context.IndexDocument + .Add("slug", part.Slug) + .Add("title", part.Title) + ); } private static RouteValueDictionary GetRouteValues(IContentItemDriver driver, ContentItem contentItem) {