Fix failing tests.

INL · Nov 8, 2024 · 147e0f0 · 147e0f0
1 parent 2d0752e
commit 147e0f0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/test/data/saved-responses-integrated/hits-grouped/group by capture.json b/test/data/saved-responses-integrated/hits-grouped/group by capture.json
@@ -150,7 +150,15 @@
           }
         ],
         "type": "sequence"
-      }
+      },
+      "matchInfos": {
+        "X": {
+          "type": "span"
+        }
+      },
+      "otherFields": [
+        "contents"
+      ]
     },
     "requestedWindowSize": 30,
     "searchParam": {
@@ -175,4 +183,4 @@
     "windowHasNext": false,
     "windowHasPrevious": false
   }
-}
+}
diff --git a/test/data/saved-responses/hits-grouped/group by capture.json b/test/data/saved-responses/hits-grouped/group by capture.json
@@ -150,7 +150,15 @@
           }
         ],
         "type": "sequence"
-      }
+      },
+      "matchInfos": {
+        "X": {
+          "type": "span"
+        }
+      },
+      "otherFields": [
+        "contents"
+      ]
     },
     "requestedWindowSize": 30,
     "searchParam": {
@@ -175,4 +183,4 @@
     "windowHasNext": false,
     "windowHasPrevious": false
   }
-}
+}
diff --git a/wslib/src/main/java/nl/inl/blacklab/server/lib/results/ResultHitsGrouped.java b/wslib/src/main/java/nl/inl/blacklab/server/lib/results/ResultHitsGrouped.java
@@ -128,7 +128,7 @@ public class ResultHitsGrouped {
         Set<String> otherFields = new HashSet<>();
         for (MatchInfo.Def def : matchInfoDefs) {
             otherFields.add(def.getField());
-            if (def.getTargetField() != null)
+            if (def.getTargetField() != null && !def.getTargetField().equals(hits.queryInfo().field().name()))
                 otherFields.add(def.getTargetField());
         }