Use operation:override in query reference rewrite (#783)
Change-Id: Iaaaefcb325a4062fac7ef0e8adc243ffa70f5e95
diff --git a/src/main/java/de/ids_mannheim/korap/rewrite/QueryReferenceRewrite.java b/src/main/java/de/ids_mannheim/korap/rewrite/QueryReferenceRewrite.java
index c682e1b..0f6ff8c 100644
--- a/src/main/java/de/ids_mannheim/korap/rewrite/QueryReferenceRewrite.java
+++ b/src/main/java/de/ids_mannheim/korap/rewrite/QueryReferenceRewrite.java
@@ -91,11 +91,14 @@
private void rewriteQuery (JsonNode qref, KoralNode koralNode)
throws KustvaktException {
- JsonNode jsonNode = koralNode.rawNode();
- koralNode.remove("@type",
- new RewriteIdentifier("@type", "", jsonNode.at("/@type").asText()));
- koralNode.remove("ref",
- new RewriteIdentifier("ref", "", jsonNode.at("/ref").asText()));
- koralNode.setAll((ObjectNode) qref);
+ String source = koralNode.rawNode().toString();
+ JsonNode sourceNode = JsonUtils.readTree(source);
+ koralNode.replace(qref, new RewriteIdentifier(null, "", sourceNode));
+
+// koralNode.remove("@type",
+// new RewriteIdentifier("@type", "", jsonNode.at("/@type").asText()));
+// koralNode.remove("ref",
+// new RewriteIdentifier("ref", "", jsonNode.at("/ref").asText()));
+// koralNode.setAll((ObjectNode) qref);
}
}
diff --git a/src/main/java/de/ids_mannheim/korap/rewrite/VirtualCorpusRewrite.java b/src/main/java/de/ids_mannheim/korap/rewrite/VirtualCorpusRewrite.java
index d479bb5..41da0e2 100644
--- a/src/main/java/de/ids_mannheim/korap/rewrite/VirtualCorpusRewrite.java
+++ b/src/main/java/de/ids_mannheim/korap/rewrite/VirtualCorpusRewrite.java
@@ -4,7 +4,6 @@
import org.springframework.stereotype.Component;
import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
import de.ids_mannheim.korap.config.KustvaktConfiguration;
import de.ids_mannheim.korap.constant.QueryType;
@@ -103,7 +102,7 @@
koralNode.replace("ref", newRef, new RewriteIdentifier("ref", "", ref));
}
- private void rewriteVC (QueryDO vc, KoralNode koralNode)
+ protected void rewriteVC (QueryDO vc, KoralNode koralNode)
throws KustvaktException {
String koralQuery = vc.getKoralQuery();
JsonNode newKoralQuery = JsonUtils.readTree(koralQuery).at("/collection");