Added additional conditions for filtering records by fields: new "con…

…tains/not contains" filters without a mask (case-sensitive), old ones renamed to "contains/not contains mask" (fix #606)
Serg-Norseman · Dec 5, 2024 · 79b2d78 · 79b2d78
1 parent 6d4ee11
commit 79b2d78
Show file tree

Hide file tree

Showing 27 changed files with 71 additions and 13 deletions.
diff --git a/locales/Afrikaans.lng b/locales/Afrikaans.lng
@@ -1023,3 +1023,5 @@
 1010=Mourning edges
 1011=Use additional dates
 1012=Cursor coordinates
+1013=contains mask
+1014=not contains mask
diff --git a/locales/Belarusian.lng b/locales/Belarusian.lng
@@ -998,7 +998,7 @@
 985=Location Expert
 986=Event dates
 987=Add
-988=Entry               ; entry/item/part of place string
+988=Entry
 989=Include source pages
 990=Navigation
 991=Include portraits
@@ -1023,3 +1023,5 @@
 1010=Mourning edges
 1011=Use additional dates
 1012=Cursor coordinates
+1013=contains mask
+1014=not contains mask
diff --git a/locales/Chinese Simplified.lng b/locales/Chinese Simplified.lng
@@ -1023,3 +1023,5 @@
 1010=哀悼边框
 1011=使用附加日期
 1012=Cursor coordinates
+1013=contains mask
+1014=not contains mask
diff --git a/locales/Czech.lng b/locales/Czech.lng
@@ -998,7 +998,7 @@
 985=Location Expert
 986=Event dates
 987=Add
-988=Entry               ; entry/item/part of place string
+988=Entry
 989=Include source pages
 990=Navigation
 991=Include portraits
@@ -1023,3 +1023,5 @@
 1010=Mourning edges
 1011=Use additional dates
 1012=Cursor coordinates
+1013=contains mask
+1014=not contains mask
diff --git a/locales/Dutch.lng b/locales/Dutch.lng
@@ -1023,3 +1023,5 @@
 1010=Mourning edges
 1011=Use additional dates
 1012=Cursor coordinates
+1013=contains mask
+1014=not contains mask
diff --git a/locales/English.lng b/locales/English.lng
@@ -1023,3 +1023,5 @@
 1010=Mourning edges
 1011=Use additional dates
 1012=Cursor coordinates
+1013=contains mask
+1014=not contains mask
diff --git a/locales/French.lng b/locales/French.lng
@@ -1023,3 +1023,5 @@
 1010=Mourning edges
 1011=Use additional dates
 1012=Cursor coordinates
+1013=contains mask
+1014=not contains mask
diff --git a/locales/German.lng b/locales/German.lng
@@ -1023,3 +1023,5 @@
 1010=Trauerränder
 1011=Zusätzliche Daten verwenden
 1012=Cursor coordinates
+1013=contains mask
+1014=not contains mask
diff --git a/locales/Hungarian.lng b/locales/Hungarian.lng
@@ -1023,3 +1023,5 @@
 1010=Gyászjelentés
 1011=Használjon további dátumokat
 1012=Cursor coordinates
+1013=contains mask
+1014=not contains mask
diff --git a/locales/Icelandic.lng b/locales/Icelandic.lng
@@ -1023,3 +1023,5 @@
 1010=Mourning edges
 1011=Use additional dates
 1012=Cursor coordinates
+1013=contains mask
+1014=not contains mask
diff --git a/locales/Italian.lng b/locales/Italian.lng
@@ -1023,3 +1023,5 @@
 1010=Mourning edges
 1011=Use additional dates
 1012=Cursor coordinates
+1013=contains mask
+1014=not contains mask
diff --git a/locales/Japanese.lng b/locales/Japanese.lng
@@ -1023,3 +1023,5 @@
 1010=Mourning edges
 1011=Use additional dates
 1012=Cursor coordinates
+1013=contains mask
+1014=not contains mask
diff --git a/locales/Kazakh (Cyrillic).lng b/locales/Kazakh (Cyrillic).lng
@@ -1023,3 +1023,5 @@
 1010=Mourning edges
 1011=Use additional dates
 1012=Cursor coordinates
+1013=contains mask
+1014=not contains mask
diff --git a/locales/Polish.lng b/locales/Polish.lng
@@ -998,7 +998,7 @@
 985=Location Expert
 986=Event dates
 987=Add
-988=Entry               ; entry/item/part of place string
+988=Entry
 989=Include source pages
 990=Navigation
 991=Include portraits
