From 697a4ca593da0ddb4f70b18d8d5931f415d552b1 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 11 Oct 2021 20:02:05 +0000 Subject: [PATCH] --- server/AyaNova/biz/Search.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/server/AyaNova/biz/Search.cs b/server/AyaNova/biz/Search.cs index 9f5ff96b..b4e943a5 100644 --- a/server/AyaNova/biz/Search.cs +++ b/server/AyaNova/biz/Search.cs @@ -197,16 +197,18 @@ namespace AyaNova.Biz //EXACT MATCH SEARCH TERMS foreach (string Term in SearchTerms) - q.Append($"COUNT(*) FILTER (WHERE asearchdictionary.word = '{Term}') AS 'st{++termCount}', "); + q.Append($"COUNT(*) FILTER (WHERE asearchdictionary.word = '{Term}') AS st{++termCount}, "); //WILDCARD SEARCH TERMS foreach (string WildCardSearchTerm in PreWildCardedSearchTerms) - q.Append($"COUNT(*) FILTER (WHERE asearchdictionary.word LIKE '{WildCardSearchTerm}') AS 'st{++termCount}', "); + q.Append($"COUNT(*) FILTER (WHERE asearchdictionary.word LIKE '{WildCardSearchTerm}') AS st{++termCount}, "); + + q.Length=q.Length-2;//trim the final comma and space - q.Append("FROM asearchdictionary INNER JOIN asearchkey ON asearchdictionary.id = asearchkey.wordid GROUP BY asearchkey.objectid, asearchkey.atype) SELECT objectid, atype FROM qr WHERE "); + q.Append(" FROM asearchdictionary INNER JOIN asearchkey ON asearchdictionary.id = asearchkey.wordid GROUP BY asearchkey.objectid, asearchkey.atype) SELECT objectid, atype FROM qr WHERE "); for (; termCount > 0; termCount--) - q.Append($"st{termCount} > 0 {(termCount > 1 ? "AND" : "")}"); + q.Append($"st{termCount} > 0 {(termCount > 1 ? "AND " : "")}"); //execute the query and iterate the results