'#2163 Creates a map to store the correspondence between a query escaped

name of the field and its original name, that needs to be recovered when restoring defined filters.
sepinf-inc · Jun 5, 2024 · 3434d2d · 3434d2d
1 parent b77a2f4
commit 3434d2d
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/iped-app/src/main/java/iped/app/ui/TableHeaderFilterManager.java b/iped-app/src/main/java/iped/app/ui/TableHeaderFilterManager.java
@@ -40,6 +40,7 @@ public class TableHeaderFilterManager implements IResultSetFilterer, IQueryFilte
 
     // store the filters defined by the FieldValuePopupMenu
     private HashMap<String, String> otherFilters = new HashMap<String, String>();
+    private HashMap<String, String> escapedFields = new HashMap<String, String>();
 
     static public TableHeaderFilterManager get() {
         return singleton;
@@ -189,7 +190,9 @@ public MetadataSearch getMetadataSearch(String field) {
         MetadataSearch result = panels.get(field);
         if (result == null) {
             result = new MetadataSearch();
-            panels.put(field, result);
+            String escapedField = escape(field);
+            panels.put(escapedField, result);
+            escapedFields.put(escapedField, field);
         }
         return result;
     }
@@ -271,12 +274,12 @@ public IMultiSearchResult filterResult(IMultiSearchResult src) throws ParseExcep
                 for (String filterField : panels.keySet()) {
                     MetadataSearch internalMetadataSearch = panels.get(filterField);
                     Set<Integer> ords = new HashSet<>();
-                    Set<ValueCount> values = selectedValues.get(escape(filterField));
+                    Set<ValueCount> values = selectedValues.get(filterField);
                     if (values != null && values.size() > 0) {
                         for (ValueCount value : values) {
                             ords.add(value.getOrd());
                         }
-                        result = internalMetadataSearch.getIdsWithOrd(result, filterField, ords);
+                        result = internalMetadataSearch.getIdsWithOrd(result, escapedFields.get(filterField), ords);
                         if (result.getLength() <= 0) {
                             return result;
                         }