@@ -1023,3 +1023,5 @@
 1010=Mourning edges
 1011=Use additional dates
 1012=Cursor coordinates
+1013=contains mask
+1014=not contains mask
diff --git a/locales/Portuguese.lng b/locales/Portuguese.lng
@@ -998,7 +998,7 @@
 985=Location Expert
 986=Event dates
 987=Add
-988=Entry               ; entry/item/part of place string
+988=Entry
 989=Include source pages
 990=Navigation
 991=Include portraits
@@ -1023,3 +1023,5 @@
 1010=Mourning edges
 1011=Use additional dates
 1012=Cursor coordinates
+1013=contains mask
+1014=not contains mask
diff --git a/locales/Russian.lng b/locales/Russian.lng
@@ -1023,3 +1023,5 @@
 1010=Траурные края
 1011=Использовать дополнительные даты
 1012=Коорд. курсора
+1013=содержит маску
+1014=не содержит маску
diff --git a/locales/Serbian (Latin).lng b/locales/Serbian (Latin).lng
@@ -998,7 +998,7 @@
 985=Location Expert
 986=Event dates
 987=Add
-988=Entry               ; entry/item/part of place string
+988=Entry
 989=Include source pages
 990=Navigation
 991=Include portraits
@@ -1023,3 +1023,5 @@
 1010=Mourning edges
 1011=Use additional dates
 1012=Cursor coordinates
+1013=contains mask
+1014=not contains mask
diff --git a/locales/Spanish.lng b/locales/Spanish.lng
@@ -1023,3 +1023,5 @@
 1010=Mourning edges
 1011=Use additional dates
 1012=Cursor coordinates
+1013=contains mask
+1014=not contains mask
diff --git a/locales/Ukrainian.lng b/locales/Ukrainian.lng
@@ -998,7 +998,7 @@
 985=Location Expert
 986=Event dates
 987=Add
-988=Entry               ; entry/item/part of place string
+988=Entry
 989=Include source pages
 990=Navigation
 991=Include portraits
@@ -1023,3 +1023,5 @@
 1010=Mourning edges
 1011=Use additional dates
 1012=Cursor coordinates
+1013=contains mask
+1014=not contains mask
diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>Change log</h1>
 
     <p>
         <b>14.12.2024 [v2.32.0 &amp; v3.8.0]</b><ul>
+            <li>Added additional conditions for filtering records by fields: new "contains/not contains" filters without a mask (case-sensitive), old ones renamed to "contains/not contains mask".
             <li>Localizations updated: Afrikaans (Steyn van der Walt), Chinese Simplified (Jeff Li, learn1), Dutch (Annelotte), French (Guy Arbus), 
                 German (Christian Bettinger), Hungarian (Kékesi Lajos), Japanese (mtsx68k), Kazakh (karatal), Spanish (Miguel A. Pérez Valdenebro), Turkish (Emre Gecher).
             <li>Added a button to the location editing dialog for taking coordinates from the cursor on the map.

diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>История версий</h1>
 
     <p>
         <b>14.12.2024 [v2.32.0 &amp; v3.8.0]</b><ul>
+            <li>Добавлены дополнительные условия фильтрации записей по полям: новые "содержит/не содержит" фильтруют без маски (регистрозавимые), старые переименованы в "содержит/не содержит маску".
             <li>Обновлены локализации: африкаанс (Steyn van der Walt), китайская (Jeff Li, learn1), голландская (Annelotte), французская (Guy Arbus), 
                 немецкая (Christian Bettinger), венгерская (Kékesi Lajos), японская (mtsx68k), казахская (karatal), испанская (Miguel A. Pérez Valdenebro), турецкая (Emre Gecher).
             <li>Добавлена кнопка в диалог редактирования локаций для взятия координат по курсору на карте.

