Closes #95

rampaa · Aug 4, 2024 · 972e737 · 972e737
1 parent 08f8aa4
commit 972e737
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 8 deletions.
diff --git a/JL.Core/Dicts/EPWING/Nazeka/EpwingNazekaDBManager.cs b/JL.Core/Dicts/EPWING/Nazeka/EpwingNazekaDBManager.cs
@@ -10,7 +10,7 @@ namespace JL.Core.Dicts.EPWING.Nazeka;
 
 internal static class EpwingNazekaDBManager
 {
-    public const int Version = 1;
+    public const int Version = 2;
 
     private const string SingleTermQuery =
         """

diff --git a/JL.Core/Dicts/EPWING/Yomichan/EpwingYomichanDBManager.cs b/JL.Core/Dicts/EPWING/Yomichan/EpwingYomichanDBManager.cs
@@ -10,7 +10,7 @@ namespace JL.Core.Dicts.EPWING.Yomichan;
 
 internal static class EpwingYomichanDBManager
 {
-    public const int Version = 6;
+    public const int Version = 7;
 
     private const string SingleTermQuery =
         """

diff --git a/JL.Core/Dicts/JMdict/JmdictDBManager.cs b/JL.Core/Dicts/JMdict/JmdictDBManager.cs
@@ -9,7 +9,7 @@ namespace JL.Core.Dicts.JMdict;
 
 internal static class JmdictDBManager
 {
-    public const int Version = 1;
+    public const int Version = 2;
 
     public static void CreateDB(string dbName)
     {

diff --git a/JL.Core/Dicts/JMnedict/JmnedictDBManager.cs b/JL.Core/Dicts/JMnedict/JmnedictDBManager.cs
@@ -8,7 +8,7 @@ namespace JL.Core.Dicts.JMnedict;
 
 internal static class JmnedictDBManager
 {
-    public const int Version = 0;
+    public const int Version = 1;
 
     public static void CreateDB(string dbName)
     {

diff --git a/JL.Core/Dicts/PitchAccent/YomichanPitchAccentDBManager.cs b/JL.Core/Dicts/PitchAccent/YomichanPitchAccentDBManager.cs
@@ -10,7 +10,7 @@ namespace JL.Core.Dicts.PitchAccent;
 
 internal static class YomichanPitchAccentDBManager
 {
-    public const int Version = 1;
+    public const int Version = 2;
 
     private const string SingleTermQuery =
         """

diff --git a/JL.Core/Freqs/FreqDBManager.cs b/JL.Core/Freqs/FreqDBManager.cs
@@ -10,7 +10,7 @@ namespace JL.Core.Freqs;
 
 internal static class FreqDBManager
 {
-    public const int Version = 2;
+    public const int Version = 3;
 
     public static void CreateDB(string dbName)
     {

diff --git a/JL.Core/Utilities/JapaneseUtils.cs b/JL.Core/Utilities/JapaneseUtils.cs
@@ -191,12 +191,15 @@ private static int FirstKatakanaIndex(string text)
     public static string KatakanaToHiragana(string text)
     {
         string normalizedText = text;
-        if (!text.IsNormalized(NormalizationForm.FormKC))
+        if (!normalizedText.IsNormalized(NormalizationForm.FormKC))
         {
             // Normalizes ＯＬ to OL, ｶﾞ to が, ﾜ to わ, ㍿ to 株式会社 etc.
-            normalizedText = text.Normalize(NormalizationForm.FormKC);
+            normalizedText = normalizedText.Normalize(NormalizationForm.FormKC);
         }
 
+        // Normalizes vs to VS, xxx to XXX, h to H etc.
+        normalizedText = normalizedText.ToUpperInvariant();
+
         int firstKatakanaIndex = FirstKatakanaIndex(normalizedText);
         if (firstKatakanaIndex is -1)
         {