kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4448 from sbwalker/dev

Browse Source 
change Ignore Paths to Ignore Pages
This commit is contained in:
Shaun Walker 2024-07-21 09:10:23 -04:00 committed by GitHub
commit 116a615b84
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Oqtane.Client/Modules/Admin/Search/Index.razor
View File

@ -27,9 +27,9 @@
</div> </div>
</div> </div>
<div class="row mb-1 align-items-center"> <div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="ignorepaths" HelpText="Comma delimited list of page paths which should be ignored" ResourceKey="IgnorePaths">Ignore Paths: </Label> <Label Class="col-sm-3" For="ignorepages" HelpText="Comma delimited list of pages which should be ignored (based on their path)" ResourceKey="IgnorePages">Ignore Pages: </Label>
<div class="col-sm-9"> <div class="col-sm-9">
<textarea id="ignorepaths" class="form-control" @bind="@_ignorePaths" rows="3"></textarea> <textarea id="ignorepages" class="form-control" @bind="@_ignorePages" rows="3"></textarea>
</div> </div>
</div> </div>
<div class="row mb-1 align-items-center"> <div class="row mb-1 align-items-center">
@ -61,7 +61,7 @@
private string _searchProvider; private string _searchProvider;
private string _enabled; private string _enabled;
private string _lastIndexedOn; private string _lastIndexedOn;
private string _ignorePaths; private string _ignorePages;
private string _ignoreEntities; private string _ignoreEntities;
private string _minimumWordLength; private string _minimumWordLength;
private string _ignoreWords; private string _ignoreWords;
@ -72,7 +72,7 @@
_searchProvider = SettingService.GetSetting(settings, "Search_SearchProvider", Constants.DefaultSearchProviderName); _searchProvider = SettingService.GetSetting(settings, "Search_SearchProvider", Constants.DefaultSearchProviderName);
_enabled = SettingService.GetSetting(settings, "Search_Enabled", "True"); _enabled = SettingService.GetSetting(settings, "Search_Enabled", "True");
_lastIndexedOn = SettingService.GetSetting(settings, "Search_LastIndexedOn", ""); _lastIndexedOn = SettingService.GetSetting(settings, "Search_LastIndexedOn", "");
_ignorePaths = SettingService.GetSetting(settings, "Search_IgnorePaths", ""); _ignorePages = SettingService.GetSetting(settings, "Search_IgnorePages", "");
_ignoreEntities = SettingService.GetSetting(settings, "Search_IgnoreEntities", ""); _ignoreEntities = SettingService.GetSetting(settings, "Search_IgnoreEntities", "");
_minimumWordLength = SettingService.GetSetting(settings, "Search_MininumWordLength", "3"); _minimumWordLength = SettingService.GetSetting(settings, "Search_MininumWordLength", "3");
_ignoreWords = SettingService.GetSetting(settings, "Search_IgnoreWords", ""); _ignoreWords = SettingService.GetSetting(settings, "Search_IgnoreWords", "");
@ -86,7 +86,7 @@
settings = SettingService.SetSetting(settings, "Search_SearchProvider", _searchProvider); settings = SettingService.SetSetting(settings, "Search_SearchProvider", _searchProvider);
settings = SettingService.SetSetting(settings, "Search_Enabled", _enabled, true); settings = SettingService.SetSetting(settings, "Search_Enabled", _enabled, true);
settings = SettingService.SetSetting(settings, "Search_LastIndexedOn", _lastIndexedOn, 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_IgnoreEntities", _ignoreEntities, true);
settings = SettingService.SetSetting(settings, "Search_MininumWordLength", _minimumWordLength, true); settings = SettingService.SetSetting(settings, "Search_MininumWordLength", _minimumWordLength, true);
settings = SettingService.SetSetting(settings, "Search_IgnoreWords", _ignoreWords, true); settings = SettingService.SetSetting(settings, "Search_IgnoreWords", _ignoreWords, true);

8
Oqtane.Client/Resources/Modules/Admin/Search/Index.resx
View File

@ -129,11 +129,11 @@
<data name="LastIndexedOn.HelpText" xml:space="preserve"> <data name="LastIndexedOn.HelpText" xml:space="preserve">
<value>The date/time which the site was last indexed on</value> <value>The date/time which the site was last indexed on</value>
</data> </data>
<data name="IgnorePaths.Text" xml:space="preserve"> <data name="IgnorePages.Text" xml:space="preserve">
<value>Ignore Paths: </value> <value>Ignore Pages: </value>
</data> </data>
<data name="IgnorePaths.HelpText" xml:space="preserve"> <data name="IgnorePages.HelpText" xml:space="preserve">
<value>Comma delimited list of page paths which should be ignored</value> <value>Comma delimited list of pages which should be ignored (based on page path)</value>
</data> </data>
<data name="IgnoreEntities.Text" xml:space="preserve"> <data name="IgnoreEntities.Text" xml:space="preserve">
<value>Ignore Entities: </value> <value>Ignore Entities: </value>

6
Oqtane.Server/Infrastructure/Jobs/SearchIndexJob.cs
View File

@ -16,7 +16,7 @@ namespace Oqtane.Infrastructure
{ {
private const string SearchLastIndexedOnSetting = "Search_LastIndexedOn"; private const string SearchLastIndexedOnSetting = "Search_LastIndexedOn";
private const string SearchEnabledSetting = "Search_Enabled"; private const string SearchEnabledSetting = "Search_Enabled";
private const string SearchIgnorePathsSetting = "Search_IgnorePaths"; private const string SearchIgnorePagesSetting = "Search_IgnorePages";
private const string SearchIgnoreEntitiesSetting = "Search_IgnoreEntities"; private const string SearchIgnoreEntitiesSetting = "Search_IgnoreEntities";
public SearchIndexJob(IServiceScopeFactory serviceScopeFactory) : base(serviceScopeFactory) public SearchIndexJob(IServiceScopeFactory serviceScopeFactory) : base(serviceScopeFactory)
@ -59,7 +59,7 @@ namespace Oqtane.Infrastructure
var currentTime = DateTime.UtcNow; var currentTime = DateTime.UtcNow;
var lastIndexedOn = Convert.ToDateTime(siteSettings.GetValue(SearchLastIndexedOnSetting, DateTime.MinValue.ToString())); 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 ignoreEntities = siteSettings.GetValue(SearchIgnoreEntitiesSetting, "").Split(',');
var pages = pageRepository.GetPages(site.SiteId); var pages = pageRepository.GetPages(site.SiteId);
@ -69,7 +69,7 @@ namespace Oqtane.Infrastructure
// index pages // index pages
foreach (var page in 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; continue;
} }