fix Search Any Where filtering

Analogy-LogViewer · Sep 17, 2023 · 8d71a6a · 8d71a6a
1 parent 602754d
commit 8d71a6a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10,959 deletions.
diff --git a/Analogy.Common/DataTypes/FilterCriteriaObject.cs b/Analogy.Common/DataTypes/FilterCriteriaObject.cs
@@ -25,7 +25,7 @@ public class FilterCriteriaObject
         public DateTime EndTime { get; set; }
 
         private AnalogyLogLevel[] _arrLevels;
-        public AnalogyLogLevel[] Levels
+        public AnalogyLogLevel[]? Levels
         {
             get => _arrLevels;
             set => _arrLevels = value;
@@ -249,9 +249,10 @@ IEnumerable<string> GenerateSingleCombinationPerColumn(string field, bool numeri
 
             if (SearchEveryWhere)
             {
-                var entries = Columns.Select(c =>
-                    string.Join(orOperationInInclude ? " Or " : " and ",
-                        GenerateSingleCombinationPerColumn(c.Field, c.Numerical)));
+                var allValidCombinations =
+                    Columns.Select(c => GenerateSingleCombinationPerColumn(c.Field, c.Numerical).ToList());
+                var entries = allValidCombinations.Where(c=>c.Any()).Select(c =>
+                    string.Join(orOperationInInclude ? " Or " : " and ", c));
                 var combined = string.Join(" Or ", entries);
                 return combined;
             }

diff --git a/Analogy.CommonControls/UserControls/LogMessagesUC.cs b/Analogy.CommonControls/UserControls/LogMessagesUC.cs
@@ -2153,26 +2153,6 @@ public void FilterResults(string module)
 
         private void FilterResults()
         {
-            if (txtbInclude.Text == txtbInclude.Properties.NullText)
-            {
-                SetTextIfDifferent(txtbInclude, null);
-            }
-
-            if (txtbExclude.Text == txtbExclude.Properties.NullText)
-            {
-                SetTextIfDifferent(txtbExclude, null);
-            }
-
-            if (txtbSource.Text == txtbSource.Properties.NullText)
-            {
-                SetTextIfDifferent(txtbSource, null);
-            }
-
-            if (txtbModule.Text == txtbModule.Properties.NullText)
-            {
-                SetTextIfDifferent(txtbModule, null);
-            }
-
             string include = txtbInclude.EditValue == null ? string.Empty : txtbInclude.EditValue.ToString().Trim();
             string exclude = txtbExclude.EditValue == null ? string.Empty : txtbExclude.EditValue.ToString().Trim();
             if (!autoCompleteInclude.Contains(include))
@@ -2189,10 +2169,8 @@ private void FilterResults()
             Settings.AddNewSearchesEntryToLists(exclude, false);
             _filterCriteria.StartTime = ceNewerThanFilter.Checked ? deNewerThanFilter.DateTime : DateTime.MinValue;
             _filterCriteria.EndTime = ceOlderThanFilter.Checked ? deOlderThanFilter.DateTime : DateTime.MaxValue;
-            _filterCriteria.TextInclude = ceIncludeText.Checked ? (txtbInclude.EditValue == null ? string.Empty : txtbInclude.EditValue.ToString().Trim()) : string.Empty;
-            _filterCriteria.TextExclude = ceExcludeText.Checked
-                ? (txtbExclude.EditValue == null ? string.Empty : txtbExclude.EditValue.ToString().Trim()) + string.Join("|", _excludeMostCommon)
-                : string.Empty;
+            _filterCriteria.TextInclude = ceIncludeText.Checked ? include : string.Empty;
+            _filterCriteria.TextExclude = ceExcludeText.Checked ? exclude + string.Join("|", _excludeMostCommon) : string.Empty;
 
             _filterCriteria.Levels = null;
             switch (LogLevelSelectionType)