From ef272dd6a8249f82e3f46e6984a87d8ba801a2dd Mon Sep 17 00:00:00 2001 From: sbwalker Date: Sun, 21 Jul 2024 09:10:01 -0400 Subject: [PATCH] change Ignore Paths to Ignore Pages --- Oqtane.Client/Modules/Admin/Search/Index.razor | 10 +++++----- .../Resources/Modules/Admin/Search/Index.resx | 8 ++++---- Oqtane.Server/Infrastructure/Jobs/SearchIndexJob.cs | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Search/Index.razor b/Oqtane.Client/Modules/Admin/Search/Index.razor index 9fe16ee4..c76a594e 100644 --- a/Oqtane.Client/Modules/Admin/Search/Index.razor +++ b/Oqtane.Client/Modules/Admin/Search/Index.razor @@ -27,9 +27,9 @@
- +
- +
@@ -61,7 +61,7 @@ private string _searchProvider; private string _enabled; private string _lastIndexedOn; - private string _ignorePaths; + private string _ignorePages; private string _ignoreEntities; private string _minimumWordLength; private string _ignoreWords; @@ -72,7 +72,7 @@ _searchProvider = SettingService.GetSetting(settings, "Search_SearchProvider", Constants.DefaultSearchProviderName); _enabled = SettingService.GetSetting(settings, "Search_Enabled", "True"); _lastIndexedOn = SettingService.GetSetting(settings, "Search_LastIndexedOn", ""); - _ignorePaths = SettingService.GetSetting(settings, "Search_IgnorePaths", ""); + _ignorePages = SettingService.GetSetting(settings, "Search_IgnorePages", ""); _ignoreEntities = SettingService.GetSetting(settings, "Search_IgnoreEntities", ""); _minimumWordLength = SettingService.GetSetting(settings, "Search_MininumWordLength", "3"); _ignoreWords = SettingService.GetSetting(settings, "Search_IgnoreWords", ""); @@ -86,7 +86,7 @@ settings = SettingService.SetSetting(settings, "Search_SearchProvider", _searchProvider); settings = SettingService.SetSetting(settings, "Search_Enabled", _enabled, true); settings = SettingService.SetSetting(settings, "Search_LastIndexedOn", _lastIndexedOn, true); - settings = SettingService.SetSetting(settings, "Search_IgnorePaths", _ignorePaths, true); + settings = SettingService.SetSetting(settings, "Search_IgnorePages", _ignorePages, true); settings = SettingService.SetSetting(settings, "Search_IgnoreEntities", _ignoreEntities, true); settings = SettingService.SetSetting(settings, "Search_MininumWordLength", _minimumWordLength, true); settings = SettingService.SetSetting(settings, "Search_IgnoreWords", _ignoreWords, true); diff --git a/Oqtane.Client/Resources/Modules/Admin/Search/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Search/Index.resx index 06f2a834..0e0ce755 100644 --- a/Oqtane.Client/Resources/Modules/Admin/Search/Index.resx +++ b/Oqtane.Client/Resources/Modules/Admin/Search/Index.resx @@ -129,11 +129,11 @@ The date/time which the site was last indexed on - - Ignore Paths: + + Ignore Pages: - - Comma delimited list of page paths which should be ignored + + Comma delimited list of pages which should be ignored (based on page path) Ignore Entities: diff --git a/Oqtane.Server/Infrastructure/Jobs/SearchIndexJob.cs b/Oqtane.Server/Infrastructure/Jobs/SearchIndexJob.cs index 0374cd2d..12f3957d 100644 --- a/Oqtane.Server/Infrastructure/Jobs/SearchIndexJob.cs +++ b/Oqtane.Server/Infrastructure/Jobs/SearchIndexJob.cs @@ -16,7 +16,7 @@ namespace Oqtane.Infrastructure { private const string SearchLastIndexedOnSetting = "Search_LastIndexedOn"; private const string SearchEnabledSetting = "Search_Enabled"; - private const string SearchIgnorePathsSetting = "Search_IgnorePaths"; + private const string SearchIgnorePagesSetting = "Search_IgnorePages"; private const string SearchIgnoreEntitiesSetting = "Search_IgnoreEntities"; public SearchIndexJob(IServiceScopeFactory serviceScopeFactory) : base(serviceScopeFactory) @@ -59,7 +59,7 @@ namespace Oqtane.Infrastructure var currentTime = DateTime.UtcNow; var lastIndexedOn = Convert.ToDateTime(siteSettings.GetValue(SearchLastIndexedOnSetting, DateTime.MinValue.ToString())); - var ignorePaths = siteSettings.GetValue(SearchIgnorePathsSetting, "").Split(','); + var ignorePages = siteSettings.GetValue(SearchIgnorePagesSetting, "").Split(','); var ignoreEntities = siteSettings.GetValue(SearchIgnoreEntitiesSetting, "").Split(','); var pages = pageRepository.GetPages(site.SiteId); @@ -69,7 +69,7 @@ namespace Oqtane.Infrastructure // index pages foreach (var page in pages) { - if (!string.IsNullOrEmpty(page.Path) && (Constants.InternalPagePaths.Contains(page.Path) || ignorePaths.Contains(page.Path))) + if (!string.IsNullOrEmpty(page.Path) && (Constants.InternalPagePaths.Contains(page.Path) || ignorePages.Contains(page.Path))) { continue; }