case 3977
This commit is contained in:
@@ -1,10 +1,8 @@
|
|||||||
using System;
|
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
using AyaNova.Util;
|
using AyaNova.Util;
|
||||||
using AyaNova.Models;
|
using AyaNova.Models;
|
||||||
@@ -116,8 +114,8 @@ namespace AyaNova.Biz
|
|||||||
//GET LIST OF DICTIONARY ID'S THAT MATCH REGULAR SEARCH TERMS
|
//GET LIST OF DICTIONARY ID'S THAT MATCH REGULAR SEARCH TERMS
|
||||||
if (SearchTerms.Count > 0)
|
if (SearchTerms.Count > 0)
|
||||||
foreach (string Term in SearchTerms)
|
foreach (string Term in SearchTerms)
|
||||||
{
|
{
|
||||||
DictionaryMatches.AddRange(await ct.SearchDictionary.Where(z => z.Word.Contains(Term)).Select(z => z.Id).ToListAsync());
|
DictionaryMatches.AddRange(await ct.SearchDictionary.Where(z => z.Word==Term).Select(z => z.Id).ToListAsync());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -163,7 +161,7 @@ namespace AyaNova.Biz
|
|||||||
foreach (var SearchMatch in SearchMatches)
|
foreach (var SearchMatch in SearchMatches)
|
||||||
{
|
{
|
||||||
//keep any object that matches *all* the search terms
|
//keep any object that matches *all* the search terms
|
||||||
if (SearchMatch.ObjectCount == TotalSearchTermsToMatch)
|
if (SearchMatch.ObjectCount >= TotalSearchTermsToMatch)
|
||||||
MatchingObjects.Add(new AyaTypeId(SearchMatch.AType, SearchMatch.ObjectId));
|
MatchingObjects.Add(new AyaTypeId(SearchMatch.AType, SearchMatch.ObjectId));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user