Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

add ability to manage search results settings

Browse Source
This commit is contained in:
sbwalker
2024-07-19 12:55:59 -04:00
parent 5443629ec5
commit 59bba83b1d
10 changed files with 206 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Oqtane.Server/Components/App.razor
View File

@ -568,20 +568,24 @@
{
if (!string.IsNullOrEmpty(resource.Url))
{
if (!resource.Reload)
{
// if (!resource.Reload)
// {
var url = (resource.Url.Contains("://")) ? resource.Url : alias.BaseUrl + resource.Url;
if (resource.Reload)
{
url += "?" + Guid.NewGuid().ToString("N");
}
return "<script" +
((!string.IsNullOrEmpty(resource.Integrity)) ? " integrity=\"" + resource.Integrity + "\"" : "") +
((!string.IsNullOrEmpty(resource.CrossOrigin)) ? " crossorigin=\"" + resource.CrossOrigin + "\"" : "") +
((resource.ES6Module) ? " type=\"module\"" : "") +
" src=\"" + url + "\"></script>"; // src at end of element due to enhanced navigation patch algorithm
}
else
{
// use custom element which can execute script on every page transition
return "<page-script src=\"" + resource.Url + "\"></page-script>";
}
// }
// else
// {
// // use custom element which can execute script on every page transition
// return "<page-script src=\"" + resource.Url + "\"></page-script>";
// }
}
else
{

4
Oqtane.Server/Providers/DatabaseSearchProvider.cs
View File

@ -74,7 +74,7 @@ namespace Oqtane.Providers
prefix = string.Empty;
}
var length = searchQuery.BodySnippetLength;
var length = searchQuery.BodyLength;
if (start + length >= content.Length)
{
length = content.Length - start;
@ -88,7 +88,7 @@ namespace Oqtane.Providers
if (string.IsNullOrEmpty(snippet))
{
snippet = content.Substring(0, searchQuery.BodySnippetLength);
snippet = content.Substring(0, searchQuery.BodyLength);
}
foreach (var keyword in SearchUtils.GetKeywords(searchQuery.Keywords))

8
Oqtane.Server/Repository/SearchContentRepository.cs
View File

@ -37,14 +37,14 @@ namespace Oqtane.Repository
searchContents = searchContents.Where(i => !searchQuery.ExcludeEntities.Split(',', StringSplitOptions.RemoveEmptyEntries).Contains(i.EntityName));
}
if (searchQuery.From != DateTime.MinValue)
if (searchQuery.FromDate != DateTime.MinValue)
{
searchContents = searchContents.Where(i => i.ContentModifiedOn >= searchQuery.From);
searchContents = searchContents.Where(i => i.ContentModifiedOn >= searchQuery.FromDate);
}
if (searchQuery.To != DateTime.MinValue)
if (searchQuery.ToDate != DateTime.MaxValue)
{
searchContents = searchContents.Where(i => i.ContentModifiedOn <= searchQuery.To);
searchContents = searchContents.Where(i => i.ContentModifiedOn <= searchQuery.ToDate);
}
if (searchQuery.Properties != null && searchQuery.Properties.Any())

10
Oqtane.Server/Services/SearchService.cs
View File

@ -45,14 +45,14 @@ namespace Oqtane.Services
.DistinctBy(i => i.Url);
// sort results
if (searchQuery.SortDirection == SearchSortDirections.Descending)
if (searchQuery.SortOrder == SearchSortOrder.Descending)
{
switch (searchQuery.SortField)
{
case SearchSortFields.Relevance:
case SearchSortField.Relevance:
results = results.OrderByDescending(i => i.Score).ThenByDescending(i => i.ContentModifiedOn);
break;
case SearchSortFields.Title:
case SearchSortField.Title:
results = results.OrderByDescending(i => i.Title).ThenByDescending(i => i.ContentModifiedOn);
break;
default:
@ -64,10 +64,10 @@ namespace Oqtane.Services
{
switch (searchQuery.SortField)
{
case SearchSortFields.Relevance:
case SearchSortField.Relevance:
results = results.OrderBy(i => i.Score).ThenByDescending(i => i.ContentModifiedOn);
break;
case SearchSortFields.Title:
case SearchSortField.Title:
results = results.OrderBy(i => i.Title).ThenByDescending(i => i.ContentModifiedOn);
break;
default: