fixes conflict with lemma search

thesaurus-linguae-aegyptiae · Sep 7, 2023 · 3d03007 · 3d03007
1 parent e0ca205
commit 3d03007
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/src/main/java/tla/backend/es/query/SentenceSearchQueryBuilder.java b/src/main/java/tla/backend/es/query/SentenceSearchQueryBuilder.java
@@ -35,8 +35,7 @@ public void setContext(Context context) {
 
 	}
 
-	public void setTokenID(Collection<Token> tokens) {
-		System.out.println("tesst");
+/*	public void setTokens(Collection<Token> tokens) {
 		if (tokens != null) {
 			BoolQueryBuilder tokenQuery = boolQuery();
 			String tokenId = tokens.iterator().next().getId();
@@ -47,7 +46,8 @@ public void setTokenID(Collection<Token> tokens) {
 				this.filter(tokenQuery);
 			}
 		}
-	}
+	} */
+
 
 	public void setTokens(Collection<TokenSearchQueryBuilder> tokenQueries) {
 		BoolQueryBuilder tokenQuery = boolQuery();
@@ -58,6 +58,7 @@ public void setTokens(Collection<TokenSearchQueryBuilder> tokenQueries) {
 		this.filter(tokenQuery);
 	}
 
+
 	public void setPassport(PassportSpec spec) {
 		log.info("set sentence search passport specs");
 		if (spec != null && !spec.isEmpty()) {
@@ -72,7 +73,7 @@ public void setPassport(PassportSpec spec) {
 	// TODO
 	public void setTextIds(Collection<String> textIds) {
 		if (textIds != null) {
-			log.info("sentence query: receive {} text999999999999 IDs", textIds.size());
+			log.info("sentence query: receive {} text IDs", textIds.size());
 			this.filter(QueryBuilders.termsQuery("context.textId", textIds));
 		}
 	}

diff --git a/src/main/java/tla/backend/es/query/TokenSearchQueryBuilder.java b/src/main/java/tla/backend/es/query/TokenSearchQueryBuilder.java
@@ -6,20 +6,21 @@
 
 public class TokenSearchQueryBuilder extends ESQueryBuilder implements MultiLingQueryBuilder {
 
-    @Override
-    public String nestedPath() {
-        return "tokens.";
-    }
+	@Override
+	public String nestedPath() {
+		return "tokens.";
+	}
 
-    public void setLemma(Lemmatization lemma) {
-        if (lemma != null && !lemma.isEmpty()) {
-            this.must(
-                QueryBuilders.termQuery(
-                    String.format("%slemma.id", this.nestedPath()),
-                    lemma.getId()
-                )
-            );
-        }
-    }
+	public void setTokenId(String tokenId) {
+		if (tokenId != null) {
+			this.must(QueryBuilders.termQuery(String.format("%sid", this.nestedPath()), tokenId));
+		}
+	}
+
+	public void setLemma(Lemmatization lemma) {
+		if (lemma != null && !lemma.isEmpty()) {
+			this.must(QueryBuilders.termQuery(String.format("%slemma.id", this.nestedPath()), lemma.getId()));
+		}
+	}
 
 }