This commit is contained in:
2021-10-17 13:12:05 +01:00
parent 7417981a34
commit 057b75462e
20 changed files with 326 additions and 155 deletions
@@ -408,15 +408,17 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
if (!StringUtil.IsEmpty(prm.OrganisationFilter))
{
// Split filter into words.
List<String> filterWords = prm.OrganisationFilter.Split((char[])null).ToList();
List<String> searchFilter = new List<String>();
List<String> filterWords = prm.OrganisationFilter.Split((char[])null, StringSplitOptions.RemoveEmptyEntries).ToList();
filterWords.RemoveDuplicatesCI();
filterWords.RemoveBlanks();
foreach (String filterWord in filterWords)
{
List<String> organisationFilter = new List<String>();
organisationFilter.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_Name, aliasOrganisation) + " Like '%" + DbQuery.FormatForLike(filterWord, true) + "%'");
filter.Add(organisationFilter.Concat(" OR ", "(", ")"));
searchFilter.Add(organisationFilter.Concat(" OR ", "(", ")"));
}
filter.Add(searchFilter.Concat(" AND ", "(", ")"));
}
// Sport Ids.