Merge pull request #57 from celeron533/fuzzy_search

Switch the internal match logic to Regex
celeron533 · Jan 26, 2024 · 2c1270d · 2c1270d
2 parents 8900961 + 763231e
commit 2c1270d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 52 deletions.
diff --git a/DicomGrepCore/Enums/MatchPatternEnum.cs b/DicomGrepCore/Enums/MatchPatternEnum.cs
@@ -9,6 +9,7 @@ namespace DicomGrepCore.Enums
  public enum MatchPatternEnum
  {
  Normal,
+ Wildcard,
  Regex
  }
 }
diff --git a/DicomGrepCore/Extensions/StringExtensions.cs b/DicomGrepCore/Extensions/StringExtensions.cs
diff --git a/DicomGrepCore/Services/SearchService.cs b/DicomGrepCore/Services/SearchService.cs
@@ -1,5 +1,4 @@
-using DicomGrepCore.Extensions;
-using DicomGrepCore.Entities;
+using DicomGrepCore.Entities;
 using DicomGrepCore.Services.EventArgs;
 using System;
 using System.Collections.Generic;
@@ -295,52 +294,44 @@ private bool CompareString(string refString, SearchCriteria _criteria, bool isDi
  return false;
  }
 
- return CompareString(refString, _criteria.SearchText, _criteria.CaseSensitive, _criteria.WholeWord);
+ string testString = _criteria.SearchText;
 
- }
-
- private bool CompareString(string refString, string testString, bool caseSensitive, bool wholeWord)
- {
- bool result = false;
  switch (criteria.MatchPattern)
  {
  default:
  case MatchPatternEnum.Normal:
- if (wholeWord)
- {
- result = refString.Equals(testString, caseSensitive ? StringComparison.InvariantCulture : StringComparison.InvariantCultureIgnoreCase);
- }
- else
- {
- result = refString.CaseInsensitiveContains(testString, caseSensitive ? StringComparison.InvariantCulture : StringComparison.InvariantCultureIgnoreCase);
- }
+ testString = Regex.Escape(testString);
+ break;
+ case MatchPatternEnum.Wildcard:
+ testString = Regex.Escape(testString);
+ testString = testString.Replace(@"\*", ".*").Replace(@"\?", ".{1}");
  break;
  case MatchPatternEnum.Regex:
- RegexOptions options = RegexOptions.Compiled;
- if (!caseSensitive)
- {
- options |= RegexOptions.IgnoreCase;
- }
+ break;
+ }
 
- if (wholeWord)
- {
- // regex match start
- if (!testString.StartsWith('^'))
- {
- testString = "^" + testString;
- }
+ RegexOptions options = RegexOptions.Compiled | RegexOptions.Singleline;
+ if (!_criteria.CaseSensitive)
+ {
+ options |= RegexOptions.IgnoreCase;
+ }
 
- // regex match end
- if (!testString.EndsWith('$'))
- {
- testString += "$";
- }
- }
+ if (_criteria.WholeWord)
+ {
+ // regex match start
+ if (!testString.StartsWith('^'))
+ {
+ testString = "^" + testString;
+ }
 
- result = Regex.IsMatch(refString, testString, options);
- break;
+ // regex match end
+ if (!testString.EndsWith('$'))
+ {
+ testString += "$";
+ }
  }
- return result;
+
+ return Regex.IsMatch(refString, testString, options);
  }
 
  }