Merge pull request #87 from thesaurus-linguae-aegyptiae/variants-1

Update ESQueryResult.java
thesaurus-linguae-aegyptiae · Jul 6, 2023 · c7cb417 · c7cb417
2 parents 8825c21 + 6d356e8
commit c7cb417
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/main/java/tla/backend/es/query/ESQueryResult.java b/src/main/java/tla/backend/es/query/ESQueryResult.java
@@ -3,9 +3,11 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.stream.Collectors;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.HashSet;
 
 import org.elasticsearch.search.aggregations.Aggregations;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms;
@@ -88,16 +90,19 @@ public void addAggregationResults(Map<String, Map<String, Long>> aggs) {
 	 * return total number of results.
 	 */
 	public long getHitCount() {
-		int i = 0;
+		Set<String> idSet = new HashSet<>();
+		int index;
 		Iterator<SearchHit<T>> iterator = hits.iterator();
 		while (iterator.hasNext()) {
 			SearchHit searchHit = (SearchHit) iterator.next();
 			String source = searchHit.getId();
-			if (!source.contains("-") || source.contains("-00")) {
-				i++;
+			index = source.indexOf("-");
+			if (index != -1) {
+				source = source.substring(0, index);
 			}
+			idSet.add(source);
 		}
-		return (long) i;
+		return (long) idSet.size();
 	}
 
 	/**