diff --git a/projects/GKCore/GKCore/Controllers/CommonFilterDlgController.cs b/projects/GKCore/GKCore/Controllers/CommonFilterDlgController.cs
@@ -76,8 +76,12 @@ public void Reset()
 
         public override void SetLocale()
         {
+            fView.Title = LangMan.LS(LSID.MIFilter);
+
             GKData.CondSigns[6] = LangMan.LS(LSID.CondContains);
             GKData.CondSigns[7] = LangMan.LS(LSID.CondNotContains);
+            GKData.CondSigns[8] = LangMan.LS(LSID.CondContainsMask);
+            GKData.CondSigns[9] = LangMan.LS(LSID.CondNotContainsMask);
 
             GetControl<IButton>("btnAccept").Text = LangMan.LS(LSID.DlgAccept);
             GetControl<IButton>("btnCancel").Text = LangMan.LS(LSID.DlgCancel);

diff --git a/projects/GKCore/GKCore/Controllers/PersonsFilterDlgController.cs b/projects/GKCore/GKCore/Controllers/PersonsFilterDlgController.cs
@@ -214,8 +214,6 @@ public override void UpdateView()
 
         public override void SetLocale()
         {
-            fView.Title = LangMan.LS(LSID.MIFilter);
-
             GetControl<ITabPage>("pageSpecificFilter").Text = LangMan.LS(LSID.PersonsFilter);
             GetControl<IRadioButton>("rbAll").Text = LangMan.LS(LSID.All);
             GetControl<IRadioButton>("rbOnlyLive").Text = LangMan.LS(LSID.OnlyAlive);

diff --git a/projects/GKCore/GKCore/GKData.cs b/projects/GKCore/GKCore/GKData.cs
@@ -517,7 +517,7 @@ static GKData()
             };
 
             CondSigns = new string[] {
-                "!=", "<", "<=", "==", "=>", ">", "contains", "not contains"
+                "!=", "<", "<=", "==", "=>", ">", "contains", "not contains", "contains mask", "not contains mask"
             };
 
             NameTypes = new LSID[] {

diff --git a/projects/GKCore/GKCore/Interfaces/IListFilter.cs b/projects/GKCore/GKCore/Interfaces/IListFilter.cs
@@ -37,7 +37,11 @@ public enum DataType
 
     public enum ConditionKind : int
     {
-        ck_NotEq, ck_LT, ck_LET, ck_Eq, ck_GET, ck_GT, ck_Contains, ck_NotContains
+        ck_NotEq, ck_LT, ck_LET, ck_Eq, ck_GET, ck_GT,
+        ck_Contains, ck_NotContains,
+        ck_ContainsMask, ck_NotContainsMask,
+
+        ck_Last = ck_NotContainsMask
     }
 
 

diff --git a/projects/GKCore/GKCore/LangMan.cs b/projects/GKCore/GKCore/LangMan.cs
@@ -1087,8 +1087,10 @@ public enum LSID
         /* 1010 */ MourningEdges,
         /* 1011 */ UseAdditionalDates,
         /* 1012 */ CursorCoords,
+        /* 1013 */ CondContainsMask,
+        /* 1014 */ CondNotContainsMask,
 
-        /* 000 */ Last = CursorCoords
+        /* 000 */ Last = CondNotContainsMask
     }
 
 
@@ -2129,6 +2131,8 @@ public static class LangMan
             /* 1010 */ "Mourning edges",
             /* 1011 */ "Use additional dates",
             /* 1012 */ "Cursor coordinates",
+            /* 1013 */ "contains mask",
+            /* 1014 */ "not contains mask",
         };
 
         private static readonly LangManager fLangMan = new LangManager();

diff --git a/projects/GKCore/GKCore/Lists/ListSource.cs b/projects/GKCore/GKCore/Lists/ListSource.cs
@@ -424,10 +424,18 @@ protected bool CheckCondition(FilterCondition fcond, object dataval)
                         break;
 
                     case ConditionKind.ck_Contains:
-                        res = GKUtils.MatchesMask(dataval.ToString(), "*" + fcond.Value + "*");
+                        res = dataval.ToString().Contains(fcond.Value.ToString());
                         break;
 
                     case ConditionKind.ck_NotContains:
+                        res = !dataval.ToString().Contains(fcond.Value.ToString());
+                        break;
+
+                    case ConditionKind.ck_ContainsMask:
+                        res = GKUtils.MatchesMask(dataval.ToString(), "*" + fcond.Value + "*");
+                        break;
+
+                    case ConditionKind.ck_NotContainsMask:
                         res = !GKUtils.MatchesMask(dataval.ToString(), "*" + fcond.Value + "*");
                         break;
                 }
@@ -494,7 +502,7 @@ public ConditionKind GetCondByName(string condName)
         {
             ConditionKind res = ConditionKind.ck_NotEq;
 
-            for (ConditionKind pl = ConditionKind.ck_NotEq; pl <= ConditionKind.ck_NotContains; pl++) {
+            for (ConditionKind pl = ConditionKind.ck_NotEq; pl <= ConditionKind.ck_Last; pl++) {
                 if (GKData.CondSigns[(int)pl] == condName) {
                     res = pl;
                     break;