From 5641670961fc8c46a06d8979f2718185f680d8f9 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 6 Dec 2018 20:18:24 +0000 Subject: [PATCH] --- server/AyaNova/Controllers/AttachmentController.cs | 11 +++++++---- server/AyaNova/util/AySchema.cs | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/server/AyaNova/Controllers/AttachmentController.cs b/server/AyaNova/Controllers/AttachmentController.cs index c527d314..3d8b9be3 100644 --- a/server/AyaNova/Controllers/AttachmentController.cs +++ b/server/AyaNova/Controllers/AttachmentController.cs @@ -231,9 +231,12 @@ namespace AyaNova.Api.Controllers //EVENT LOG EventLogProcessor.LogEventToDatabase(new Event(UserId, attachToObject.ObjectId, attachToObject.ObjectType, AyaEvent.AttachmentCreate, v.DisplayFileName), ct); - + //SEARCH INDEXING - Search.ProcessNewObjectKeywords( UserLocaleIdFromContext.Id(HttpContext.Items), v.Id, AyaType.FileAttachment, v.DisplayFileName, v.DisplayFileName, v.Notes, v.StoredFileName); + // Search.ProcessNewObjectKeywords( UserLocaleIdFromContext.Id(HttpContext.Items), v.Id, AyaType.FileAttachment, v.DisplayFileName, v.DisplayFileName, v.Notes, v.StoredFileName); + var SearchParams = new Search.SearchIndexProcessObjectParameters(UserLocaleIdFromContext.Id(HttpContext.Items), v.Id, AyaType.FileAttachment, v.DisplayFileName, null); + SearchParams.AddWord(v.Notes).AddWord(v.DisplayFileName).AddWord(v.StoredFileName); + Search.ProcessNewObjectKeywords(SearchParams); } } @@ -301,7 +304,7 @@ namespace AyaNova.Api.Controllers //Event log process delete EventLogProcessor.LogEventToDatabase(new Event(UserId, dbObj.AttachToObjectId, dbObj.AttachToObjectType, AyaEvent.AttachmentDelete, dbObj.DisplayFileName), ct); - + //Delete search index Search.ProcessDeletedObjectKeywords(dbObj.Id, AyaType.FileAttachment); @@ -383,7 +386,7 @@ namespace AyaNova.Api.Controllers //Log EventLogProcessor.LogEventToDatabase(new Event(UserId, dbObj.AttachToObjectId, dbObj.AttachToObjectType, AyaEvent.AttachmentDownload, dbObj.DisplayFileName), ct); - + return PhysicalFile(filePath, mimetype, dbObj.DisplayFileName); } diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index ad47631d..b663e701 100644 --- a/server/AyaNova/util/AySchema.cs +++ b/server/AyaNova/util/AySchema.cs @@ -22,7 +22,7 @@ namespace AyaNova.Util //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::PrepareDatabaseForSeeding WHEN NEW TABLES ADDED!!!! private const int DESIRED_SCHEMA_LEVEL = 8; - internal const long EXPECTED_COLUMN_COUNT = 94; + internal const long EXPECTED_COLUMN_COUNT = 95; internal const long EXPECTED_INDEX_COUNT = 20; //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::PrepareDatabaseForSeeding WHEN NEW TABLES ADDED!!!!