Changed focus and KoralQuery prefix
diff --git a/Changes b/Changes
index ed0ba02..a8ecb3d 100644
--- a/Changes
+++ b/Changes
@@ -18,7 +18,9 @@
renamed shrink() to focus(),
removed KorapPrimaryData,
fixed a lot of wrong tests for WithinSpans,
- renamed KorapFilter to /collection/CollectionBuilder (diewald)
+ renamed KorapFilter to /collection/CollectionBuilder,
+ renamed SpanMatchModify to SpanFocus,
+ changed KoralQuery root prefix to "koral" (diewald)
- [feature] Improved deserialization of SpanSubSpanQueries
(margaretha)
- [feature] Introducing the potential need for resorting queries
diff --git a/Readme.md b/Readme.md
index 87d2507..8f575a2 100644
--- a/Readme.md
+++ b/Readme.md
@@ -83,7 +83,7 @@
**Authors**: [Nils Diewald](http://nils-diewald.de/), Eliza Margaretha
-Copyright 2013-2015, IDS Mannheim, Germany
+Copyright (c) 2013-2015, IDS Mannheim, Germany
Krill is developed as part of the [KorAP](https://korap.ids-mannheim.de/)
Corpus Analysis Platform at the Institute for German Language
diff --git a/src/main/java/de/ids_mannheim/korap/KorapCollection.java b/src/main/java/de/ids_mannheim/korap/KorapCollection.java
index 68a9964..120580a 100644
--- a/src/main/java/de/ids_mannheim/korap/KorapCollection.java
+++ b/src/main/java/de/ids_mannheim/korap/KorapCollection.java
@@ -175,7 +175,7 @@
String type = json.get("@type").asText();
// Single filter
- if (type.equals("korap:doc")) {
+ if (type.equals("koral:doc")) {
String key = "tokens";
String valtype = "type:string";
@@ -225,7 +225,7 @@
}
// nested group
- else if (type.equals("korap:docGroup")) {
+ else if (type.equals("koral:docGroup")) {
if (!json.has("operands") || !json.get("operands").isArray())
throw new QueryException(612, "Groups need operands");
@@ -295,14 +295,14 @@
String type = json.get("@type").asText();
// Filter the collection
- if (type.equals("korap:meta-filter")) {
+ if (type.equals("koral:meta-filter")) {
if (DEBUG)
log.trace("Add Filter LEGACY");
this.filter(bf);
}
// Extend the collection
- else if (type.equals("korap:meta-extend")) {
+ else if (type.equals("koral:meta-extend")) {
if (DEBUG)
log.trace("Add Extend LEGACY");
this.extend(bf);
@@ -326,12 +326,12 @@
if (json.has("@field"))
field = _getFieldLegacy(json);
- if (type.equals("korap:term")) {
+ if (type.equals("koral:term")) {
if (field != null && json.has("@value"))
bfilter.and(field, json.get("@value").asText());
return bfilter;
}
- else if (type.equals("korap:group")) {
+ else if (type.equals("koral:group")) {
if (!json.has("relation"))
throw new QueryException(612, "Group needs relation");
@@ -797,7 +797,7 @@
return (String) null;
String field = json.get("@field").asText();
- return field.replaceFirst("korap:field#", "");
+ return field.replaceFirst("koral:field#", "");
};
@@ -815,7 +815,7 @@
if (!date.has("@type"))
return (String) null;
- if (!date.get("@type").asText().equals("korap:date"))
+ if (!date.get("@type").asText().equals("koral:date"))
return (String) null;
if (!date.has("@value"))
diff --git a/src/main/java/de/ids_mannheim/korap/KorapQuery.java b/src/main/java/de/ids_mannheim/korap/KorapQuery.java
index a3e1f86..d18d9cb 100644
--- a/src/main/java/de/ids_mannheim/korap/KorapQuery.java
+++ b/src/main/java/de/ids_mannheim/korap/KorapQuery.java
@@ -12,38 +12,10 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import de.ids_mannheim.korap.query.SpanWithinQuery;
-import de.ids_mannheim.korap.query.wrap.SpanAlterQueryWrapper;
-import de.ids_mannheim.korap.query.wrap.SpanAttributeQueryWrapper;
-import de.ids_mannheim.korap.query.wrap.SpanClassQueryWrapper;
-import de.ids_mannheim.korap.query.wrap.SpanElementQueryWrapper;
-import de.ids_mannheim.korap.query.wrap.SpanMatchModifyQueryWrapper;
-import de.ids_mannheim.korap.query.wrap.SpanQueryWrapper;
-import de.ids_mannheim.korap.query.wrap.SpanRegexQueryWrapper;
-import de.ids_mannheim.korap.query.wrap.SpanRepetitionQueryWrapper;
-import de.ids_mannheim.korap.query.wrap.SpanSegmentQueryWrapper;
-import de.ids_mannheim.korap.query.wrap.SpanSequenceQueryWrapper;
-import de.ids_mannheim.korap.query.wrap.SpanSimpleQueryWrapper;
-import de.ids_mannheim.korap.query.wrap.SpanSubspanQueryWrapper;
-import de.ids_mannheim.korap.query.wrap.SpanWildcardQueryWrapper;
-import de.ids_mannheim.korap.query.wrap.SpanWithAttributeQueryWrapper;
-import de.ids_mannheim.korap.query.wrap.SpanWithinQueryWrapper;
+import de.ids_mannheim.korap.query.wrap.*;
import de.ids_mannheim.korap.response.Notifications;
import de.ids_mannheim.korap.util.QueryException;
-/*
- Todo: All queries with a final right expansion
- der alte []
- should be wrapped in a contains(<base/s=t>) to ensure
- they are not outside the text.
-
- TODO: Create Pre-filter while preparing a Query.
- The pre-filter will contain a boolena query with all
- necessary terms, supporting boolean OR, ignoring
- negation terms (and negation subqueries), like
- [base=Der]([base=alte]|[base=junge])[base=Mann & p!=ADJA]![base=war | base=lag]
- Search for all documents containing "s:Der" and ("s:alte" or "s:junge") and "s:Mann"
-*/
-
/**
* KorapQuery implements a simple API for wrapping
* KorAP Lucene Index specific query classes and provides
@@ -70,6 +42,19 @@
* @author diewald
*
*/
+/*
+ Todo: All queries with a final right expansion
+ e.g. der alte []
+ should be wrapped in a contains(<base/s=t>) to ensure
+ they are not outside the text.
+
+ TODO: Create Pre-filter while preparing a Query.
+ The pre-filter will contain a boolena query with all
+ necessary terms, supporting boolean OR, ignoring
+ negation terms (and negation subqueries), like
+ [base=Der]([base=alte]|[base=junge])[base=Mann & p!=ADJA]![base=war | base=lag]
+ Search for all documents containing "s:Der" and ("s:alte" or "s:junge") and "s:Mann"
+*/
public class KorapQuery extends Notifications {
private String field;
private ObjectMapper json;
@@ -103,7 +88,7 @@
};
- // Private class for korap:boundary objects
+ // Private class for koral:boundary objects
private class Boundary {
public int min, max;
@@ -120,7 +105,7 @@
};
// Wrong @type defined
- if (!json.get("@type").asText().equals("korap:boundary"))
+ if (!json.get("@type").asText().equals("koral:boundary"))
throw new QueryException(702, "Boundary definition is invalid");
// Set min boundary
@@ -134,7 +119,7 @@
defaultMax;
if (DEBUG)
- log.trace("Found korap:boundary with {}:{}", min, max);
+ log.trace("Found koral:boundary with {}:{}", min, max);
};
};
@@ -145,8 +130,8 @@
* <p>
* <blockquote><pre>
* KorapQuery kq = new KorapQuery("tokens");
- * SpanQueryWrapper sqw = kq.fromJson('{"@type":"korap:token","wrap":{' +
- * '"@type":"korap:term","foundry":"opennlp",' +
+ * SpanQueryWrapper sqw = kq.fromJson('{"@type":"koral:token","wrap":{' +
+ * '"@type":"koral:term","foundry":"opennlp",' +
* '"key":"tree","layer":"orth",' +
* '"match":"match:eq"}}'
* );
@@ -199,10 +184,10 @@
String type = json.get("@type").asText();
switch (type) {
- case "korap:group":
+ case "koral:group":
return this._groupFromJson(json);
- case "korap:reference":
+ case "koral:reference":
if (json.has("operation") &&
!json.get("operation").asText().equals("operation:focus"))
throw new QueryException(712, "Unknown reference operation");
@@ -271,11 +256,11 @@
if (DEBUG) log.trace("Wrap class reference {}", number);
- return new SpanMatchModifyQueryWrapper(
+ return new SpanFocusQueryWrapper(
this.fromJson(operands.get(0)), number
);
- case "korap:token":
+ case "koral:token":
// The token is empty and should be treated like []
if (!json.has("wrap"))
return new SpanRepetitionQueryWrapper();
@@ -283,7 +268,7 @@
// Get wrapped token
return this._segFromJson(json.get("wrap"));
- case "korap:span":
+ case "koral:span":
return this._termFromJson(json);
};
@@ -292,7 +277,7 @@
};
- // Deserialize korap:group
+ // Deserialize koral:group
private SpanQueryWrapper _groupFromJson (JsonNode json) throws QueryException {
// No operation
@@ -338,7 +323,7 @@
case "operation:or": // Deprecated in favor of operation:junction
return this._operationJunctionFromJson(operands);
/*
- case "operation:submatch": // Deprecated in favor of korap:reference
+ case "operation:submatch": // Deprecated in favor of koral:reference
return this._operationSubmatchFromJson(json, operands);
*/
};
@@ -544,7 +529,7 @@
);
};
- return new SpanMatchModifyQueryWrapper(
+ return new SpanFocusQueryWrapper(
this.fromJson(operands.get(0)), number
);
};
@@ -664,7 +649,7 @@
};
JsonNode distances;
- if (firstDistance.get("@type").asText().equals("korap:group")) {
+ if (firstDistance.get("@type").asText().equals("koral:group")) {
if (!firstDistance.has("operands") ||
!firstDistance.get("operands").isArray())
throw new QueryException(704, "Operation needs operand list");
@@ -674,7 +659,7 @@
// Support korap distances
// Support cosmas distances
- else if (firstDistance.get("@type").asText().equals("korap:distance")
+ else if (firstDistance.get("@type").asText().equals("koral:distance")
||
firstDistance.get("@type").asText().equals("cosmas:distance")) {
distances = json.get("distances");
@@ -742,7 +727,7 @@
};
- // Deserialize korap:token
+ // Deserialize koral:token
private SpanQueryWrapper _segFromJson (JsonNode json) throws QueryException {
if (!json.has("@type"))
throw new QueryException(701, "JSON-LD group has no @type attribute");
@@ -754,7 +739,7 @@
// Branch on type
switch (type) {
- case "korap:term":
+ case "koral:term":
// String match = "match:eq";
// if (json.has("match"))
// match = json.get("match").asText();
@@ -778,7 +763,7 @@
//
// throw new QueryException(741, "Match relation unknown");
- case "korap:termGroup":
+ case "koral:termGroup":
if (!json.has("operands"))
throw new QueryException(742, "Term group needs operand list");
@@ -827,7 +812,7 @@
};
- // Deserialize korap:term
+ // Deserialize koral:term
private SpanQueryWrapper _termFromJson (JsonNode json)
throws QueryException {
@@ -844,7 +829,7 @@
);
};
- Boolean isTerm = json.get("@type").asText().equals("korap:term") ? true : false;
+ Boolean isTerm = json.get("@type").asText().equals("koral:term") ? true : false;
Boolean isCaseInsensitive = false;
if (json.has("caseInsensitive") && json.get("caseInsensitive").asBoolean())
@@ -972,7 +957,7 @@
if (elementWithIdWrapper == null) return null;
}
- if (attrNode.get("@type").asText().equals("korap:term")) {
+ if (attrNode.get("@type").asText().equals("koral:term")) {
SpanQueryWrapper attrWrapper = _attrFromJson(json.get("attr"));
if (attrWrapper != null) {
return new SpanWithAttributeQueryWrapper(
@@ -982,7 +967,7 @@
throw new QueryException(747, "Attribute is null");
}
}
- else if (attrNode.get("@type").asText().equals("korap:termGroup")) {
+ else if (attrNode.get("@type").asText().equals("koral:termGroup")) {
if (!attrNode.has("relation")) {
throw new QueryException(743, "Term group expects a relation");
}
@@ -1378,21 +1363,21 @@
return new SpanClassQueryWrapper(element);
};
- // MatchModify
- public SpanMatchModifyQueryWrapper focus (byte number, SpanQueryWrapper element) {
- return new SpanMatchModifyQueryWrapper(element, number);
+ // Focus
+ public SpanFocusQueryWrapper focus (byte number, SpanQueryWrapper element) {
+ return new SpanFocusQueryWrapper(element, number);
};
- public SpanMatchModifyQueryWrapper focus (int number, SpanQueryWrapper element) {
- return new SpanMatchModifyQueryWrapper(element, number);
+ public SpanFocusQueryWrapper focus (int number, SpanQueryWrapper element) {
+ return new SpanFocusQueryWrapper(element, number);
};
- public SpanMatchModifyQueryWrapper focus (short number, SpanQueryWrapper element) {
- return new SpanMatchModifyQueryWrapper(element, number);
+ public SpanFocusQueryWrapper focus (short number, SpanQueryWrapper element) {
+ return new SpanFocusQueryWrapper(element, number);
};
- public SpanMatchModifyQueryWrapper focus (SpanQueryWrapper element) {
- return new SpanMatchModifyQueryWrapper(element);
+ public SpanFocusQueryWrapper focus (SpanQueryWrapper element) {
+ return new SpanFocusQueryWrapper(element);
};
// Repetition
diff --git a/src/main/java/de/ids_mannheim/korap/KorapResult.java b/src/main/java/de/ids_mannheim/korap/KorapResult.java
index 3636aa7..1cba877 100644
--- a/src/main/java/de/ids_mannheim/korap/KorapResult.java
+++ b/src/main/java/de/ids_mannheim/korap/KorapResult.java
@@ -24,7 +24,7 @@
/**
* Response class for search results.
*
- * TODO: Synopsis
+ * TODO: Synopsis and let it base on KoralQuery
*
* @author diewald
* @see KorapResponse
diff --git a/src/main/java/de/ids_mannheim/korap/query/SpanMatchModifyClassQuery.java b/src/main/java/de/ids_mannheim/korap/query/SpanFocusQuery.java
similarity index 76%
rename from src/main/java/de/ids_mannheim/korap/query/SpanMatchModifyClassQuery.java
rename to src/main/java/de/ids_mannheim/korap/query/SpanFocusQuery.java
index 3f42322..03ef1f3 100644
--- a/src/main/java/de/ids_mannheim/korap/query/SpanMatchModifyClassQuery.java
+++ b/src/main/java/de/ids_mannheim/korap/query/SpanFocusQuery.java
@@ -32,28 +32,28 @@
*
* @see MatchModifyClassSpans
*/
-public class SpanMatchModifyClassQuery extends SpanClassQuery {
+public class SpanFocusQuery extends SpanClassQuery {
/**
- * Construct a new SpanMatchModifyClassQuery.
+ * Construct a new SpanFocusQuery.
*
* @param operand The nested {@link SpanQuery}, that contains one or
* more classed spans.
* @param number The class number to focus on.
*/
- public SpanMatchModifyClassQuery (SpanQuery operand, byte number) {
+ public SpanFocusQuery (SpanQuery operand, byte number) {
super(operand, number);
};
/**
- * Construct a new SpanMatchModifyClassQuery.
+ * Construct a new SpanFocusQuery.
* The class to focus on defaults to <tt>1</tt>.
*
* @param operand The nested {@link SpanQuery}, that contains one or
* more classed spans.
*/
- public SpanMatchModifyClassQuery (SpanQuery operand) {
+ public SpanFocusQuery (SpanQuery operand) {
this(operand, (byte) 1);
};
@@ -87,7 +87,7 @@
@Override
public Query rewrite (IndexReader reader) throws IOException {
- SpanMatchModifyClassQuery clone = null;
+ SpanFocusQuery clone = null;
SpanQuery query = (SpanQuery) this.operand.rewrite(reader);
if (query != this.operand) {
@@ -104,27 +104,29 @@
@Override
- public SpanMatchModifyClassQuery clone() {
- SpanMatchModifyClassQuery spanMatchQuery = new SpanMatchModifyClassQuery(
+ public SpanFocusQuery clone() {
+ SpanFocusQuery spanFocusQuery = new SpanFocusQuery(
(SpanQuery) this.operand.clone(),
this.number
);
- spanMatchQuery.setBoost(getBoost());
- return spanMatchQuery;
+ spanFocusQuery.setBoost(getBoost());
+ return spanFocusQuery;
};
@Override
public boolean equals (Object o) {
if (this == o) return true;
- if (!(o instanceof SpanMatchModifyClassQuery)) return false;
+ if (!(o instanceof SpanFocusQuery)) return false;
- final SpanMatchModifyClassQuery spanMatchModifyClassQuery =
- (SpanMatchModifyClassQuery) o;
+ final SpanFocusQuery spanFocusQuery =
+ (SpanFocusQuery) o;
- if (!this.operand.equals(spanMatchModifyClassQuery.operand)) return false;
- if (this.number != spanMatchModifyClassQuery.number) return false;
- return getBoost() == spanMatchModifyClassQuery.getBoost();
+ if (!this.operand.equals(spanFocusQuery.operand)) return false;
+ if (this.number != spanFocusQuery.number) return false;
+
+ // Probably not necessary
+ return getBoost() == spanFocusQuery.getBoost();
};
diff --git a/src/main/java/de/ids_mannheim/korap/query/wrap/SpanMatchModifyQueryWrapper.java b/src/main/java/de/ids_mannheim/korap/query/wrap/SpanFocusQueryWrapper.java
similarity index 73%
rename from src/main/java/de/ids_mannheim/korap/query/wrap/SpanMatchModifyQueryWrapper.java
rename to src/main/java/de/ids_mannheim/korap/query/wrap/SpanFocusQueryWrapper.java
index f9cafc9..19269ae 100644
--- a/src/main/java/de/ids_mannheim/korap/query/wrap/SpanMatchModifyQueryWrapper.java
+++ b/src/main/java/de/ids_mannheim/korap/query/wrap/SpanFocusQueryWrapper.java
@@ -4,7 +4,7 @@
import de.ids_mannheim.korap.util.QueryException;
-import de.ids_mannheim.korap.query.SpanMatchModifyClassQuery;
+import de.ids_mannheim.korap.query.SpanFocusQuery;
import de.ids_mannheim.korap.query.wrap.SpanQueryWrapper;
import java.util.*;
@@ -20,26 +20,26 @@
// On processing, there should be an ability to raise
// a warning, in case an unordered result bubbles up.
-public class SpanMatchModifyQueryWrapper extends SpanQueryWrapper {
+public class SpanFocusQueryWrapper extends SpanQueryWrapper {
private SpanQueryWrapper subquery;
private byte number;
- public SpanMatchModifyQueryWrapper (SpanQueryWrapper subquery, byte number) {
+ public SpanFocusQueryWrapper (SpanQueryWrapper subquery, byte number) {
this.subquery = subquery;
this.number = number;
};
- public SpanMatchModifyQueryWrapper (SpanQueryWrapper subquery, short number) {
+ public SpanFocusQueryWrapper (SpanQueryWrapper subquery, short number) {
this.subquery = subquery;
this.number = (byte) number;
};
- public SpanMatchModifyQueryWrapper (SpanQueryWrapper subquery, int number) {
+ public SpanFocusQueryWrapper (SpanQueryWrapper subquery, int number) {
this.subquery = subquery;
this.number = (byte) number;
};
- public SpanMatchModifyQueryWrapper (SpanQueryWrapper subquery) {
+ public SpanFocusQueryWrapper (SpanQueryWrapper subquery) {
this.subquery = subquery;
this.number = (byte) 1;
};
@@ -47,7 +47,7 @@
public SpanQuery toQuery () throws QueryException {
if (this.subquery.isNull())
return (SpanQuery) null;
- return new SpanMatchModifyClassQuery(
+ return new SpanFocusQuery(
this.subquery.retrieveNode(this.retrieveNode).toQuery(), this.number
);
};
diff --git a/src/test/java/de/ids_mannheim/korap/index/TestFieldDocument.java b/src/test/java/de/ids_mannheim/korap/index/TestFieldDocument.java
index 9e0318e..df3c6f3 100644
--- a/src/test/java/de/ids_mannheim/korap/index/TestFieldDocument.java
+++ b/src/test/java/de/ids_mannheim/korap/index/TestFieldDocument.java
@@ -23,7 +23,6 @@
import de.ids_mannheim.korap.KorapMatch;
import de.ids_mannheim.korap.KorapDocument;
import de.ids_mannheim.korap.query.SpanNextQuery;
-import de.ids_mannheim.korap.query.SpanMatchModifyClassQuery;
import de.ids_mannheim.korap.query.SpanClassQuery;
import de.ids_mannheim.korap.index.FieldDocument;
import de.ids_mannheim.korap.model.MultiTermTokenStream;
diff --git a/src/test/java/de/ids_mannheim/korap/index/TestMatchCollector.java b/src/test/java/de/ids_mannheim/korap/index/TestMatchCollector.java
index 2a733da..854f6f6 100644
--- a/src/test/java/de/ids_mannheim/korap/index/TestMatchCollector.java
+++ b/src/test/java/de/ids_mannheim/korap/index/TestMatchCollector.java
@@ -20,7 +20,6 @@
import de.ids_mannheim.korap.KorapCollection;
import de.ids_mannheim.korap.KorapSearch;
import de.ids_mannheim.korap.query.SpanNextQuery;
-import de.ids_mannheim.korap.query.SpanMatchModifyClassQuery;
import de.ids_mannheim.korap.query.SpanClassQuery;
import de.ids_mannheim.korap.index.FieldDocument;
import de.ids_mannheim.korap.model.MultiTermTokenStream;
diff --git a/src/test/java/de/ids_mannheim/korap/index/TestMatchIndex.java b/src/test/java/de/ids_mannheim/korap/index/TestMatchIndex.java
index 75c407f..7de423b 100644
--- a/src/test/java/de/ids_mannheim/korap/index/TestMatchIndex.java
+++ b/src/test/java/de/ids_mannheim/korap/index/TestMatchIndex.java
@@ -73,7 +73,7 @@
assertEquals("SnippetBrackets (0)", "... bcabca[b{1:a}]c", kr.getMatch(0).getSnippetBrackets());
assertEquals("Test no 'more' context", "<span class=\"context-left\"><span class=\"more\"></span>bcabca</span><span class=\"match\">b<em class=\"class-1 level-0\">a</em></span><span class=\"context-right\">c</span>", kr.getMatch(0).getSnippetHTML());
- sq = new SpanMatchModifyClassQuery(
+ sq = new SpanFocusQuery(
new SpanNextQuery(
new SpanTermQuery(new Term("base", "s:b")),
new SpanClassQuery(
@@ -87,7 +87,7 @@
assertEquals("StartPos (0)", 8, kr.getMatch(0).startPos);
assertEquals("EndPos (0)", 9, kr.getMatch(0).endPos);
assertEquals("SnippetBrackets (0)", "... cabcab[{1:a}]c", kr.getMatch(0).getSnippetBrackets());
- sq = new SpanMatchModifyClassQuery(
+ sq = new SpanFocusQuery(
new SpanNextQuery(
new SpanClassQuery(new SpanTermQuery(new Term("base", "s:a")), (byte) 2),
new SpanClassQuery(new SpanTermQuery(new Term("base", "s:b")), (byte) 3)
@@ -117,7 +117,7 @@
// abcabcabac
- sq = new SpanMatchModifyClassQuery(
+ sq = new SpanFocusQuery(
new SpanNextQuery(
new SpanTermQuery(new Term("base", "s:a")),
new SpanClassQuery(
@@ -148,7 +148,7 @@
assertEquals("SnippetHTML (0) 2", "<span class=\"context-left\"><span class=\"more\"></span>a</span><span class=\"match\"><em class=\"class-2 level-0\">b<em class=\"class-1 level-1\">a</em></em></span><span class=\"context-right\"><span class=\"more\"></span></span>", kr.getMatch(0).getSnippetHTML());
- sq = new SpanMatchModifyClassQuery(
+ sq = new SpanFocusQuery(
new SpanClassQuery(
new SpanNextQuery(
new SpanClassQuery(new SpanTermQuery(new Term("base", "s:b")), (byte) 1),
@@ -171,7 +171,7 @@
assertEquals("Token count", 10, ki.numberOf("base", "t"));
// Don't match the expected class!
- sq = new SpanMatchModifyClassQuery(
+ sq = new SpanFocusQuery(
new SpanNextQuery(
new SpanClassQuery(new SpanTermQuery(new Term("base", "s:b")), (byte) 1),
new SpanClassQuery(new SpanTermQuery(new Term("base", "s:c")), (byte) 2)
@@ -182,7 +182,7 @@
assertEquals("totalResults", kr.getTotalResults(), 0);
- sq = new SpanMatchModifyClassQuery(
+ sq = new SpanFocusQuery(
new SpanNextQuery(
new SpanTermQuery(new Term("base", "s:a")),
new SpanClassQuery(
@@ -322,7 +322,7 @@
SpanQuery sq;
KorapResult kr;
- sq = new SpanMatchModifyClassQuery(
+ sq = new SpanFocusQuery(
new SpanNextQuery(
new SpanClassQuery(new SpanTermQuery(new Term("base", "s:a")), (byte) 2),
new SpanClassQuery(new SpanTermQuery(new Term("base", "s:b")), (byte) 3)
@@ -338,8 +338,8 @@
assertEquals("EndPos (0)", 2, km.endPos);
assertEquals("SnippetBrackets (0)", "a[{3:b}]cabcab ...", km.getSnippetBrackets());
- sq = new SpanMatchModifyClassQuery(
- new SpanMatchModifyClassQuery(
+ sq = new SpanFocusQuery(
+ new SpanFocusQuery(
new SpanNextQuery(
new SpanClassQuery(new SpanTermQuery(new Term("base", "s:a")), (byte) 2),
new SpanClassQuery(new SpanTermQuery(new Term("base", "s:b")), (byte) 3)
@@ -391,7 +391,7 @@
assertEquals(kr.getQuery(), "spanContain({2: <base:s />}, {3: base:s:b})");
assertEquals(kr.getMatch(0).getSnippetBrackets(), "a[{2:{3:b}cab}]cabac");
- sq = new SpanMatchModifyClassQuery(
+ sq = new SpanFocusQuery(
new SpanWithinQuery(
new SpanClassQuery(new SpanElementQuery("base", "s"), (byte) 2),
new SpanClassQuery(new SpanTermQuery(new Term("base", "s:b")), (byte) 3)
@@ -477,7 +477,7 @@
// within(<p>, focus(3:within({2:<s>}, {3:a})))
sq = new SpanWithinQuery(
new SpanElementQuery("base", "p"),
- new SpanMatchModifyClassQuery(
+ new SpanFocusQuery(
new SpanWithinQuery(
new SpanClassQuery(new SpanElementQuery("base", "s"), (byte) 2),
new SpanClassQuery(new SpanTermQuery(new Term("base", "s:a")), (byte) 3)
diff --git a/src/test/java/de/ids_mannheim/korap/query/TestKorapQueryJSON.java b/src/test/java/de/ids_mannheim/korap/query/TestKorapQueryJSON.java
index 4478375..a244f6a 100644
--- a/src/test/java/de/ids_mannheim/korap/query/TestKorapQueryJSON.java
+++ b/src/test/java/de/ids_mannheim/korap/query/TestKorapQueryJSON.java
@@ -184,7 +184,7 @@
@Test
public void queryJSONDemo () throws QueryException {
- SpanQueryWrapper sqwi = new KorapQuery("tokens").fromJson("{ \"query\" : { \"@type\" : \"korap:token\", \"wrap\" : { \"@type\" : \"korap:term\", \"foundry\" : \"base\", \"layer\" : \"p\", \"key\" : \"foo\", \"match\" : \"match:eq\" }}}");
+ SpanQueryWrapper sqwi = new KorapQuery("tokens").fromJson("{ \"query\" : { \"@type\" : \"koral:token\", \"wrap\" : { \"@type\" : \"koral:term\", \"foundry\" : \"base\", \"layer\" : \"p\", \"key\" : \"foo\", \"match\" : \"match:eq\" }}}");
assertEquals(sqwi.toQuery().toString(), "tokens:base/p:foo");
};
diff --git a/src/test/java/de/ids_mannheim/korap/search/TestKorapResult.java b/src/test/java/de/ids_mannheim/korap/search/TestKorapResult.java
index 0357cca..debd89d 100644
--- a/src/test/java/de/ids_mannheim/korap/search/TestKorapResult.java
+++ b/src/test/java/de/ids_mannheim/korap/search/TestKorapResult.java
@@ -171,17 +171,17 @@
assertEquals("char", res.at("/request/meta/context/right/0").asText());
assertEquals(6, res.at("/request/meta/context/right/1").asInt());
- assertEquals("korap:group", res.at("/request/query/@type").asText());
+ assertEquals("koral:group", res.at("/request/query/@type").asText());
assertEquals("operation:or", res.at("/request/query/operation").asText());
- assertEquals("korap:token", res.at("/request/query/operands/0/@type").asText());
- assertEquals("korap:term", res.at("/request/query/operands/0/wrap/@type").asText());
+ assertEquals("koral:token", res.at("/request/query/operands/0/@type").asText());
+ assertEquals("koral:term", res.at("/request/query/operands/0/wrap/@type").asText());
assertEquals("orth", res.at("/request/query/operands/0/wrap/layer").asText());
assertEquals("a", res.at("/request/query/operands/0/wrap/key").asText());
assertEquals("match:eq", res.at("/request/query/operands/0/wrap/match").asText());
- assertEquals("korap:token", res.at("/request/query/operands/1/@type").asText());
- assertEquals("korap:term", res.at("/request/query/operands/1/wrap/@type").asText());
+ assertEquals("koral:token", res.at("/request/query/operands/1/@type").asText());
+ assertEquals("koral:term", res.at("/request/query/operands/1/wrap/@type").asText());
assertEquals("orth", res.at("/request/query/operands/1/wrap/layer").asText());
assertEquals("b", res.at("/request/query/operands/1/wrap/key").asText());
assertEquals("match:eq", res.at("/request/query/operands/1/wrap/match").asText());
diff --git a/src/test/resources/queries/attribute/any-element-with-attribute.jsonld b/src/test/resources/queries/attribute/any-element-with-attribute.jsonld
index 25b39b4..ead458e 100644
--- a/src/test/resources/queries/attribute/any-element-with-attribute.jsonld
+++ b/src/test/resources/queries/attribute/any-element-with-attribute.jsonld
@@ -5,11 +5,11 @@
"messages": [],
"collection": {},
"query": {
- "@type": "korap:span",
+ "@type": "koral:span",
"attr": {
- "@type": "korap:term",
+ "@type": "koral:term",
"arity": {
- "@type": "korap:boundary",
+ "@type": "koral:boundary",
"min": 2,
"max": 2
}
diff --git a/src/test/resources/queries/attribute/element-multiple-and-not-attributes.jsonld b/src/test/resources/queries/attribute/element-multiple-and-not-attributes.jsonld
index cd18b96..127876c 100644
--- a/src/test/resources/queries/attribute/element-multiple-and-not-attributes.jsonld
+++ b/src/test/resources/queries/attribute/element-multiple-and-not-attributes.jsonld
@@ -5,26 +5,26 @@
"messages": [],
"collection": {},
"query": {
- "@type": "korap:span",
+ "@type": "koral:span",
"key": "div",
"attr": {
- "@type": "korap:termGroup",
+ "@type": "koral:termGroup",
"relation": "relation:and",
"operands": [
{
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "type",
"key": "Zeitschrift",
"match": "match:eq"
},
{
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "complete",
"key": "Y",
"match": "match:ne"
},
{
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "n",
"key": "0",
"match": "match:eq"
diff --git a/src/test/resources/queries/attribute/element-multiple-or-attributes.jsonld b/src/test/resources/queries/attribute/element-multiple-or-attributes.jsonld
index c194f21..1f1291e 100644
--- a/src/test/resources/queries/attribute/element-multiple-or-attributes.jsonld
+++ b/src/test/resources/queries/attribute/element-multiple-or-attributes.jsonld
@@ -5,26 +5,26 @@
"messages": [],
"collection": {},
"query": {
- "@type": "korap:span",
+ "@type": "koral:span",
"key": "div",
"attr": {
- "@type": "korap:termGroup",
+ "@type": "koral:termGroup",
"relation": "relation:or",
"operands": [
{
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "type",
"key": "Zeitschrift",
"match": "match:eq"
},
{
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "complete",
"key": "Y",
"match": "match:eq"
},
{
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "n",
"key": "0",
"match": "match:eq"
diff --git a/src/test/resources/queries/attribute/element-single-attribute.jsonld b/src/test/resources/queries/attribute/element-single-attribute.jsonld
index 9f21989..4ffe13c 100644
--- a/src/test/resources/queries/attribute/element-single-attribute.jsonld
+++ b/src/test/resources/queries/attribute/element-single-attribute.jsonld
@@ -5,10 +5,10 @@
"messages": [],
"collection": {},
"query": {
- "@type": "korap:span",
+ "@type": "koral:span",
"key": "head",
"attr": {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "type",
"key": "top",
"match": "match:eq"
diff --git a/src/test/resources/queries/attribute/element-single-not-attribute.jsonld b/src/test/resources/queries/attribute/element-single-not-attribute.jsonld
index c4e8714..12ada99 100644
--- a/src/test/resources/queries/attribute/element-single-not-attribute.jsonld
+++ b/src/test/resources/queries/attribute/element-single-not-attribute.jsonld
@@ -5,10 +5,10 @@
"messages": [],
"collection": {},
"query": {
- "@type": "korap:span",
+ "@type": "koral:span",
"key": "head",
"attr": {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "type",
"key": "top",
"match": "match:ne"
diff --git a/src/test/resources/queries/benchmark1.jsonld b/src/test/resources/queries/benchmark1.jsonld
index dccdeef..f86b550 100644
--- a/src/test/resources/queries/benchmark1.jsonld
+++ b/src/test/resources/queries/benchmark1.jsonld
@@ -1,20 +1,20 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:group",
+ "@type": "koral:group",
"operation": "operation:position",
"frames": ["frames:isAround"],
"operands": [
{
- "@type": "korap:span",
+ "@type": "koral:span",
"layer" : "c",
"foundry" : "cnx",
"key": "np"
},
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap" : {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry": "mate",
"layer": "pos",
"key" : "NE"
diff --git a/src/test/resources/queries/benchmark1b.jsonld b/src/test/resources/queries/benchmark1b.jsonld
index 5ee9791..3923f21 100644
--- a/src/test/resources/queries/benchmark1b.jsonld
+++ b/src/test/resources/queries/benchmark1b.jsonld
@@ -1,25 +1,25 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:group",
+ "@type": "koral:group",
"operation": "operation:position",
"frames": ["frames:isAround"],
"operands": [
{
- "@type": "korap:span",
+ "@type": "koral:span",
"layer" : "c",
"foundry" : "cnx",
"key": "np"
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:class",
"classOut" : 1,
"operands" : [
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap" : {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry": "mate",
"layer": "pos",
"key" : "NE"
diff --git a/src/test/resources/queries/benchmark2.jsonld b/src/test/resources/queries/benchmark2.jsonld
index 81c1016..4c72b49 100644
--- a/src/test/resources/queries/benchmark2.jsonld
+++ b/src/test/resources/queries/benchmark2.jsonld
@@ -1,9 +1,9 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap" : {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "orth",
"key" : "Buchstabe"
}
diff --git a/src/test/resources/queries/benchmark3.jsonld b/src/test/resources/queries/benchmark3.jsonld
index 36acfe9..84da4d9 100644
--- a/src/test/resources/queries/benchmark3.jsonld
+++ b/src/test/resources/queries/benchmark3.jsonld
@@ -1,22 +1,22 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:group",
+ "@type": "koral:group",
"operation": "operation:sequence",
"operands": [
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap" : {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry": "mate",
"layer": "pos",
"key" : "ADJA"
}
},
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap" : {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry": "mate",
"layer": "pos",
"key" : "NE"
diff --git a/src/test/resources/queries/benchmark5-ohne.jsonld b/src/test/resources/queries/benchmark5-ohne.jsonld
index 725be7a..ddba8d6 100644
--- a/src/test/resources/queries/benchmark5-ohne.jsonld
+++ b/src/test/resources/queries/benchmark5-ohne.jsonld
@@ -1,29 +1,29 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:group",
+ "@type": "koral:group",
"operation": "operation:sequence",
"operands": [
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap" : {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "orth",
"key" : "der"
}
},
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap" : {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "orth",
"key" : "Mann"
}
},
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap" : {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "orth",
"key" : "und"
}
diff --git a/src/test/resources/queries/benchmark5-submatch.jsonld b/src/test/resources/queries/benchmark5-submatch.jsonld
index 885b458..b38c116 100644
--- a/src/test/resources/queries/benchmark5-submatch.jsonld
+++ b/src/test/resources/queries/benchmark5-submatch.jsonld
@@ -1,47 +1,47 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:group",
+ "@type": "koral:group",
"operation": "operation:sequence",
"operands": [
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap" : {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "orth",
"key" : "der"
}
},
{
- "@type" : "korap:reference",
+ "@type" : "koral:reference",
"classRef" : [2],
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:class",
"classOut" : 1,
"operands" : [
{
- "@type": "korap:group",
+ "@type": "koral:group",
"operation": "operation:sequence",
"operands" : [
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap" : {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "orth",
"key" : "Mann"
}
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:class",
"classOut" : 2,
"operands" : [
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap" : {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "orth",
"key" : "und"
}
diff --git a/src/test/resources/queries/benchmark5.jsonld b/src/test/resources/queries/benchmark5.jsonld
index 1f64527..dfd0894 100644
--- a/src/test/resources/queries/benchmark5.jsonld
+++ b/src/test/resources/queries/benchmark5.jsonld
@@ -1,43 +1,43 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:group",
+ "@type": "koral:group",
"operation": "operation:sequence",
"operands": [
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap" : {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "orth",
"key" : "der"
}
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:class",
"classOut" : 1,
"operands" : [
{
- "@type": "korap:group",
+ "@type": "koral:group",
"operation": "operation:sequence",
"operands" : [
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap" : {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "orth",
"key" : "Mann"
}
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:class",
"classOut" : 2,
"operands" : [
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap" : {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "orth",
"key" : "und"
}
diff --git a/src/test/resources/queries/bsp-boundary.jsonld b/src/test/resources/queries/bsp-boundary.jsonld
index f93fa14..4f72f4a 100644
--- a/src/test/resources/queries/bsp-boundary.jsonld
+++ b/src/test/resources/queries/bsp-boundary.jsonld
@@ -1 +1 @@
-{"@context":"http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld","errors":[],"warnings":[],"announcements":["Deprecated 2014-07-24: 'min' and 'max' to be supported until 3 months from deprecation date."],"query":{"@type":"korap:group","operation":"operation:sequence","operands":[{"@type":"korap:token","wrap":{"@type":"korap:term","layer":"orth","key":"Tal","match":"match:eq"}},{"@type":"korap:token","wrap":{"@type":"korap:term","layer":"orth","key":"Wald","match":"match:eq"}}],"inOrder":true,"distances":[{"@type":"korap:distance","key":"w","boundary":{"@type":"korap:boundary","min":2},"min":2}]},"collections":[{"@type":"korap:meta-filter","@value":{"@type":"korap:term","@field":"korap:field#corpusID","@value":"WPD"}}],"meta":{"startPage":1,"itemsPerResource":1,"context":"paragraph"}}
+{"@context":"http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld","errors":[],"warnings":[],"announcements":["Deprecated 2014-07-24: 'min' and 'max' to be supported until 3 months from deprecation date."],"query":{"@type":"koral:group","operation":"operation:sequence","operands":[{"@type":"koral:token","wrap":{"@type":"koral:term","layer":"orth","key":"Tal","match":"match:eq"}},{"@type":"koral:token","wrap":{"@type":"koral:term","layer":"orth","key":"Wald","match":"match:eq"}}],"inOrder":true,"distances":[{"@type":"koral:distance","key":"w","boundary":{"@type":"koral:boundary","min":2},"min":2}]},"collections":[{"@type":"koral:meta-filter","@value":{"@type":"koral:term","@field":"koral:field#corpusID","@value":"WPD"}}],"meta":{"startPage":1,"itemsPerResource":1,"context":"paragraph"}}
diff --git a/src/test/resources/queries/bsp-bug.jsonld b/src/test/resources/queries/bsp-bug.jsonld
index e46374e..10fa11c 100644
--- a/src/test/resources/queries/bsp-bug.jsonld
+++ b/src/test/resources/queries/bsp-bug.jsonld
@@ -1,7 +1,7 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:reference",
+ "@type": "koral:reference",
"classRef" : [0],
"operands" : []
},
diff --git a/src/test/resources/queries/bsp-class-2.jsonld b/src/test/resources/queries/bsp-class-2.jsonld
index 4cccfa5..3e5f01a 100644
--- a/src/test/resources/queries/bsp-class-2.jsonld
+++ b/src/test/resources/queries/bsp-class-2.jsonld
@@ -1,13 +1,13 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:class",
"classOut" : 0,
"operands" : [ {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Straße",
"layer" : "l",
"foundry" : "cnx",
diff --git a/src/test/resources/queries/bsp-class.jsonld b/src/test/resources/queries/bsp-class.jsonld
index f095a47..708862a 100644
--- a/src/test/resources/queries/bsp-class.jsonld
+++ b/src/test/resources/queries/bsp-class.jsonld
@@ -1,18 +1,18 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query":{
- "@type":"korap:group",
+ "@type":"koral:group",
"operation" : "operation:class",
"classOut":1,
"operands":[
{
- "@type":"korap:group",
+ "@type":"koral:group",
"operation" : "operation:sequence",
"operands":[
{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry":"tt",
"layer" : "pos",
"key" : "ADJA",
@@ -20,9 +20,9 @@
}
},
{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry":"mate",
"layer" : "p",
"key" : "NN",
@@ -33,5 +33,5 @@
}
]
},
- "collections":[{"@type":"korap:meta-filter","@value":{"@type":"korap:term","@field":"korap:field#corpusID","@value":"WPD"}}],
+ "collections":[{"@type":"koral:meta-filter","@value":{"@type":"koral:term","@field":"koral:field#corpusID","@value":"WPD"}}],
"meta":{"startPage":1,"count":50,"context":{"left":["token",6],"right":["token",6]}}}
diff --git a/src/test/resources/queries/bsp-context-2.jsonld b/src/test/resources/queries/bsp-context-2.jsonld
index ceed6ac..481ab44 100644
--- a/src/test/resources/queries/bsp-context-2.jsonld
+++ b/src/test/resources/queries/bsp-context-2.jsonld
@@ -1,9 +1,9 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query":{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry" : "mate",
"layer":"l",
"key":"wert",
@@ -12,10 +12,10 @@
},
"collections":[
{
- "@type":"korap:meta-filter",
+ "@type":"koral:meta-filter",
"@value":{
- "@type":"korap:term",
- "@field":"korap:field#corpusID",
+ "@type":"koral:term",
+ "@field":"koral:field#corpusID",
"@value":"WPD"
}
}
diff --git a/src/test/resources/queries/bsp-context-sentence.jsonld b/src/test/resources/queries/bsp-context-sentence.jsonld
index 123ce0b..28488b3 100644
--- a/src/test/resources/queries/bsp-context-sentence.jsonld
+++ b/src/test/resources/queries/bsp-context-sentence.jsonld
@@ -1,9 +1,9 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query":{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry" : "mate",
"layer":"l",
"key":"wert",
@@ -12,10 +12,10 @@
},
"collections":[
{
- "@type":"korap:meta-filter",
+ "@type":"koral:meta-filter",
"@value":{
- "@type":"korap:term",
- "@field":"korap:field#corpusID",
+ "@type":"koral:term",
+ "@field":"koral:field#corpusID",
"@value":"WPD"
}
}
diff --git a/src/test/resources/queries/bsp-context.jsonld b/src/test/resources/queries/bsp-context.jsonld
index cd1ed3e..cd07ea1 100644
--- a/src/test/resources/queries/bsp-context.jsonld
+++ b/src/test/resources/queries/bsp-context.jsonld
@@ -1,9 +1,9 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry": "mate",
"layer" : "l",
"key" : "alphabet",
diff --git a/src/test/resources/queries/bsp-cutoff.jsonld b/src/test/resources/queries/bsp-cutoff.jsonld
index 6c8da96..9bb9262 100644
--- a/src/test/resources/queries/bsp-cutoff.jsonld
+++ b/src/test/resources/queries/bsp-cutoff.jsonld
@@ -1,9 +1,9 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry": "mate",
"layer": "lemma",
"key" : "alphabet",
diff --git a/src/test/resources/queries/bsp-fail1.jsonld b/src/test/resources/queries/bsp-fail1.jsonld
index fc6fb51..69ddb25 100644
--- a/src/test/resources/queries/bsp-fail1.jsonld
+++ b/src/test/resources/queries/bsp-fail1.jsonld
@@ -1,18 +1,18 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:group",
+ "@type": "koral:group",
"frames": ["frame:isAround"],
"operation": "operation:position"
"operands": [
{
- "@type": "korap:span",
+ "@type": "koral:span",
"key": "np"
},
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry" : "mate",
"layer": "l",
"key" : "Mann",
diff --git a/src/test/resources/queries/bsp-fail2.jsonld b/src/test/resources/queries/bsp-fail2.jsonld
index 96a3bb5..fff6ebf 100644
--- a/src/test/resources/queries/bsp-fail2.jsonld
+++ b/src/test/resources/queries/bsp-fail2.jsonld
@@ -1,20 +1,20 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:group",
+ "@type": "koral:group",
"operation": "operation:position",
"frames": ["frames:isAround"],
"operands": [
{
- "@type": "korap:span",
+ "@type": "koral:span",
"foundry" : "cnx",
"layer" : "c",
"key": "np"
},
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry" : "mate",
"layer": "l",
"key" : "Mann",
diff --git a/src/test/resources/queries/bsp-itemsPerResource.jsonld b/src/test/resources/queries/bsp-itemsPerResource.jsonld
index d4be7fe..81bcf6e 100644
--- a/src/test/resources/queries/bsp-itemsPerResource.jsonld
+++ b/src/test/resources/queries/bsp-itemsPerResource.jsonld
@@ -1,9 +1,9 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry": "mate",
"layer" : "lemma",
"key":"alphabet",
diff --git a/src/test/resources/queries/bsp-paging.jsonld b/src/test/resources/queries/bsp-paging.jsonld
index 9e258cc..f84503a 100644
--- a/src/test/resources/queries/bsp-paging.jsonld
+++ b/src/test/resources/queries/bsp-paging.jsonld
@@ -1,9 +1,9 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry": "mate",
"layer" : "lemma",
"key":"alphabet",
diff --git a/src/test/resources/queries/bsp-repetition.jsonld b/src/test/resources/queries/bsp-repetition.jsonld
index 342b7d5..05dc23b 100644
--- a/src/test/resources/queries/bsp-repetition.jsonld
+++ b/src/test/resources/queries/bsp-repetition.jsonld
@@ -2,31 +2,31 @@
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"collections" : [
{
- "@type" : "korap:meta-filter",
+ "@type" : "koral:meta-filter",
"@value" : {
- "@field" : "korap:field#corpusID",
- "@type" : "korap:term",
+ "@field" : "koral:field#corpusID",
+ "@type" : "koral:term",
"@value" : "WPD"
}
}
],
"meta" : {},
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "der",
"layer" : "orth",
"match" : "match:eq"
}
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"boundary" : {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"max" : 2,
"min" : 0
},
@@ -34,9 +34,9 @@
"min" : 0,
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "cnx",
"key" : "A",
"layer" : "p",
@@ -47,9 +47,9 @@
"operation" : "operation:repetition"
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
diff --git a/src/test/resources/queries/bsp-result-check.jsonld b/src/test/resources/queries/bsp-result-check.jsonld
index be037f7..18a522d 100644
--- a/src/test/resources/queries/bsp-result-check.jsonld
+++ b/src/test/resources/queries/bsp-result-check.jsonld
@@ -9,21 +9,21 @@
}
},
"query":{
- "@type":"korap:group",
+ "@type":"koral:group",
"operation":"operation:or",
"operands":[
{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"layer":"orth",
"key":"a",
"match":"match:eq"
}
},{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"layer":"orth",
"key":"b",
"match":"match:eq"
diff --git a/src/test/resources/queries/bsp-startswith.json b/src/test/resources/queries/bsp-startswith.json
index 95df8b9..1b6e94a 100644
--- a/src/test/resources/queries/bsp-startswith.json
+++ b/src/test/resources/queries/bsp-startswith.json
@@ -1,13 +1,13 @@
{
"@context":"http://korap.ids-mannheim.de/ns/query/context.json.ld",
"query":{
- "@type":"korap:group",
+ "@type":"koral:group",
"relation":"position",
"frames":[
"frames:startsWith"
],
"operands":[
{
- "@type":"korap:element",
+ "@type":"koral:element",
"@value":"s"
- },{"@type":"korap:sequence","operands":[{"@type":"korap:group","class":"0","operands":[{"@type":"korap:token","@value":{"@type":"korap:term","@value":"tt_p:ADJA","relation":"="}}]},{"@type":"korap:token","@value":{"@type":"korap:term","@value":"mate_p:NN","relation":"="}}]}]},"meta":[{"@type":"korap:meta-filter","@value":{"@type":"korap:term","@field":"korap:field#corpusID","@value":"A00"}},{"@type":"korap:meta-extend","@value":{"@type":"korap:term","@field":"korap:field#corpusID","@value":"A01"}}],"startPage":1,"count":50,"context":{"left":["token",6],"right":["token",6]}}
+ },{"@type":"koral:sequence","operands":[{"@type":"koral:group","class":"0","operands":[{"@type":"koral:token","@value":{"@type":"koral:term","@value":"tt_p:ADJA","relation":"="}}]},{"@type":"koral:token","@value":{"@type":"koral:term","@value":"mate_p:NN","relation":"="}}]}]},"meta":[{"@type":"koral:meta-filter","@value":{"@type":"koral:term","@field":"koral:field#corpusID","@value":"A00"}},{"@type":"koral:meta-extend","@value":{"@type":"koral:term","@field":"koral:field#corpusID","@value":"A01"}}],"startPage":1,"count":50,"context":{"left":["token",6],"right":["token",6]}}
diff --git a/src/test/resources/queries/bsp-uid-example.jsonld b/src/test/resources/queries/bsp-uid-example.jsonld
index 72f1c53..58a2a19 100644
--- a/src/test/resources/queries/bsp-uid-example.jsonld
+++ b/src/test/resources/queries/bsp-uid-example.jsonld
@@ -1,9 +1,9 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry": "mate",
"layer" : "lemma",
"key":"sein",
diff --git a/src/test/resources/queries/bsp1.jsonld b/src/test/resources/queries/bsp1.jsonld
index 3cc2171..c12de9a 100644
--- a/src/test/resources/queries/bsp1.jsonld
+++ b/src/test/resources/queries/bsp1.jsonld
@@ -1,38 +1,38 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:group",
+ "@type": "koral:group",
"operation": "operation:or",
"operands": [
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "base",
"key": "foo"
}
},
{
- "@type": "korap:group",
+ "@type": "koral:group",
"min" : 0,
"operation": "operation:repetition",
"operands": [
{
- "@type": "korap:group",
+ "@type": "koral:group",
"operation" : "operation:sequence",
"operands": [
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"key": "foo",
"layer" : "base"
}
},
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "base",
"key" : "bar"
}
diff --git a/src/test/resources/queries/bsp10.jsonld b/src/test/resources/queries/bsp10.jsonld
index 384175d..ceb32a2 100644
--- a/src/test/resources/queries/bsp10.jsonld
+++ b/src/test/resources/queries/bsp10.jsonld
@@ -1,30 +1,30 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:group",
+ "@type": "koral:group",
"operation" : "operation:sequence",
"operands": [
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry" : "mate",
"layer": "lemma",
"key" : "Katze"
}
},
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "orth",
"key" : "und"
}
},
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "orth",
"key" : "Hunde"
}
diff --git a/src/test/resources/queries/bsp11.jsonld b/src/test/resources/queries/bsp11.jsonld
index 060899f..6597918 100644
--- a/src/test/resources/queries/bsp11.jsonld
+++ b/src/test/resources/queries/bsp11.jsonld
@@ -1,19 +1,19 @@
{
"@context" : {
"korap" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/",
- "query" : "korap:query",
- "meta" : "korap:meta",
+ "query" : "koral:query",
+ "meta" : "koral:meta",
"collections" : {
- "@id" : "korap:collections",
+ "@id" : "koral:collections",
"@container" : "@list"
},
- "token" : "korap:token/",
- "distance" : "korap:distance/",
- "boundary" : "korap:boundary/",
- "group" : "korap:group/",
- "span" : "korap:span/",
- "term" : "korap:term/",
- "termGroup" : "korap:termGroup/",
+ "token" : "koral:token/",
+ "distance" : "koral:distance/",
+ "boundary" : "koral:boundary/",
+ "group" : "koral:group/",
+ "span" : "koral:span/",
+ "term" : "koral:term/",
+ "termGroup" : "koral:termGroup/",
"wrap" : "token:wrap",
"operation" : {
"@id" : "group:operation/",
@@ -68,19 +68,19 @@
"@type" : "xsd:boolean"
},
"key" : {
- "@id" : "korap:key",
+ "@id" : "koral:key",
"@type" : "xsd:string"
},
"foundry" : {
- "@id" : "korap:foundry",
+ "@id" : "koral:foundry",
"@type" : "xsd:string"
},
"layer" : {
- "@id" : "korap:layer",
+ "@id" : "koral:layer",
"@type" : "xsd:string"
},
"value" : {
- "@id" : "korap:value",
+ "@id" : "koral:value",
"@type" : "xsd:string"
},
"caseInsensitive" : {
@@ -96,25 +96,25 @@
"@type" : "@id"
},
"relation" : {
- "@id" : "korap:relation/",
+ "@id" : "koral:relation/",
"@type" : "@id"
}
},
"query": {
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:termGroup",
+ "@type": "koral:termGroup",
"relation": "relation:or",
"operands": [
{
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry" : "mate",
"layer": "lemma",
"key" : "Katze",
"match": "match:ne"
},
{
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "orth",
"key" : "Katzen",
"match" : "match:ne"
diff --git a/src/test/resources/queries/bsp12.jsonld b/src/test/resources/queries/bsp12.jsonld
index 6b7a7b5..bd5fe55 100644
--- a/src/test/resources/queries/bsp12.jsonld
+++ b/src/test/resources/queries/bsp12.jsonld
@@ -1,18 +1,18 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:group",
+ "@type": "koral:group",
"operation": "operation:position",
"frames": ["frames:isAround"],
"operands": [
{
- "@type": "korap:span",
+ "@type": "koral:span",
"key": "np"
},
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap" : {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry": "mate",
"layer": "lemma",
"key" : "Mann"
diff --git a/src/test/resources/queries/bsp13.jsonld b/src/test/resources/queries/bsp13.jsonld
index 879fbf5..e7659aa 100644
--- a/src/test/resources/queries/bsp13.jsonld
+++ b/src/test/resources/queries/bsp13.jsonld
@@ -1,18 +1,18 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:group",
+ "@type": "koral:group",
"frames": ["frames:startsWith", "frames:alignsLeft", "frames:matches"],
"operation": "operation:position",
"operands": [
{
- "@type": "korap:span",
+ "@type": "koral:span",
"key": "np"
},
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "pos",
"key" : "Det",
"match" : "match:ne"
diff --git a/src/test/resources/queries/bsp13b.jsonld b/src/test/resources/queries/bsp13b.jsonld
index 077aeff..819f1db 100644
--- a/src/test/resources/queries/bsp13b.jsonld
+++ b/src/test/resources/queries/bsp13b.jsonld
@@ -1,18 +1,18 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:group",
+ "@type": "koral:group",
"frames": ["frames:startsWith", "frames:alignsLeft", "frames:matches"],
"operation": "operation:position",
"operands": [
{
- "@type": "korap:span",
+ "@type": "koral:span",
"key": "np"
},
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry" : "mate",
"layer": "pos",
"key" : "Det",
diff --git a/src/test/resources/queries/bsp14.jsonld b/src/test/resources/queries/bsp14.jsonld
index f9c98e0..db5f94f 100644
--- a/src/test/resources/queries/bsp14.jsonld
+++ b/src/test/resources/queries/bsp14.jsonld
@@ -1,19 +1,19 @@
{
"@context" : {
"korap" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/",
- "query" : "korap:query",
- "meta" : "korap:meta",
+ "query" : "koral:query",
+ "meta" : "koral:meta",
"collections" : {
- "@id" : "korap:collections",
+ "@id" : "koral:collections",
"@container" : "@list"
},
- "token" : "korap:token/",
- "distance" : "korap:distance/",
- "boundary" : "korap:boundary/",
- "group" : "korap:group/",
- "span" : "korap:span/",
- "term" : "korap:term/",
- "termGroup" : "korap:termGroup/",
+ "token" : "koral:token/",
+ "distance" : "koral:distance/",
+ "boundary" : "koral:boundary/",
+ "group" : "koral:group/",
+ "span" : "koral:span/",
+ "term" : "koral:term/",
+ "termGroup" : "koral:termGroup/",
"wrap" : "token:wrap",
"operation" : {
"@id" : "group:operation/",
@@ -68,19 +68,19 @@
"@type" : "xsd:boolean"
},
"key" : {
- "@id" : "korap:key",
+ "@id" : "koral:key",
"@type" : "xsd:string"
},
"foundry" : {
- "@id" : "korap:foundry",
+ "@id" : "koral:foundry",
"@type" : "xsd:string"
},
"layer" : {
- "@id" : "korap:layer",
+ "@id" : "koral:layer",
"@type" : "xsd:string"
},
"value" : {
- "@id" : "korap:value",
+ "@id" : "koral:value",
"@type" : "xsd:string"
},
"caseInsensitive" : {
@@ -96,14 +96,14 @@
"@type" : "@id"
},
"relation" : {
- "@id" : "korap:relation/",
+ "@id" : "koral:relation/",
"@type" : "@id"
}
},
"query": {
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"type": "type:regex",
"layer": "orth",
"key": "vers{2,3}uch"
diff --git a/src/test/resources/queries/bsp15.jsonld b/src/test/resources/queries/bsp15.jsonld
index 1218c7c..bdd1aaa 100644
--- a/src/test/resources/queries/bsp15.jsonld
+++ b/src/test/resources/queries/bsp15.jsonld
@@ -1,19 +1,19 @@
{
"@context" : {
"korap" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/",
- "query" : "korap:query",
- "meta" : "korap:meta",
+ "query" : "koral:query",
+ "meta" : "koral:meta",
"collections" : {
- "@id" : "korap:collections",
+ "@id" : "koral:collections",
"@container" : "@list"
},
- "token" : "korap:token/",
- "distance" : "korap:distance/",
- "boundary" : "korap:boundary/",
- "group" : "korap:group/",
- "span" : "korap:span/",
- "term" : "korap:term/",
- "termGroup" : "korap:termGroup/",
+ "token" : "koral:token/",
+ "distance" : "koral:distance/",
+ "boundary" : "koral:boundary/",
+ "group" : "koral:group/",
+ "span" : "koral:span/",
+ "term" : "koral:term/",
+ "termGroup" : "koral:termGroup/",
"wrap" : "token:wrap",
"operation" : {
"@id" : "group:operation/",
@@ -68,19 +68,19 @@
"@type" : "xsd:boolean"
},
"key" : {
- "@id" : "korap:key",
+ "@id" : "koral:key",
"@type" : "xsd:string"
},
"foundry" : {
- "@id" : "korap:foundry",
+ "@id" : "koral:foundry",
"@type" : "xsd:string"
},
"layer" : {
- "@id" : "korap:layer",
+ "@id" : "koral:layer",
"@type" : "xsd:string"
},
"value" : {
- "@id" : "korap:value",
+ "@id" : "koral:value",
"@type" : "xsd:string"
},
"caseInsensitive" : {
@@ -96,15 +96,15 @@
"@type" : "@id"
},
"relation" : {
- "@id" : "korap:relation/",
+ "@id" : "koral:relation/",
"@type" : "@id"
}
},
"query": {
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
"type": "type:regex",
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "orth",
"key" : "vers.*ch"
}
diff --git a/src/test/resources/queries/bsp16.jsonld b/src/test/resources/queries/bsp16.jsonld
index 72586cb..292165a 100644
--- a/src/test/resources/queries/bsp16.jsonld
+++ b/src/test/resources/queries/bsp16.jsonld
@@ -1,19 +1,19 @@
{
"@context" : {
"korap" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/",
- "query" : "korap:query",
- "meta" : "korap:meta",
+ "query" : "koral:query",
+ "meta" : "koral:meta",
"collections" : {
- "@id" : "korap:collections",
+ "@id" : "koral:collections",
"@container" : "@list"
},
- "token" : "korap:token/",
- "distance" : "korap:distance/",
- "boundary" : "korap:boundary/",
- "group" : "korap:group/",
- "span" : "korap:span/",
- "term" : "korap:term/",
- "termGroup" : "korap:termGroup/",
+ "token" : "koral:token/",
+ "distance" : "koral:distance/",
+ "boundary" : "koral:boundary/",
+ "group" : "koral:group/",
+ "span" : "koral:span/",
+ "term" : "koral:term/",
+ "termGroup" : "koral:termGroup/",
"wrap" : "token:wrap",
"operation" : {
"@id" : "group:operation/",
@@ -68,19 +68,19 @@
"@type" : "xsd:boolean"
},
"key" : {
- "@id" : "korap:key",
+ "@id" : "koral:key",
"@type" : "xsd:string"
},
"foundry" : {
- "@id" : "korap:foundry",
+ "@id" : "koral:foundry",
"@type" : "xsd:string"
},
"layer" : {
- "@id" : "korap:layer",
+ "@id" : "koral:layer",
"@type" : "xsd:string"
},
"value" : {
- "@id" : "korap:value",
+ "@id" : "koral:value",
"@type" : "xsd:string"
},
"caseInsensitive" : {
@@ -96,28 +96,28 @@
"@type" : "@id"
},
"relation" : {
- "@id" : "korap:relation/",
+ "@id" : "koral:relation/",
"@type" : "@id"
}
},
"query": {
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:termGroup",
+ "@type": "koral:termGroup",
"relation": "relation:and",
"operands": [
{
- "@type": "korap:termGroup",
+ "@type": "koral:termGroup",
"relation": "relation:or",
"operands": [
{
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry": "mate",
"layer": "lemma",
"key" : "bar"
},
{
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry": "mate",
"layer": "lemma",
"key" : "foo"
@@ -125,7 +125,7 @@
]
},
{
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "orth",
"key" : "foobar"
}
diff --git a/src/test/resources/queries/bsp17.jsonld b/src/test/resources/queries/bsp17.jsonld
index 8d9eca8..7ea54e5 100644
--- a/src/test/resources/queries/bsp17.jsonld
+++ b/src/test/resources/queries/bsp17.jsonld
@@ -1,18 +1,18 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:group",
+ "@type": "koral:group",
"operation": "operation:position",
"frames": ["frames:isWithin"],
"operands": [
{
- "@type": "korap:span",
+ "@type": "koral:span",
"key": "np"
},
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry" : "mate",
"layer": "lemma",
"key" : "Mann"
diff --git a/src/test/resources/queries/bsp18.jsonld b/src/test/resources/queries/bsp18.jsonld
index f0c2fc2..bd18630 100644
--- a/src/test/resources/queries/bsp18.jsonld
+++ b/src/test/resources/queries/bsp18.jsonld
@@ -1,32 +1,32 @@
{
"context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:sequence",
"inOrder" : true,
"distances" : [ {
- "@type" : "korap:distance",
+ "@type" : "koral:distance",
"key" : "w",
"min" : 0,
"max" : 5
} ],
"operands" : [ {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:class",
"classOut" : 1,
"operands" : [ {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "der",
"layer" : "orth",
"match" : "match:eq"
}
} ]
}, {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "nicht",
"layer" : "orth",
"match" : "match:eq"
@@ -34,10 +34,10 @@
} ]
},
"collections" : [ {
- "@type" : "korap:meta-filter",
+ "@type" : "koral:meta-filter",
"@value" : {
- "@type" : "korap:term",
- "@field" : "korap:field#corpusID",
+ "@type" : "koral:term",
+ "@field" : "koral:field#corpusID",
"@value" : "WPD"
}
} ],
diff --git a/src/test/resources/queries/bsp19.jsonld b/src/test/resources/queries/bsp19.jsonld
index 1e12ed9..e92b70a 100644
--- a/src/test/resources/queries/bsp19.jsonld
+++ b/src/test/resources/queries/bsp19.jsonld
@@ -1,17 +1,17 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:sequence",
"inOrder" : true,
"distances" : [
{
- "@type" : "korap:distance",
+ "@type" : "koral:distance",
"key" : "w",
"min" : 1,
"max" : 3
}, {
- "@type" : "korap:distance",
+ "@type" : "koral:distance",
"key" : "s",
"min" : 0,
"max" : 1
@@ -19,17 +19,17 @@
],
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "das",
"layer" : "orth",
"match" : "match:eq"
}
}, {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Buch",
"layer" : "orth",
"match" : "match:eq"
diff --git a/src/test/resources/queries/bsp1b.jsonld b/src/test/resources/queries/bsp1b.jsonld
index 4cec26c..8bd8755 100644
--- a/src/test/resources/queries/bsp1b.jsonld
+++ b/src/test/resources/queries/bsp1b.jsonld
@@ -1,13 +1,13 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query":{
- "@type":"korap:group",
+ "@type":"koral:group",
"operation":"operation:or",
"operands":[
{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry":"mate",
"layer" : "lemma",
"key" :"foo",
@@ -15,13 +15,13 @@
}
},
{
- "@type":"korap:group",
+ "@type":"koral:group",
"operation":"operation:sequence",
"operands":[
{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry" : "mate",
"layer":"lemma",
"key":"foo",
@@ -29,9 +29,9 @@
}
},
{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry": "mate",
"layer":"lemma",
"key" : "bar",
@@ -43,17 +43,17 @@
]
},
"poliqarp-meta":{
- "@type":"korap:meta",
+ "@type":"koral:meta",
"@value":{
- "@type":"korap:group",
+ "@type":"koral:group",
"operands":[
{
- "@type":"korap:term",
+ "@type":"koral:term",
"@value":"author:Goethe",
"relation":"="
},
{
- "@type":"korap:term",
+ "@type":"koral:term",
"@value":"year:1815",
"relation":"="
}
diff --git a/src/test/resources/queries/bsp2.jsonld b/src/test/resources/queries/bsp2.jsonld
index 9a3a076..99b385f 100644
--- a/src/test/resources/queries/bsp2.jsonld
+++ b/src/test/resources/queries/bsp2.jsonld
@@ -1,26 +1,26 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:group",
+ "@type": "koral:group",
"operation" : "operation:sequence",
"operands": [
{
- "@type": "korap:group",
+ "@type": "koral:group",
"operation": "operation:or",
"operands": [
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry": "mate",
"layer": "lemma",
"key" : "foo"
}
},
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry": "mate",
"layer": "lemma",
"key" : "bar"
@@ -29,9 +29,9 @@
]
},
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry": "mate",
"layer": "lemma",
"key" : "foobar"
diff --git a/src/test/resources/queries/bsp3.jsonld b/src/test/resources/queries/bsp3.jsonld
index b662b72..d802896 100644
--- a/src/test/resources/queries/bsp3.jsonld
+++ b/src/test/resources/queries/bsp3.jsonld
@@ -1,18 +1,18 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:reference",
+ "@type": "koral:reference",
"classRef": [1],
"operands": [
{
- "@type": "korap:group",
+ "@type": "koral:group",
"operation" : "operation:class",
"classOut": 1,
"operands": [
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry" : "mate",
"layer": "lemma",
"key" : "Mann"
diff --git a/src/test/resources/queries/bsp4.jsonld b/src/test/resources/queries/bsp4.jsonld
index 6cea948..663b0e6 100644
--- a/src/test/resources/queries/bsp4.jsonld
+++ b/src/test/resources/queries/bsp4.jsonld
@@ -1,22 +1,22 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:reference",
+ "@type": "koral:reference",
"classRef": [1],
"operands": [
{
- "@type": "korap:group",
+ "@type": "koral:group",
"operation": "operation:sequence",
"operands": [
{
- "@type": "korap:group",
+ "@type": "koral:group",
"operation":"operation:class",
"classOut": 1,
"operands": [
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry" : "mate",
"layer": "lemma",
"key" : "foo"
@@ -25,9 +25,9 @@
]
},
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "orth",
"key" : "bar"
}
diff --git a/src/test/resources/queries/bsp5.jsonld b/src/test/resources/queries/bsp5.jsonld
index b1dc6d8..834b95c 100644
--- a/src/test/resources/queries/bsp5.jsonld
+++ b/src/test/resources/queries/bsp5.jsonld
@@ -1,31 +1,31 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:reference",
+ "@type": "koral:reference",
"classRef": [1],
"operands": [
{
- "@type": "korap:group",
+ "@type": "koral:group",
"operation" : "operation:sequence",
"operands": [
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry" : "mate",
"layer": "lemma",
"key" : "Der"
}
},
{
- "@type": "korap:group",
+ "@type": "koral:group",
"operation" : "operation:class",
"classOut": 1,
"operands": [
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry": "mate",
"layer": "lemma",
"key" : "Mann"
diff --git a/src/test/resources/queries/bsp6.jsonld b/src/test/resources/queries/bsp6.jsonld
index 64e8d17..701c6e7 100644
--- a/src/test/resources/queries/bsp6.jsonld
+++ b/src/test/resources/queries/bsp6.jsonld
@@ -1,19 +1,19 @@
{
"@context" : {
"korap" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/",
- "query" : "korap:query",
- "meta" : "korap:meta",
+ "query" : "koral:query",
+ "meta" : "koral:meta",
"collections" : {
- "@id" : "korap:collections",
+ "@id" : "koral:collections",
"@container" : "@list"
},
- "token" : "korap:token/",
- "distance" : "korap:distance/",
- "boundary" : "korap:boundary/",
- "group" : "korap:group/",
- "span" : "korap:span/",
- "term" : "korap:term/",
- "termGroup" : "korap:termGroup/",
+ "token" : "koral:token/",
+ "distance" : "koral:distance/",
+ "boundary" : "koral:boundary/",
+ "group" : "koral:group/",
+ "span" : "koral:span/",
+ "term" : "koral:term/",
+ "termGroup" : "koral:termGroup/",
"wrap" : "token:wrap",
"operation" : {
"@id" : "group:operation/",
@@ -68,19 +68,19 @@
"@type" : "xsd:boolean"
},
"key" : {
- "@id" : "korap:key",
+ "@id" : "koral:key",
"@type" : "xsd:string"
},
"foundry" : {
- "@id" : "korap:foundry",
+ "@id" : "koral:foundry",
"@type" : "xsd:string"
},
"layer" : {
- "@id" : "korap:layer",
+ "@id" : "koral:layer",
"@type" : "xsd:string"
},
"value" : {
- "@id" : "korap:value",
+ "@id" : "koral:value",
"@type" : "xsd:string"
},
"caseInsensitive" : {
@@ -96,14 +96,14 @@
"@type" : "@id"
},
"relation" : {
- "@id" : "korap:relation/",
+ "@id" : "koral:relation/",
"@type" : "@id"
}
},
"query": {
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry" : "mate",
"layer": "lemma",
"key" : "Katze"
diff --git a/src/test/resources/queries/bsp7.jsonld b/src/test/resources/queries/bsp7.jsonld
index 46ab329..8fcdc08 100644
--- a/src/test/resources/queries/bsp7.jsonld
+++ b/src/test/resources/queries/bsp7.jsonld
@@ -1,19 +1,19 @@
{
"@context" : {
"korap" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/",
- "query" : "korap:query",
- "meta" : "korap:meta",
+ "query" : "koral:query",
+ "meta" : "koral:meta",
"collections" : {
- "@id" : "korap:collections",
+ "@id" : "koral:collections",
"@container" : "@list"
},
- "token" : "korap:token/",
- "distance" : "korap:distance/",
- "boundary" : "korap:boundary/",
- "group" : "korap:group/",
- "span" : "korap:span/",
- "term" : "korap:term/",
- "termGroup" : "korap:termGroup/",
+ "token" : "koral:token/",
+ "distance" : "koral:distance/",
+ "boundary" : "koral:boundary/",
+ "group" : "koral:group/",
+ "span" : "koral:span/",
+ "term" : "koral:term/",
+ "termGroup" : "koral:termGroup/",
"wrap" : "token:wrap",
"operation" : {
"@id" : "group:operation/",
@@ -68,19 +68,19 @@
"@type" : "xsd:boolean"
},
"key" : {
- "@id" : "korap:key",
+ "@id" : "koral:key",
"@type" : "xsd:string"
},
"foundry" : {
- "@id" : "korap:foundry",
+ "@id" : "koral:foundry",
"@type" : "xsd:string"
},
"layer" : {
- "@id" : "korap:layer",
+ "@id" : "koral:layer",
"@type" : "xsd:string"
},
"value" : {
- "@id" : "korap:value",
+ "@id" : "koral:value",
"@type" : "xsd:string"
},
"caseInsensitive" : {
@@ -96,14 +96,14 @@
"@type" : "@id"
},
"relation" : {
- "@id" : "korap:relation/",
+ "@id" : "koral:relation/",
"@type" : "@id"
}
},
"query": {
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap" : {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry": "mate",
"layer": "lemma",
"key": "Katze",
diff --git a/src/test/resources/queries/bsp9.jsonld b/src/test/resources/queries/bsp9.jsonld
index 52f10b9..7b2d6de 100644
--- a/src/test/resources/queries/bsp9.jsonld
+++ b/src/test/resources/queries/bsp9.jsonld
@@ -1,19 +1,19 @@
{
"@context" : {
"korap" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/",
- "query" : "korap:query",
- "meta" : "korap:meta",
+ "query" : "koral:query",
+ "meta" : "koral:meta",
"collections" : {
- "@id" : "korap:collections",
+ "@id" : "koral:collections",
"@container" : "@list"
},
- "token" : "korap:token/",
- "distance" : "korap:distance/",
- "boundary" : "korap:boundary/",
- "group" : "korap:group/",
- "span" : "korap:span/",
- "term" : "korap:term/",
- "termGroup" : "korap:termGroup/",
+ "token" : "koral:token/",
+ "distance" : "koral:distance/",
+ "boundary" : "koral:boundary/",
+ "group" : "koral:group/",
+ "span" : "koral:span/",
+ "term" : "koral:term/",
+ "termGroup" : "koral:termGroup/",
"wrap" : "token:wrap",
"operation" : {
"@id" : "group:operation/",
@@ -68,19 +68,19 @@
"@type" : "xsd:boolean"
},
"key" : {
- "@id" : "korap:key",
+ "@id" : "koral:key",
"@type" : "xsd:string"
},
"foundry" : {
- "@id" : "korap:foundry",
+ "@id" : "koral:foundry",
"@type" : "xsd:string"
},
"layer" : {
- "@id" : "korap:layer",
+ "@id" : "koral:layer",
"@type" : "xsd:string"
},
"value" : {
- "@id" : "korap:value",
+ "@id" : "koral:value",
"@type" : "xsd:string"
},
"caseInsensitive" : {
@@ -96,24 +96,24 @@
"@type" : "@id"
},
"relation" : {
- "@id" : "korap:relation/",
+ "@id" : "koral:relation/",
"@type" : "@id"
}
},
"query": {
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:termGroup",
+ "@type": "koral:termGroup",
"relation": "relation:and",
"operands": [
{
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry": "mate",
"layer": "lemma",
"key" : "Katze"
},
{
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "orth",
"key" : "Katzen"
}
diff --git a/src/test/resources/queries/bsp9b.jsonld b/src/test/resources/queries/bsp9b.jsonld
index d0f44b1..ccbb51c 100644
--- a/src/test/resources/queries/bsp9b.jsonld
+++ b/src/test/resources/queries/bsp9b.jsonld
@@ -1,19 +1,19 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:termGroup",
+ "@type" : "koral:termGroup",
"relation" : "relation:and",
"operands" : [ {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "number",
"value" : "pl",
"layer" : "m",
"foundry" : "mate",
"match" : "match:eq"
}, {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "NN",
"layer" : "p",
"foundry" : "tt",
diff --git a/src/test/resources/queries/bugs/cosmas_boundary.jsonld b/src/test/resources/queries/bugs/cosmas_boundary.jsonld
index fb0f5ff..3bd38e6 100644
--- a/src/test/resources/queries/bugs/cosmas_boundary.jsonld
+++ b/src/test/resources/queries/bugs/cosmas_boundary.jsonld
@@ -1,18 +1,18 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query":{
- "@type" : "korap:reference",
+ "@type" : "koral:reference",
"classRef" : [
129
],
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"distances" : [
{
"@type" : "cosmas:distance",
"boundary" : {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"max" : 1,
"min" : 0
},
@@ -27,14 +27,14 @@
"inOrder" : false,
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"class" : 129,
"classOut" : 129,
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Namen",
"layer" : "orth",
"match" : "match:eq"
@@ -44,14 +44,14 @@
"operation" : "operation:class"
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"class" : 129,
"classOut" : 129,
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Leben",
"layer" : "orth",
"match" : "match:eq"
diff --git a/src/test/resources/queries/bugs/cosmas_classrefcheck.jsonld b/src/test/resources/queries/bugs/cosmas_classrefcheck.jsonld
index f4d6075..8ac8f79 100644
--- a/src/test/resources/queries/bugs/cosmas_classrefcheck.jsonld
+++ b/src/test/resources/queries/bugs/cosmas_classrefcheck.jsonld
@@ -4,13 +4,13 @@
["This is a warning coming from the serialization"]
],
"query": {
- "@type" : "korap:reference",
+ "@type" : "koral:reference",
"classRef" : [
130
],
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"class" : 131,
"classIn" : [
129,
@@ -20,31 +20,31 @@
"classRefCheck" : "classRefCheck:includes",
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"frame" : "frame:contains",
"frames" : [],
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"class" : 129,
"classOut" : 129,
"operands" : [
{
- "@type" : "korap:span",
+ "@type" : "koral:span",
"key" : "s"
}
],
"operation" : "operation:class"
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"class" : 130,
"classOut" : 130,
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "wegen",
"layer" : "orth",
"match" : "match:eq"
diff --git a/src/test/resources/queries/bugs/expansion_bug.jsonld b/src/test/resources/queries/bugs/expansion_bug.jsonld
index fe8b67f..1bea54d 100644
--- a/src/test/resources/queries/bugs/expansion_bug.jsonld
+++ b/src/test/resources/queries/bugs/expansion_bug.jsonld
@@ -1,12 +1,12 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.2/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "opennlp",
"key" : "der",
"layer" : "orth",
@@ -14,9 +14,9 @@
}
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "opennlp",
"key" : "alte",
"layer" : "orth",
@@ -24,9 +24,9 @@
}
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "opennlp",
"key" : "Digraph",
"layer" : "orth",
@@ -34,9 +34,9 @@
}
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "opennlp",
"key" : "Aa",
"layer" : "orth",
@@ -44,9 +44,9 @@
}
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "opennlp",
"key" : "durch",
"layer" : "orth",
@@ -54,7 +54,7 @@
}
},
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}
],
"operation" : "operation:sequence"
diff --git a/src/test/resources/queries/bugs/expansion_bug_2.jsonld b/src/test/resources/queries/bugs/expansion_bug_2.jsonld
index ebafaac..f51b1d3 100644
--- a/src/test/resources/queries/bugs/expansion_bug_2.jsonld
+++ b/src/test/resources/queries/bugs/expansion_bug_2.jsonld
@@ -1,12 +1,12 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.2/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "opennlp",
"key" : "der",
"layer" : "orth",
@@ -14,9 +14,9 @@
}
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "opennlp",
"key" : "alte",
"layer" : "orth",
@@ -24,9 +24,9 @@
}
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "opennlp",
"key" : "Digraph",
"layer" : "orth",
@@ -34,9 +34,9 @@
}
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "opennlp",
"key" : "Aa",
"layer" : "orth",
@@ -44,9 +44,9 @@
}
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "opennlp",
"key" : "durch",
"layer" : "orth",
@@ -54,9 +54,9 @@
}
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "opennlp",
"key" : "Å",
"layer" : "orth",
diff --git a/src/test/resources/queries/bugs/foundry_for_orth.jsonld b/src/test/resources/queries/bugs/foundry_for_orth.jsonld
index bac4ce6..8e3971a 100644
--- a/src/test/resources/queries/bugs/foundry_for_orth.jsonld
+++ b/src/test/resources/queries/bugs/foundry_for_orth.jsonld
@@ -1,9 +1,9 @@
{
"@context":"http://ids-mannheim.de/ns/KorAP/json-ld/v0.2/context.jsonld",
"query":{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "opennlp",
"key" : "Baum",
"layer" : "orth",
diff --git a/src/test/resources/queries/bugs/foundry_for_orth_2.jsonld b/src/test/resources/queries/bugs/foundry_for_orth_2.jsonld
index f294a6c..cad3dd3 100644
--- a/src/test/resources/queries/bugs/foundry_for_orth_2.jsonld
+++ b/src/test/resources/queries/bugs/foundry_for_orth_2.jsonld
@@ -1,9 +1,9 @@
{
"@context":"http://ids-mannheim.de/ns/KorAP/json-ld/v0.2/context.jsonld",
"query":{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"caseInsensitive" : true,
"foundry" : "opennlp",
"key" : "baum",
diff --git a/src/test/resources/queries/bugs/greater_highlights_127.jsonld b/src/test/resources/queries/bugs/greater_highlights_127.jsonld
index cac72db..3bbcee1 100644
--- a/src/test/resources/queries/bugs/greater_highlights_127.jsonld
+++ b/src/test/resources/queries/bugs/greater_highlights_127.jsonld
@@ -1,14 +1,14 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"class" : 127,
"classOut" : 127,
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Alphabet",
"layer" : "orth",
"match" : "match:eq"
diff --git a/src/test/resources/queries/bugs/greater_highlights_15.jsonld b/src/test/resources/queries/bugs/greater_highlights_15.jsonld
index c9f3b93..e101373 100644
--- a/src/test/resources/queries/bugs/greater_highlights_15.jsonld
+++ b/src/test/resources/queries/bugs/greater_highlights_15.jsonld
@@ -1,14 +1,14 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"class" : 15,
"classOut" : 15,
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Alphabet",
"layer" : "orth",
"match" : "match:eq"
diff --git a/src/test/resources/queries/bugs/greater_highlights_16.jsonld b/src/test/resources/queries/bugs/greater_highlights_16.jsonld
index 7f429f7..0fcc933 100644
--- a/src/test/resources/queries/bugs/greater_highlights_16.jsonld
+++ b/src/test/resources/queries/bugs/greater_highlights_16.jsonld
@@ -1,14 +1,14 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"class" : 16,
"classOut" : 16,
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Alphabet",
"layer" : "orth",
"match" : "match:eq"
diff --git a/src/test/resources/queries/bugs/greater_highlights_255.jsonld b/src/test/resources/queries/bugs/greater_highlights_255.jsonld
index 43b0c80..2c11ab5 100644
--- a/src/test/resources/queries/bugs/greater_highlights_255.jsonld
+++ b/src/test/resources/queries/bugs/greater_highlights_255.jsonld
@@ -1,14 +1,14 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"class" : 255,
"classOut" : 255,
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Alphabet",
"layer" : "orth",
"match" : "match:eq"
diff --git a/src/test/resources/queries/bugs/greater_highlights_300.jsonld b/src/test/resources/queries/bugs/greater_highlights_300.jsonld
index fc1a994..3d721cf 100644
--- a/src/test/resources/queries/bugs/greater_highlights_300.jsonld
+++ b/src/test/resources/queries/bugs/greater_highlights_300.jsonld
@@ -1,14 +1,14 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"class" : 300,
"classOut" : 300,
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Alphabet",
"layer" : "orth",
"match" : "match:eq"
diff --git a/src/test/resources/queries/bugs/multiple_classes.jsonld b/src/test/resources/queries/bugs/multiple_classes.jsonld
index 3b5345c..44628a4 100644
--- a/src/test/resources/queries/bugs/multiple_classes.jsonld
+++ b/src/test/resources/queries/bugs/multiple_classes.jsonld
@@ -1,30 +1,30 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"class" : 4,
"classOut" : 4,
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"class" : 1,
"classOut" : 1,
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"class" : 2,
"classOut" : 2,
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "ins",
"layer" : "orth",
"match" : "match:eq"
@@ -34,14 +34,14 @@
"operation" : "operation:class"
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"class" : 3,
"classOut" : 3,
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Leben",
"layer" : "orth",
"match" : "match:eq"
@@ -57,9 +57,9 @@
"operation" : "operation:class"
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "gerufen",
"layer" : "orth",
"match" : "match:eq"
diff --git a/src/test/resources/queries/bugs/multiterm_rewrite.jsonld b/src/test/resources/queries/bugs/multiterm_rewrite.jsonld
index 6eec72e..3ea96ea 100644
--- a/src/test/resources/queries/bugs/multiterm_rewrite.jsonld
+++ b/src/test/resources/queries/bugs/multiterm_rewrite.jsonld
@@ -10,17 +10,17 @@
"context":"paragraph"
},
"query":{
- "@type":"korap:group",
+ "@type":"koral:group",
"operation":"operation:sequence",
"operands":[
{
- "@type":"korap:group",
+ "@type":"koral:group",
"operation":"operation:repetition",
"operands":[
{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry":"tt",
"layer":"p",
"type":"type:regex",
@@ -30,7 +30,7 @@
}
],
"boundary":{
- "@type":"korap:boundary",
+ "@type":"koral:boundary",
"min":0,
"max":3
},
@@ -38,9 +38,9 @@
"max":3
},
{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry":"tt",
"layer":"p",
"type":"type:regex",
@@ -52,10 +52,10 @@
},
"collections":[
{
- "@type":"korap:meta-filter",
+ "@type":"koral:meta-filter",
"@value":{
- "@type":"korap:term",
- "@field":"korap:field#corpusID",
+ "@type":"koral:term",
+ "@field":"koral:field#corpusID",
"@value":"WPD"
}
}
diff --git a/src/test/resources/queries/bugs/optionality_warning.jsonld b/src/test/resources/queries/bugs/optionality_warning.jsonld
index 08b9df9..e00d09b 100644
--- a/src/test/resources/queries/bugs/optionality_warning.jsonld
+++ b/src/test/resources/queries/bugs/optionality_warning.jsonld
@@ -1,9 +1,9 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.2/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"boundary" : {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"max" : 1,
"min" : 0
},
@@ -11,9 +11,9 @@
"min" : 0,
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "opennlp",
"layer" : "orth",
"key" : "a",
diff --git a/src/test/resources/queries/bugs/overlaps_frame_workaround.jsonld b/src/test/resources/queries/bugs/overlaps_frame_workaround.jsonld
index 4d72095..11e2491 100644
--- a/src/test/resources/queries/bugs/overlaps_frame_workaround.jsonld
+++ b/src/test/resources/queries/bugs/overlaps_frame_workaround.jsonld
@@ -1,7 +1,7 @@
{
"@context":"http://ids-mannheim.de/ns/KorAP/json-ld/v0.2/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"frame" : "",
"frames" : [
"frames:overlapsLeft",
@@ -9,16 +9,16 @@
],
"operands" : [
{
- "@type" : "korap:span",
+ "@type" : "koral:span",
"key" : "s"
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "CARD",
"layer" : "p",
@@ -26,9 +26,9 @@
}
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "N.*",
"layer" : "p",
diff --git a/src/test/resources/queries/bugs/repetition_group_rewrite.jsonld b/src/test/resources/queries/bugs/repetition_group_rewrite.jsonld
index 914fc95..3bf9a34 100644
--- a/src/test/resources/queries/bugs/repetition_group_rewrite.jsonld
+++ b/src/test/resources/queries/bugs/repetition_group_rewrite.jsonld
@@ -1,9 +1,9 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.2/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"boundary" : {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"max" : 2,
"min" : 2
},
@@ -11,12 +11,12 @@
"min" : 2,
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "cnx",
"key" : "A",
"layer" : "p",
@@ -25,7 +25,7 @@
}
},
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}
],
"operation" : "operation:sequence"
diff --git a/src/test/resources/queries/bugs/special_layer.jsonld b/src/test/resources/queries/bugs/special_layer.jsonld
index 92c03b0..1e29dd0 100644
--- a/src/test/resources/queries/bugs/special_layer.jsonld
+++ b/src/test/resources/queries/bugs/special_layer.jsonld
@@ -1,12 +1,12 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query":{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "opennlp",
"key" : "Baum",
"layer" : "orth",
@@ -14,9 +14,9 @@
}
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "cnx",
"key" : "CC",
"layer" : "pos",
@@ -24,9 +24,9 @@
}
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "Baum",
"layer" : "lemma",
@@ -34,7 +34,7 @@
}
},
{
- "@type" : "korap:span",
+ "@type" : "koral:span",
"foundry" : "xip",
"key" : "MC",
"layer" : "const"
diff --git a/src/test/resources/queries/bugs/underspecified_token.jsonld b/src/test/resources/queries/bugs/underspecified_token.jsonld
index 783480f..62dc7f0 100644
--- a/src/test/resources/queries/bugs/underspecified_token.jsonld
+++ b/src/test/resources/queries/bugs/underspecified_token.jsonld
@@ -19,26 +19,26 @@
}
},
"query":{
- "@type":"korap:reference",
+ "@type":"koral:reference",
"operation":"operation:focus",
"classRef":[129],
"operands":[
{
- "@type":"korap:group",
+ "@type":"koral:group",
"operation":"operation:sequence",
"operands":[
{
- "@type":"korap:group",
+ "@type":"koral:group",
"operation":"operation:class",
"class":129,
"classOut":129,
"operands":[
{
- "@type":"korap:group",
+ "@type":"koral:group",
"operation":"operation:or",
"operands":[
{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
"key":"APPR",
"match":"match:eq",
@@ -46,7 +46,7 @@
}
},
{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
"key":"APPRART",
"match":"match:eq",
@@ -58,15 +58,15 @@
]
},
{
- "@type":"korap:group",
+ "@type":"koral:group",
"operation":"operation:class",
"class":129,
"classOut":129,
"operands":[
{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"key":"Urlaub",
"layer":"orth",
"match":"match:eq",
@@ -79,10 +79,10 @@
"inOrder":true,
"distances":[
{
- "@type":"korap:distance",
+ "@type":"koral:distance",
"key":"w",
"boundary":{
- "@type":"korap:boundary",
+ "@type":"koral:boundary",
"min":0,
"max":1
},
@@ -95,10 +95,10 @@
},
"collections":[
{
- "@type":"korap:meta-filter",
+ "@type":"koral:meta-filter",
"@value":{
- "@type":"korap:term",
- "@field":"korap:field#textClass",
+ "@type":"koral:term",
+ "@field":"koral:field#textClass",
"@value":"wissenschaft"
}
}
diff --git a/src/test/resources/queries/collections/collection_1.jsonld b/src/test/resources/queries/collections/collection_1.jsonld
index b78da86..99890c1 100644
--- a/src/test/resources/queries/collections/collection_1.jsonld
+++ b/src/test/resources/queries/collections/collection_1.jsonld
@@ -4,7 +4,7 @@
"warnings" : [ ],
"announcements" : [ ],
"collection" : {
- "@type" : "korap:doc",
+ "@type" : "koral:doc",
"key" : "pubDate",
"type" : "type:date",
"value" : "2000-01-01",
diff --git a/src/test/resources/queries/collections/collection_2.jsonld b/src/test/resources/queries/collections/collection_2.jsonld
index 52086b8..63cdfa1 100644
--- a/src/test/resources/queries/collections/collection_2.jsonld
+++ b/src/test/resources/queries/collections/collection_2.jsonld
@@ -4,16 +4,16 @@
"warnings" : [ ],
"announcements" : [ ],
"collection" : {
- "@type" : "korap:docGroup",
+ "@type" : "koral:docGroup",
"operation" : "operation:and",
"operands" : [ {
- "@type" : "korap:doc",
+ "@type" : "koral:doc",
"key" : "pubDate",
"type" : "type:date",
"value" : "1990",
"match" : "match:geq"
}, {
- "@type" : "korap:doc",
+ "@type" : "koral:doc",
"key" : "pubDate",
"type" : "type:date",
"value" : "2006-10",
diff --git a/src/test/resources/queries/collections/collection_4.jsonld b/src/test/resources/queries/collections/collection_4.jsonld
index ceda325..a5dee39 100644
--- a/src/test/resources/queries/collections/collection_4.jsonld
+++ b/src/test/resources/queries/collections/collection_4.jsonld
@@ -4,7 +4,7 @@
"warnings" : [ ],
"announcements" : [ ],
"collection" : {
- "@type": "korap:doc",
+ "@type": "koral:doc",
"key" : "title",
"value" : "Mannheim",
"match" : "match:contains"
diff --git a/src/test/resources/queries/collections/collection_5.jsonld b/src/test/resources/queries/collections/collection_5.jsonld
index 7c1b4f6..c26698e 100644
--- a/src/test/resources/queries/collections/collection_5.jsonld
+++ b/src/test/resources/queries/collections/collection_5.jsonld
@@ -4,16 +4,16 @@
"warnings" : [ ],
"announcements" : [ ],
"collection" : {
- "@type" : "korap:docGroup",
+ "@type" : "koral:docGroup",
"operation" : "operation:or",
"operands" : [ {
- "@type" : "korap:doc",
+ "@type" : "koral:doc",
"key" : "pubDate",
"type" : "type:date",
"value" : "1990",
"match" : "match:geq"
}, {
- "@type" : "korap:doc",
+ "@type" : "koral:doc",
"key" : "title",
"type" : "type:string",
"value" : "Mannheim",
diff --git a/src/test/resources/queries/collections/multiterm_rewrite_collection.jsonld b/src/test/resources/queries/collections/multiterm_rewrite_collection.jsonld
index c07f88c..30adfd6 100644
--- a/src/test/resources/queries/collections/multiterm_rewrite_collection.jsonld
+++ b/src/test/resources/queries/collections/multiterm_rewrite_collection.jsonld
@@ -11,17 +11,17 @@
"context":"paragraph"
},
"query":{
- "@type":"korap:group",
+ "@type":"koral:group",
"operation":"operation:sequence",
"operands":[
{
- "@type":"korap:group",
+ "@type":"koral:group",
"operation":"operation:repetition",
"operands":[
{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry":"tt",
"layer":"p",
"type":"type:regex",
@@ -31,7 +31,7 @@
}
],
"boundary":{
- "@type":"korap:boundary",
+ "@type":"koral:boundary",
"min":0,
"max":3
},
@@ -39,9 +39,9 @@
"max":3
},
{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry":"tt",
"layer":"p",
"type":"type:regex",
@@ -53,10 +53,10 @@
},
"collections":[
{
- "@type":"korap:meta-filter",
+ "@type":"koral:meta-filter",
"@value":{
- "@type":"korap:term",
- "@field":"korap:field#corpusID",
+ "@type":"koral:term",
+ "@field":"koral:field#corpusID",
"@value":"WPD"
}
}
diff --git a/src/test/resources/queries/collections/no_collection.jsonld b/src/test/resources/queries/collections/no_collection.jsonld
index 6eec72e..3ea96ea 100644
--- a/src/test/resources/queries/collections/no_collection.jsonld
+++ b/src/test/resources/queries/collections/no_collection.jsonld
@@ -10,17 +10,17 @@
"context":"paragraph"
},
"query":{
- "@type":"korap:group",
+ "@type":"koral:group",
"operation":"operation:sequence",
"operands":[
{
- "@type":"korap:group",
+ "@type":"koral:group",
"operation":"operation:repetition",
"operands":[
{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry":"tt",
"layer":"p",
"type":"type:regex",
@@ -30,7 +30,7 @@
}
],
"boundary":{
- "@type":"korap:boundary",
+ "@type":"koral:boundary",
"min":0,
"max":3
},
@@ -38,9 +38,9 @@
"max":3
},
{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry":"tt",
"layer":"p",
"type":"type:regex",
@@ -52,10 +52,10 @@
},
"collections":[
{
- "@type":"korap:meta-filter",
+ "@type":"koral:meta-filter",
"@value":{
- "@type":"korap:term",
- "@field":"korap:field#corpusID",
+ "@type":"koral:term",
+ "@field":"koral:field#corpusID",
"@value":"WPD"
}
}
diff --git a/src/test/resources/queries/cosmas1.json b/src/test/resources/queries/cosmas1.json
index 2215e86..a1456d3 100644
--- a/src/test/resources/queries/cosmas1.json
+++ b/src/test/resources/queries/cosmas1.json
@@ -1,27 +1,27 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:sequence",
"inOrder" : false,
"distances" : [ {
- "@type" : "korap:distance",
+ "@type" : "koral:distance",
"key" : "s",
"min" : 0,
"max" : 0
} ],
"operands" : [ {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Buchstabe",
"layer" : "orth",
"match" : "match:eq"
}
}, {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "deutschen",
"layer" : "orth",
"match" : "match:eq"
diff --git a/src/test/resources/queries/cosmas10.json b/src/test/resources/queries/cosmas10.json
index 08361d2..2090857 100644
--- a/src/test/resources/queries/cosmas10.json
+++ b/src/test/resources/queries/cosmas10.json
@@ -1,37 +1,37 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:sequence",
"operands" : [ {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Institut",
"layer" : "orth",
"match" : "match:eq"
}
}, {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "für",
"layer" : "orth",
"match" : "match:eq"
}
}, {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"caseInsensitive" : true,
"key" : "deutsche",
"layer" : "orth",
"match" : "match:eq"
}
}, {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Sprache",
"layer" : "orth",
"match" : "match:eq"
diff --git a/src/test/resources/queries/cosmas10b.json b/src/test/resources/queries/cosmas10b.json
index 618a25f..a5660bc 100644
--- a/src/test/resources/queries/cosmas10b.json
+++ b/src/test/resources/queries/cosmas10b.json
@@ -1,38 +1,38 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:sequence",
"operands" : [ {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Institut",
"layer" : "orth",
"match" : "match:eq"
}
}, {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "FÜR",
"layer" : "orth",
"caseInsensitive" : true,
"match" : "match:eq"
}
}, {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"caseInsensitive" : true,
"key" : "deutsche",
"layer" : "orth",
"match" : "match:eq"
}
}, {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Sprache",
"layer" : "orth",
"match" : "match:eq"
diff --git a/src/test/resources/queries/cosmas16.json b/src/test/resources/queries/cosmas16.json
index 852a964..d9ad699 100644
--- a/src/test/resources/queries/cosmas16.json
+++ b/src/test/resources/queries/cosmas16.json
@@ -1,23 +1,23 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:reference",
+ "@type" : "koral:reference",
"classRef" : [ 1 ],
"operands" : [ {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:position",
"frames" : ["frames:startsWith"],
"operands" : [ {
- "@type" : "korap:span",
+ "@type" : "koral:span",
"key" : "s"
}, {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:class",
"classOut" : 1,
"operands" : [ {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"caseInsensitive" : true,
"key" : "wegen",
"layer" : "orth",
diff --git a/src/test/resources/queries/cosmas17.json b/src/test/resources/queries/cosmas17.json
index c0d1f5c..b061e4e 100644
--- a/src/test/resources/queries/cosmas17.json
+++ b/src/test/resources/queries/cosmas17.json
@@ -1,16 +1,16 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:position",
"frames" : ["frames:startsWith", "frames:matches", "frames:alignsLeft"],
"operands" : [ {
- "@type" : "korap:span",
+ "@type" : "koral:span",
"key" : "s"
}, {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"caseInsensitive" : true,
"key" : "wegen",
"layer" : "orth",
diff --git a/src/test/resources/queries/cosmas20.json b/src/test/resources/queries/cosmas20.json
index 5a4b745..861b7e0 100644
--- a/src/test/resources/queries/cosmas20.json
+++ b/src/test/resources/queries/cosmas20.json
@@ -1,23 +1,23 @@
{
"context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:reference",
+ "@type" : "koral:reference",
"classRef" : [ 1 ],
"operands" : [ {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:position",
"frames" : ["frames:endsWith", "frames:matches", "frames:alignsRight"],
"operands" : [ {
- "@type" : "korap:span",
+ "@type" : "koral:span",
"key" : "s"
}, {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:class",
"classOut" : 1,
"operands" : [ {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "V",
"layer" : "pos",
"match" : "match:eq"
diff --git a/src/test/resources/queries/cosmas3.json b/src/test/resources/queries/cosmas3.json
index d86045e..2dd75ac 100644
--- a/src/test/resources/queries/cosmas3.json
+++ b/src/test/resources/queries/cosmas3.json
@@ -1,27 +1,27 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:sequence",
"inOrder" : true,
"distances" : [ {
- "@type" : "korap:distance",
+ "@type" : "koral:distance",
"key" : "w",
"min" : 1,
"max" : 3
} ],
"operands" : [ {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "das",
"layer" : "orth",
"match" : "match:eq"
}
}, {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Buch",
"layer" : "orth",
"match" : "match:eq"
diff --git a/src/test/resources/queries/cosmas4.json b/src/test/resources/queries/cosmas4.json
index 2dff321..d9bd77c 100644
--- a/src/test/resources/queries/cosmas4.json
+++ b/src/test/resources/queries/cosmas4.json
@@ -1,36 +1,36 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:sequence",
"inOrder" : true,
"distances" : [ {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:and",
"operands" : [ {
- "@type" : "korap:distance",
+ "@type" : "koral:distance",
"key" : "w",
"min" : 1,
"max" : 3
}, {
- "@type" : "korap:distance",
+ "@type" : "koral:distance",
"key" : "s",
"min" : 1,
"max" : 1
} ]
} ],
"operands" : [ {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "das",
"layer" : "orth",
"match" : "match:eq"
}
}, {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Buch",
"layer" : "orth",
"match" : "match:eq"
diff --git a/src/test/resources/queries/cosmas4b.json b/src/test/resources/queries/cosmas4b.json
index 4b44753..fac3101 100644
--- a/src/test/resources/queries/cosmas4b.json
+++ b/src/test/resources/queries/cosmas4b.json
@@ -1,32 +1,32 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:sequence",
"inOrder" : true,
"distances" : [ {
- "@type" : "korap:distance",
+ "@type" : "koral:distance",
"key" : "w",
"min" : 1,
"max" : 3
}, {
- "@type" : "korap:distance",
+ "@type" : "koral:distance",
"key" : "s",
"min" : 0,
"max" : 1
} ],
"operands" : [ {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "das",
"layer" : "orth",
"match" : "match:eq"
}
}, {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Buch",
"layer" : "orth",
"match" : "match:eq"
@@ -34,10 +34,10 @@
} ]
},
"collections" : [ {
- "@type" : "korap:meta-filter",
+ "@type" : "koral:meta-filter",
"@value" : {
- "@type" : "korap:term",
- "@field" : "korap:field#corpusID",
+ "@type" : "koral:term",
+ "@field" : "koral:field#corpusID",
"@value" : "BRZ13"
}
} ]
diff --git a/src/test/resources/queries/cosmas5.json b/src/test/resources/queries/cosmas5.json
index a96845d..429023b 100644
--- a/src/test/resources/queries/cosmas5.json
+++ b/src/test/resources/queries/cosmas5.json
@@ -1,51 +1,51 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:sequence",
"inOrder" : true,
"distances" : [ {
- "@type" : "korap:distance",
+ "@type" : "koral:distance",
"key" : "w",
"min" : 0,
"max" : 5
} ],
"operands" : [ {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:sequence",
"inOrder" : true,
"distances" : [ {
- "@type" : "korap:distance",
+ "@type" : "koral:distance",
"key" : "w",
"min" : 1,
"max" : 3
}, {
- "@type" : "korap:distance",
+ "@type" : "koral:distance",
"key" : "s",
"min" : 0,
"max" : 1
} ],
"operands" : [ {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "das",
"layer" : "orth",
"match" : "match:eq"
}
}, {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Buch",
"layer" : "orth",
"match" : "match:eq"
}
} ]
}, {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Tisch",
"layer" : "orth",
"match" : "match:eq"
diff --git a/src/test/resources/queries/cosmas6.json b/src/test/resources/queries/cosmas6.json
index 06a9726..2817bb5 100644
--- a/src/test/resources/queries/cosmas6.json
+++ b/src/test/resources/queries/cosmas6.json
@@ -1,50 +1,50 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:sequence",
"inOrder" : true,
"distances" : [ {
- "@type" : "korap:distance",
+ "@type" : "koral:distance",
"key" : "w",
"min" : 0,
"max" : 5
} ],
"operands" : [ {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Tisch",
"layer" : "orth",
"match" : "match:eq"
}
}, {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:sequence",
"inOrder" : true,
"distances" : [ {
- "@type" : "korap:distance",
+ "@type" : "koral:distance",
"key" : "w",
"min" : 1,
"max" : 3
}, {
- "@type" : "korap:distance",
+ "@type" : "koral:distance",
"key" : "s",
"min" : 0,
"max" : 1
} ],
"operands" : [ {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "das",
"layer" : "orth",
"match" : "match:eq"
}
}, {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Buch",
"layer" : "orth",
"match" : "match:eq"
diff --git a/src/test/resources/queries/metaquery.jsonld b/src/test/resources/queries/metaquery.jsonld
index 5b2ae44..b0b4c55 100644
--- a/src/test/resources/queries/metaquery.jsonld
+++ b/src/test/resources/queries/metaquery.jsonld
@@ -9,13 +9,13 @@
}
},
"query":{
- "@type":"korap:group",
+ "@type":"koral:group",
"operation":"operation:or",
"operands":[
{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry":"mate",
"layer" : "lemma",
"key" : "Vokal",
@@ -23,13 +23,13 @@
}
},
{
- "@type":"korap:group",
+ "@type":"koral:group",
"operation": "operation:sequence",
"operands":[
{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry":"mate",
"layer" : "base",
"key" : "der",
@@ -37,9 +37,9 @@
}
},
{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry":"mate",
"layer" : "pos",
"key" : "ADJA",
@@ -52,60 +52,60 @@
},
"collections": [
{
- "@type": "korap:meta-filter",
+ "@type": "koral:meta-filter",
"@id": "korap-filter#id-1223232",
"@value": {
- "@type": "korap:term",
- "@field": "korap:field#textClass",
+ "@type": "koral:term",
+ "@field": "koral:field#textClass",
"@value": "wissenschaft"
}
},
{
- "@type": "korap:meta-filter",
+ "@type": "koral:meta-filter",
"@id": "korap-filter#id-34345454",
"@value": {
- "@type": "korap:group",
+ "@type": "koral:group",
"relation": "and",
"operands": [
{
- "@type": "korap:term",
- "@field": "korap:field#pubPlace",
+ "@type": "koral:term",
+ "@field": "koral:field#pubPlace",
"@value": "Erfurt"
},
{
- "@type": "korap:term",
- "@field": "korap:field#author",
+ "@type": "koral:term",
+ "@field": "koral:field#author",
"@value": "Hesse"
}
]
}
},
{
- "@type": "korap:meta-extend",
+ "@type": "koral:meta-extend",
"@value": {
- "@type": "korap:group",
+ "@type": "koral:group",
"relation": "and",
"operands": [
{
- "@type": "korap:group",
+ "@type": "koral:group",
"comment": "other values can be 'since','until' in combination with a simple korap:term",
"relation": "between",
- "field": "korap:field#pubDate",
+ "field": "koral:field#pubDate",
"operands": [
{
- "@type": "korap:date",
+ "@type": "koral:date",
"comment": "either long value or String representation '2013-04-29'",
"@value": "2011-04-29"
},
{
- "@type": "korap:date",
+ "@type": "koral:date",
"@value": "2013-12-31"
}
]
},
{
- "@type": "korap:term",
- "@field": "korap:field#textClass",
+ "@type": "koral:term",
+ "@field": "koral:field#textClass",
"@value": "freizeit"
}
]
diff --git a/src/test/resources/queries/metaquery2.jsonld b/src/test/resources/queries/metaquery2.jsonld
index e1d4690..f7c906a 100644
--- a/src/test/resources/queries/metaquery2.jsonld
+++ b/src/test/resources/queries/metaquery2.jsonld
@@ -9,13 +9,13 @@
}
},
"query":{
- "@type":"korap:group",
+ "@type":"koral:group",
"operation":"operation:or",
"operands":[
{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry":"mate",
"layer" : "lemma",
"key" : "Vokal",
@@ -23,13 +23,13 @@
}
},
{
- "@type":"korap:group",
+ "@type":"koral:group",
"operation" : "operation:sequence",
"operands":[
{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry":"mate",
"layer" : "lemma",
"key" : "der",
@@ -37,9 +37,9 @@
}
},
{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry":"mate",
"layer" : "p",
"key" : "ADJD",
@@ -52,23 +52,23 @@
},
"collections": [
{
- "@type": "korap:meta-filter",
+ "@type": "koral:meta-filter",
"@value": {
- "@type": "korap:group",
+ "@type": "koral:group",
"relation": "and",
"operands": [
{
- "@type": "korap:term",
- "@field": "korap:field#author",
+ "@type": "koral:term",
+ "@field": "koral:field#author",
"@value": "Hesse"
},
{
- "@type": "korap:group",
- "@field": "korap:field#pubDate",
+ "@type": "koral:group",
+ "@field": "koral:field#pubDate",
"relation": "until",
"operands": [
{
- "@type": "korap:date",
+ "@type": "koral:date",
"@value": "2013-12-05"
}
]
diff --git a/src/test/resources/queries/metaquery3.jsonld b/src/test/resources/queries/metaquery3.jsonld
index adedda0..a9fca44 100644
--- a/src/test/resources/queries/metaquery3.jsonld
+++ b/src/test/resources/queries/metaquery3.jsonld
@@ -9,13 +9,13 @@
}
},
"query":{
- "@type":"korap:group",
+ "@type":"koral:group",
"operation":"operation:or",
"operands":[
{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry" : "mate",
"layer":"l",
"key":"Vokal",
@@ -23,13 +23,13 @@
}
},
{
- "@type":"korap:group",
+ "@type":"koral:group",
"operation" : "operation:sequence",
"operands":[
{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry" : "mate",
"layer":"l",
"key" : "der",
@@ -37,9 +37,9 @@
}
},
{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry":"mate",
"layer" : "p",
"key" : "ADJA",
diff --git a/src/test/resources/queries/metaquery4.jsonld b/src/test/resources/queries/metaquery4.jsonld
index 0344a12..0b6c263 100644
--- a/src/test/resources/queries/metaquery4.jsonld
+++ b/src/test/resources/queries/metaquery4.jsonld
@@ -9,9 +9,9 @@
}
},
"query":{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry":"mate",
"layer":"l",
"key":"familie",
@@ -20,19 +20,19 @@
},
"collections": [
{
- "@type": "korap:meta-filter",
+ "@type": "koral:meta-filter",
"@id": "korap-filter#id-1223232",
"@value": {
- "@type": "korap:group",
+ "@type": "koral:group",
"relation": "between",
- "@field": "korap:field#pubDate",
+ "@field": "koral:field#pubDate",
"operands": [
{
- "@type": "korap:date",
+ "@type": "koral:date",
"@value": "2000-01-01"
},
{
- "@type": "korap:date",
+ "@type": "koral:date",
"@value": "2013-12-31"
}
]
diff --git a/src/test/resources/queries/metaquery5.jsonld b/src/test/resources/queries/metaquery5.jsonld
index 7fc5b85..06141c3 100644
--- a/src/test/resources/queries/metaquery5.jsonld
+++ b/src/test/resources/queries/metaquery5.jsonld
@@ -9,9 +9,9 @@
}
},
"query":{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry": "mate",
"layer":"l",
"key":"lediglich",
@@ -20,23 +20,23 @@
},
"collections": [
{
- "@type": "korap:meta-filter",
+ "@type": "koral:meta-filter",
"@id": "korap-filter#id-1223232",
"@value": {
- "@type": "korap:group",
+ "@type": "koral:group",
"relation": "and",
"operands": [
{
- "@type": "korap:group",
+ "@type": "koral:group",
"relation": "between",
- "@field": "korap:field#pubDate",
+ "@field": "koral:field#pubDate",
"operands": [
{
- "@type": "korap:date",
+ "@type": "koral:date",
"@value": "2000-01-01"
},
{
- "@type": "korap:date",
+ "@type": "koral:date",
"@value": "2013-12-31"
}
]
diff --git a/src/test/resources/queries/metaquery6.jsonld b/src/test/resources/queries/metaquery6.jsonld
index 0e4c30f..2d4b8e1 100644
--- a/src/test/resources/queries/metaquery6.jsonld
+++ b/src/test/resources/queries/metaquery6.jsonld
@@ -9,9 +9,9 @@
}
},
"query":{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry":"mate",
"layer":"l",
"key":"lediglich"
@@ -19,23 +19,23 @@
},
"collections": [
{
- "@type": "korap:meta-filter",
+ "@type": "koral:meta-filter",
"@id": "korap-filter#id-1223232",
"@value": {
- "@type": "korap:group",
+ "@type": "koral:group",
"relation": "and",
"operands": [
{
- "@type": "korap:group",
+ "@type": "koral:group",
"relation": "between",
- "@field": "korap:field#pubDate",
+ "@field": "koral:field#pubDate",
"operands": [
{
- "@type": "korap:date",
+ "@type": "koral:date",
"@value": "2005-01-01"
},
{
- "@type": "korap:date",
+ "@type": "koral:date",
"@value": "2013-12-31"
}
]
diff --git a/src/test/resources/queries/metaquery7.jsonld b/src/test/resources/queries/metaquery7.jsonld
index a7114e6..0b664ed 100644
--- a/src/test/resources/queries/metaquery7.jsonld
+++ b/src/test/resources/queries/metaquery7.jsonld
@@ -9,9 +9,9 @@
}
},
"query":{
- "@type":"korap:token",
+ "@type":"koral:token",
"wrap":{
- "@type":"korap:term",
+ "@type":"koral:term",
"foundry":"mate",
"layer":"l",
"key":"lediglich"
@@ -19,38 +19,38 @@
},
"collections": [
{
- "@type": "korap:meta-filter",
+ "@type": "koral:meta-filter",
"@id": "korap-filter#id-1223232",
"@value": {
- "@type": "korap:group",
+ "@type": "koral:group",
"relation": "or",
- "@field": "korap:field#corpusID",
+ "@field": "koral:field#corpusID",
"operands": [
{
- "@type": "korap:term",
+ "@type": "koral:term",
"@value": "c-1"
},
{
- "@type": "korap:term",
+ "@type": "koral:term",
"@value": "c-2"
}
]
}
},
{
- "@type": "korap:meta-filter",
+ "@type": "koral:meta-filter",
"@id": "korap-filter#id-1223232",
"@value": {
- "@type": "korap:group",
+ "@type": "koral:group",
"relation": "and",
- "@field": "korap:field#corpusID",
+ "@field": "koral:field#corpusID",
"operands": [
{
- "@type": "korap:term",
+ "@type": "koral:term",
"@value": "d-1"
},
{
- "@type": "korap:term",
+ "@type": "koral:term",
"@value": "d-2"
}
]
diff --git a/src/test/resources/queries/metaquery8-filtered-further.jsonld b/src/test/resources/queries/metaquery8-filtered-further.jsonld
index 945a2fa..5a497cf 100644
--- a/src/test/resources/queries/metaquery8-filtered-further.jsonld
+++ b/src/test/resources/queries/metaquery8-filtered-further.jsonld
@@ -1,9 +1,9 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry": "mate",
"layer" : "lemma",
"key":"der",
@@ -20,57 +20,57 @@
},
"collections": [
{
- "@type": "korap:meta-filter",
+ "@type": "koral:meta-filter",
"@id": "korap-filter#id-1223232",
"@value": {
- "@type": "korap:group",
+ "@type": "koral:group",
"relation": "or",
- "@field": "korap:field#ID",
+ "@field": "koral:field#ID",
"operands": [
{
- "@type": "korap:term",
+ "@type": "koral:term",
"@value": "WPD_AAA.00001"
},
{
- "@type": "korap:term",
+ "@type": "koral:term",
"@value": "WPD_AAA.00002"
}
]
}
},
{
- "@type": "korap:meta-filter",
+ "@type": "koral:meta-filter",
"@id": "korap-filter#id-1223232",
"@value": {
- "@type": "korap:group",
+ "@type": "koral:group",
"relation": "or",
- "@field": "korap:field#ID",
+ "@field": "koral:field#ID",
"operands": [
{
- "@type": "korap:term",
+ "@type": "koral:term",
"@value": "WPD_AAA.00003"
},
{
- "@type": "korap:term",
+ "@type": "koral:term",
"@value": "WPD_AAA.00002"
}
]
}
},
{
- "@type": "korap:meta-filter",
+ "@type": "koral:meta-filter",
"@id": "korap-filter#id-1223232",
"@value": {
- "@type": "korap:group",
+ "@type": "koral:group",
"relation": "or",
- "@field": "korap:field#ID",
+ "@field": "koral:field#ID",
"operands": [
{
- "@type": "korap:term",
+ "@type": "koral:term",
"@value": "WPD_AAA.00001"
},
{
- "@type": "korap:term",
+ "@type": "koral:term",
"@value": "WPD_AAA.00005"
}
]
diff --git a/src/test/resources/queries/metaquery8-filtered-nested.jsonld b/src/test/resources/queries/metaquery8-filtered-nested.jsonld
index ebb56ab..7c8cf43 100644
--- a/src/test/resources/queries/metaquery8-filtered-nested.jsonld
+++ b/src/test/resources/queries/metaquery8-filtered-nested.jsonld
@@ -1,9 +1,9 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry": "mate",
"layer" : "lemma",
"key":"der",
@@ -20,47 +20,47 @@
},
"collections": [
{
- "@type": "korap:meta-filter",
+ "@type": "koral:meta-filter",
"@id": "korap-filter#id-1223232",
"@value": {
- "@type": "korap:group",
+ "@type": "koral:group",
"relation": "or",
- "@field": "korap:field#ID",
+ "@field": "koral:field#ID",
"operands": [
{
- "@type": "korap:term",
+ "@type": "koral:term",
"@value": "WPD_AAA.00001"
},
{
- "@type": "korap:term",
+ "@type": "koral:term",
"@value": "WPD_AAA.00002"
}
]
}
},
{
- "@type": "korap:meta-filter",
+ "@type": "koral:meta-filter",
"@id": "korap-filter#id-1223232",
"@value": {
- "@type": "korap:group",
+ "@type": "koral:group",
"relation": "or",
- "@field": "korap:field#ID",
+ "@field": "koral:field#ID",
"operands": [
{
- "@type": "korap:term",
+ "@type": "koral:term",
"@value": "WPD_AAA.00003"
},
{
- "@type": "korap:group",
+ "@type": "koral:group",
"relation": "and",
- "@field": "korap:field#tokens",
+ "@field": "koral:field#tokens",
"operands": [
{
- "@type": "korap:term",
+ "@type": "koral:term",
"@value": "s:die"
},
{
- "@type": "korap:term",
+ "@type": "koral:term",
"@value": "s:Schriftzeichen"
}
diff --git a/src/test/resources/queries/metaquery8-filtered.jsonld b/src/test/resources/queries/metaquery8-filtered.jsonld
index ddb51cf..9e7ee8a 100644
--- a/src/test/resources/queries/metaquery8-filtered.jsonld
+++ b/src/test/resources/queries/metaquery8-filtered.jsonld
@@ -1,9 +1,9 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry": "mate",
"layer" : "lemma",
"key":"der",
@@ -20,38 +20,38 @@
},
"collections": [
{
- "@type": "korap:meta-filter",
+ "@type": "koral:meta-filter",
"@id": "korap-filter#id-1223232",
"@value": {
- "@type": "korap:group",
+ "@type": "koral:group",
"relation": "or",
- "@field": "korap:field#ID",
+ "@field": "koral:field#ID",
"operands": [
{
- "@type": "korap:term",
+ "@type": "koral:term",
"@value": "WPD_AAA.00001"
},
{
- "@type": "korap:term",
+ "@type": "koral:term",
"@value": "WPD_AAA.00002"
}
]
}
},
{
- "@type": "korap:meta-filter",
+ "@type": "koral:meta-filter",
"@id": "korap-filter#id-1223232",
"@value": {
- "@type": "korap:group",
+ "@type": "koral:group",
"relation": "or",
- "@field": "korap:field#ID",
+ "@field": "koral:field#ID",
"operands": [
{
- "@type": "korap:term",
+ "@type": "koral:term",
"@value": "WPD_AAA.00003"
},
{
- "@type": "korap:term",
+ "@type": "koral:term",
"@value": "WPD_AAA.00002"
}
]
diff --git a/src/test/resources/queries/metaquery8-nocollection.jsonld b/src/test/resources/queries/metaquery8-nocollection.jsonld
index 6edf506..64f8673 100644
--- a/src/test/resources/queries/metaquery8-nocollection.jsonld
+++ b/src/test/resources/queries/metaquery8-nocollection.jsonld
@@ -1,9 +1,9 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry": "mate",
"layer" : "lemma",
"key":"der",
diff --git a/src/test/resources/queries/metaquery8.jsonld b/src/test/resources/queries/metaquery8.jsonld
index 77dfc4c..f2417f0 100644
--- a/src/test/resources/queries/metaquery8.jsonld
+++ b/src/test/resources/queries/metaquery8.jsonld
@@ -1,9 +1,9 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"foundry": "mate",
"layer" : "lemma",
"key":"der",
@@ -20,19 +20,19 @@
},
"collections": [
{
- "@type": "korap:meta-filter",
+ "@type": "koral:meta-filter",
"@id": "korap-filter#id-1223232",
"@value": {
- "@type": "korap:group",
+ "@type": "koral:group",
"relation": "or",
- "@field": "korap:field#ID",
+ "@field": "koral:field#ID",
"operands": [
{
- "@type": "korap:term",
+ "@type": "koral:term",
"@value": "WPD_AAA.00001"
},
{
- "@type": "korap:term",
+ "@type": "koral:term",
"@value": "WPD_AAA.00002"
}
]
diff --git a/src/test/resources/queries/metaquery9.jsonld b/src/test/resources/queries/metaquery9.jsonld
index fef3fdb..5a812ec 100644
--- a/src/test/resources/queries/metaquery9.jsonld
+++ b/src/test/resources/queries/metaquery9.jsonld
@@ -1,10 +1,10 @@
{
"collections":[
{
- "@type":"korap:meta-filter",
+ "@type":"koral:meta-filter",
"@value":{
- "@type":"korap:term",
- "@field":"korap:field#corpusID",
+ "@type":"koral:term",
+ "@field":"koral:field#corpusID",
"@value":"WPD"
}
}
diff --git a/src/test/resources/queries/metas/fields.jsonld b/src/test/resources/queries/metas/fields.jsonld
index 42966ac..845f3f8 100644
--- a/src/test/resources/queries/metas/fields.jsonld
+++ b/src/test/resources/queries/metas/fields.jsonld
@@ -3,10 +3,10 @@
"announcements" : [],
"collections" : [
{
- "@type" : "korap:meta-filter",
+ "@type" : "koral:meta-filter",
"@value" : {
- "@field" : "korap:field#corpusID",
- "@type" : "korap:term",
+ "@field" : "koral:field#corpusID",
+ "@type" : "koral:term",
"@value" : "WPD"
}
}
@@ -17,9 +17,9 @@
"count":9
},
"query" : {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Buchstabe",
"foundry" : "tt",
"layer" : "lemma",
diff --git a/src/test/resources/queries/metas/fields_2.jsonld b/src/test/resources/queries/metas/fields_2.jsonld
index c141962..02c2474 100644
--- a/src/test/resources/queries/metas/fields_2.jsonld
+++ b/src/test/resources/queries/metas/fields_2.jsonld
@@ -3,10 +3,10 @@
"announcements" : [],
"collections" : [
{
- "@type" : "korap:meta-filter",
+ "@type" : "koral:meta-filter",
"@value" : {
- "@field" : "korap:field#corpusID",
- "@type" : "korap:term",
+ "@field" : "koral:field#corpusID",
+ "@type" : "koral:term",
"@value" : "WPD"
}
}
@@ -17,9 +17,9 @@
"count":2
},
"query" : {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Buchstabe",
"foundry" : "tt",
"layer" : "lemma",
diff --git a/src/test/resources/queries/poly1.json b/src/test/resources/queries/poly1.json
index 77bc6b5..3b2cb50 100644
--- a/src/test/resources/queries/poly1.json
+++ b/src/test/resources/queries/poly1.json
@@ -7,10 +7,10 @@
"collection" : {},
"collections" : [
{
- "@type" : "korap:meta-filter",
+ "@type" : "koral:meta-filter",
"@value" : {
- "@field" : "korap:field#corpusID",
- "@type" : "korap:term",
+ "@field" : "koral:field#corpusID",
+ "@type" : "koral:term",
"@value" : "WPD"
}
}
@@ -18,16 +18,16 @@
"errors" : [],
"meta" : {},
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"classOut" : 1,
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "VVPP",
"layer" : "p",
@@ -38,16 +38,16 @@
"operation" : "operation:class"
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"classOut" : 2,
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "APPR",
"layer" : "pos",
@@ -55,9 +55,9 @@
}
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "mate",
"key" : "case",
"layer" : "m",
diff --git a/src/test/resources/queries/poly2.json b/src/test/resources/queries/poly2.json
index 543da5e..0477f35 100644
--- a/src/test/resources/queries/poly2.json
+++ b/src/test/resources/queries/poly2.json
@@ -6,10 +6,10 @@
"collection" : {},
"collections" : [
{
- "@type" : "korap:meta-filter",
+ "@type" : "koral:meta-filter",
"@value" : {
- "@field" : "korap:field#corpusID",
- "@type" : "korap:term",
+ "@field" : "koral:field#corpusID",
+ "@type" : "koral:term",
"@value" : "WPD"
}
}
@@ -17,25 +17,25 @@
"errors" : [],
"meta" : {},
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"frames" : [
"frames:isAround"
],
"operands" : [
{
- "@type" : "korap:span",
+ "@type" : "koral:span",
"key" : "s"
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"caseInsensitive" : true,
"key" : "es",
"layer" : "orth",
@@ -43,9 +43,9 @@
}
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "wird",
"layer" : "orth",
"match" : "match:eq"
@@ -55,12 +55,12 @@
"operation" : "operation:sequence"
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"caseInsensitive" : true,
"key" : "wird",
"layer" : "orth",
@@ -68,9 +68,9 @@
}
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "es",
"layer" : "orth",
"match" : "match:eq"
diff --git a/src/test/resources/queries/poly3.json b/src/test/resources/queries/poly3.json
index 45492c7..2175cf3 100644
--- a/src/test/resources/queries/poly3.json
+++ b/src/test/resources/queries/poly3.json
@@ -3,10 +3,10 @@
"collection" : {},
"collections" : [
{
- "@type" : "korap:meta-filter",
+ "@type" : "koral:meta-filter",
"@value" : {
- "@field" : "korap:field#corpusID",
- "@type" : "korap:term",
+ "@field" : "koral:field#corpusID",
+ "@type" : "koral:term",
"@value" : "WPD"
}
}
@@ -15,28 +15,28 @@
"messages" : [],
"meta" : {},
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "Aa",
"layer" : "orth",
"match" : "match:eq"
}
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "durch",
"layer" : "orth",
"match" : "match:eq"
}
},
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}
],
"operation" : "operation:sequence"
diff --git a/src/test/resources/queries/poly4.json b/src/test/resources/queries/poly4.json
index 4d38ad4..025b59e 100644
--- a/src/test/resources/queries/poly4.json
+++ b/src/test/resources/queries/poly4.json
@@ -3,10 +3,10 @@
"collection" : {},
"collections" : [
{
- "@type" : "korap:meta-filter",
+ "@type" : "koral:meta-filter",
"@value" : {
- "@field" : "korap:field#corpusID",
- "@type" : "korap:term",
+ "@field" : "koral:field#corpusID",
+ "@type" : "koral:term",
"@value" : "WPD"
}
}
@@ -28,9 +28,9 @@
],
"meta" : {},
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"boundary" : {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"max" : 3,
"min" : 1
},
@@ -38,16 +38,16 @@
"min" : 1,
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"classOut" : 1,
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
@@ -58,9 +58,9 @@
"operation" : "operation:class"
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"boundary" : {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"max" : 5,
"min" : 1
},
@@ -68,7 +68,7 @@
"min" : 1,
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}
],
"operation" : "operation:repetition"
diff --git a/src/test/resources/queries/sequence/empty-first-class.jsonld b/src/test/resources/queries/sequence/empty-first-class.jsonld
index f55d382..3c0e1ff 100644
--- a/src/test/resources/queries/sequence/empty-first-class.jsonld
+++ b/src/test/resources/queries/sequence/empty-first-class.jsonld
@@ -2,31 +2,31 @@
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"collections" : [
{
- "@type" : "korap:meta-filter",
+ "@type" : "koral:meta-filter",
"@value" : {
- "@field" : "korap:field#corpusID",
- "@type" : "korap:term",
+ "@field" : "koral:field#corpusID",
+ "@type" : "koral:term",
"@value" : "WPD"
}
}
],
"meta" : {},
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"classOut" : 2,
"operation" : "operation:class",
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}]
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
diff --git a/src/test/resources/queries/sequence/empty-first-repetition-2.jsonld b/src/test/resources/queries/sequence/empty-first-repetition-2.jsonld
index c84cc4c..cd7d828 100644
--- a/src/test/resources/queries/sequence/empty-first-repetition-2.jsonld
+++ b/src/test/resources/queries/sequence/empty-first-repetition-2.jsonld
@@ -2,35 +2,35 @@
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"collections" : [
{
- "@type" : "korap:meta-filter",
+ "@type" : "koral:meta-filter",
"@value" : {
- "@field" : "korap:field#corpusID",
- "@type" : "korap:term",
+ "@field" : "koral:field#corpusID",
+ "@type" : "koral:term",
"@value" : "WPD"
}
}
],
"meta" : {},
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:repetition",
"boundary": {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"min" : 0,
"max" : 0
},
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}]
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
diff --git a/src/test/resources/queries/sequence/empty-first-repetition.jsonld b/src/test/resources/queries/sequence/empty-first-repetition.jsonld
index 91c09ad..9053171 100644
--- a/src/test/resources/queries/sequence/empty-first-repetition.jsonld
+++ b/src/test/resources/queries/sequence/empty-first-repetition.jsonld
@@ -2,35 +2,35 @@
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"collections" : [
{
- "@type" : "korap:meta-filter",
+ "@type" : "koral:meta-filter",
"@value" : {
- "@field" : "korap:field#corpusID",
- "@type" : "korap:term",
+ "@field" : "koral:field#corpusID",
+ "@type" : "koral:term",
"@value" : "WPD"
}
}
],
"meta" : {},
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:repetition",
"boundary": {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"min" : 2,
"max" : 7
},
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}]
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
diff --git a/src/test/resources/queries/sequence/empty-first.jsonld b/src/test/resources/queries/sequence/empty-first.jsonld
index 0c7b7a5..6e096f1 100644
--- a/src/test/resources/queries/sequence/empty-first.jsonld
+++ b/src/test/resources/queries/sequence/empty-first.jsonld
@@ -2,25 +2,25 @@
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"collections" : [
{
- "@type" : "korap:meta-filter",
+ "@type" : "koral:meta-filter",
"@value" : {
- "@field" : "korap:field#corpusID",
- "@type" : "korap:term",
+ "@field" : "koral:field#corpusID",
+ "@type" : "koral:term",
"@value" : "WPD"
}
}
],
"meta" : {},
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
diff --git a/src/test/resources/queries/sequence/empty-last-class.jsonld b/src/test/resources/queries/sequence/empty-last-class.jsonld
index 9a5ad5e..99dbfa6 100644
--- a/src/test/resources/queries/sequence/empty-last-class.jsonld
+++ b/src/test/resources/queries/sequence/empty-last-class.jsonld
@@ -2,34 +2,34 @@
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"collections" : [
{
- "@type" : "korap:meta-filter",
+ "@type" : "koral:meta-filter",
"@value" : {
- "@field" : "korap:field#corpusID",
- "@type" : "korap:term",
+ "@field" : "koral:field#corpusID",
+ "@type" : "koral:term",
"@value" : "WPD"
}
}
],
"meta" : {},
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "der",
"layer" : "orth",
"match" : "match:eq"
}
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"classOut" : 3,
"operation" : "operation:class",
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}]
}
],
diff --git a/src/test/resources/queries/sequence/empty-last-repetition.jsonld b/src/test/resources/queries/sequence/empty-last-repetition.jsonld
index c57d45a..e5922fc 100644
--- a/src/test/resources/queries/sequence/empty-last-repetition.jsonld
+++ b/src/test/resources/queries/sequence/empty-last-repetition.jsonld
@@ -2,38 +2,38 @@
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"collections" : [
{
- "@type" : "korap:meta-filter",
+ "@type" : "koral:meta-filter",
"@value" : {
- "@field" : "korap:field#corpusID",
- "@type" : "korap:term",
+ "@field" : "koral:field#corpusID",
+ "@type" : "koral:term",
"@value" : "WPD"
}
}
],
"meta" : {},
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "der",
"layer" : "orth",
"match" : "match:eq"
}
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:repetition",
"boundary": {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"min" : 3,
"max" : 5
},
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}
]
}
diff --git a/src/test/resources/queries/sequence/empty-last.jsonld b/src/test/resources/queries/sequence/empty-last.jsonld
index 395e8f8..4469cc4 100644
--- a/src/test/resources/queries/sequence/empty-last.jsonld
+++ b/src/test/resources/queries/sequence/empty-last.jsonld
@@ -2,29 +2,29 @@
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"collections" : [
{
- "@type" : "korap:meta-filter",
+ "@type" : "koral:meta-filter",
"@value" : {
- "@field" : "korap:field#corpusID",
- "@type" : "korap:term",
+ "@field" : "koral:field#corpusID",
+ "@type" : "koral:term",
"@value" : "WPD"
}
}
],
"meta" : {},
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "der",
"layer" : "orth",
"match" : "match:eq"
}
},
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}
],
"operation" : "operation:sequence"
diff --git a/src/test/resources/queries/sequence/empty-middle-class.jsonld b/src/test/resources/queries/sequence/empty-middle-class.jsonld
index 9203e5e..bd4cf0b 100644
--- a/src/test/resources/queries/sequence/empty-middle-class.jsonld
+++ b/src/test/resources/queries/sequence/empty-middle-class.jsonld
@@ -2,41 +2,41 @@
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"collections" : [
{
- "@type" : "korap:meta-filter",
+ "@type" : "koral:meta-filter",
"@value" : {
- "@field" : "korap:field#corpusID",
- "@type" : "korap:term",
+ "@field" : "koral:field#corpusID",
+ "@type" : "koral:term",
"@value" : "WPD"
}
}
],
"meta" : {},
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "der",
"layer" : "orth",
"match" : "match:eq"
}
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"classOut" : 1,
"operation" : "operation:class",
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}
]
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
diff --git a/src/test/resources/queries/sequence/empty-middle-repetition.jsonld b/src/test/resources/queries/sequence/empty-middle-repetition.jsonld
index 22677c5..2bcba1d 100644
--- a/src/test/resources/queries/sequence/empty-middle-repetition.jsonld
+++ b/src/test/resources/queries/sequence/empty-middle-repetition.jsonld
@@ -2,44 +2,44 @@
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"collections" : [
{
- "@type" : "korap:meta-filter",
+ "@type" : "koral:meta-filter",
"@value" : {
- "@field" : "korap:field#corpusID",
- "@type" : "korap:term",
+ "@field" : "koral:field#corpusID",
+ "@type" : "koral:term",
"@value" : "WPD"
}
}
],
"meta" : {},
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "der",
"layer" : "orth",
"match" : "match:eq"
}
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:repetition",
"boundary": {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"min" : 4,
"max" : 8
},
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}]
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
diff --git a/src/test/resources/queries/sequence/empty-middle.jsonld b/src/test/resources/queries/sequence/empty-middle.jsonld
index 005bae4..f4d72e6 100644
--- a/src/test/resources/queries/sequence/empty-middle.jsonld
+++ b/src/test/resources/queries/sequence/empty-middle.jsonld
@@ -2,34 +2,34 @@
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"collections" : [
{
- "@type" : "korap:meta-filter",
+ "@type" : "koral:meta-filter",
"@value" : {
- "@field" : "korap:field#corpusID",
- "@type" : "korap:term",
+ "@field" : "koral:field#corpusID",
+ "@type" : "koral:term",
"@value" : "WPD"
}
}
],
"meta" : {},
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "der",
"layer" : "orth",
"match" : "match:eq"
}
},
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
diff --git a/src/test/resources/queries/sequence/empty-surround-class-2.jsonld b/src/test/resources/queries/sequence/empty-surround-class-2.jsonld
index f927e59..1c14265 100644
--- a/src/test/resources/queries/sequence/empty-surround-class-2.jsonld
+++ b/src/test/resources/queries/sequence/empty-surround-class-2.jsonld
@@ -1,21 +1,21 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"classOut" : 3,
"operation" : "operation:class",
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}]
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
@@ -23,12 +23,12 @@
}
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"classOut" : 2,
"operation" : "operation:class",
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}]
}
],
diff --git a/src/test/resources/queries/sequence/empty-surround-class.jsonld b/src/test/resources/queries/sequence/empty-surround-class.jsonld
index b9a44d0..843dccb 100644
--- a/src/test/resources/queries/sequence/empty-surround-class.jsonld
+++ b/src/test/resources/queries/sequence/empty-surround-class.jsonld
@@ -1,15 +1,15 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
@@ -17,12 +17,12 @@
}
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"classOut" : 2,
"operation" : "operation:class",
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}]
}
],
diff --git a/src/test/resources/queries/sequence/empty-surround-repetition-2.jsonld b/src/test/resources/queries/sequence/empty-surround-repetition-2.jsonld
index 789fc53..c66cedb 100644
--- a/src/test/resources/queries/sequence/empty-surround-repetition-2.jsonld
+++ b/src/test/resources/queries/sequence/empty-surround-repetition-2.jsonld
@@ -1,25 +1,25 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:repetition",
"boundary": {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"min" : 3,
"max" : 5
},
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}]
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
@@ -27,17 +27,17 @@
}
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:repetition",
"boundary": {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"min" : 2,
"max" : 7
},
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}]
}
],
diff --git a/src/test/resources/queries/sequence/empty-surround-repetition-class.jsonld b/src/test/resources/queries/sequence/empty-surround-repetition-class.jsonld
index ec34606..7521c25 100644
--- a/src/test/resources/queries/sequence/empty-surround-repetition-class.jsonld
+++ b/src/test/resources/queries/sequence/empty-surround-repetition-class.jsonld
@@ -1,33 +1,33 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:repetition",
"boundary": {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"min" : 3,
"max" : 8
},
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"classOut" : 1,
"operation" : "operation:class",
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}
]
}
]
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
@@ -35,21 +35,21 @@
}
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"classOut" : 2,
"operation" : "operation:class",
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:repetition",
"boundary": {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"min" : 2,
"max" : 7
},
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}
]
}
diff --git a/src/test/resources/queries/sequence/empty-surround-repetition.jsonld b/src/test/resources/queries/sequence/empty-surround-repetition.jsonld
index 6b88e4f..ccd33c4 100644
--- a/src/test/resources/queries/sequence/empty-surround-repetition.jsonld
+++ b/src/test/resources/queries/sequence/empty-surround-repetition.jsonld
@@ -1,15 +1,15 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
@@ -17,17 +17,17 @@
}
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:repetition",
"boundary": {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"min" : 2,
"max" : 7
},
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}]
}
],
diff --git a/src/test/resources/queries/sequence/empty-surround.jsonld b/src/test/resources/queries/sequence/empty-surround.jsonld
index 2e93da6..6e1208f 100644
--- a/src/test/resources/queries/sequence/empty-surround.jsonld
+++ b/src/test/resources/queries/sequence/empty-surround.jsonld
@@ -1,15 +1,15 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
@@ -17,7 +17,7 @@
}
},
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}
],
"operation" : "operation:sequence"
diff --git a/src/test/resources/queries/sequence/empty.jsonld b/src/test/resources/queries/sequence/empty.jsonld
index 473404d..c3b0fed 100644
--- a/src/test/resources/queries/sequence/empty.jsonld
+++ b/src/test/resources/queries/sequence/empty.jsonld
@@ -2,16 +2,16 @@
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"collections" : [
{
- "@type" : "korap:meta-filter",
+ "@type" : "koral:meta-filter",
"@value" : {
- "@field" : "korap:field#corpusID",
- "@type" : "korap:term",
+ "@field" : "koral:field#corpusID",
+ "@type" : "koral:term",
"@value" : "WPD"
}
}
],
"meta" : {},
"query" : {
- "@type" : "korap:token"
+ "@type" : "koral:token"
}
}
\ No newline at end of file
diff --git a/src/test/resources/queries/sequence/multiple-distances.jsonld b/src/test/resources/queries/sequence/multiple-distances.jsonld
index 4187ded..0696440 100644
--- a/src/test/resources/queries/sequence/multiple-distances.jsonld
+++ b/src/test/resources/queries/sequence/multiple-distances.jsonld
@@ -1,12 +1,12 @@
{
"@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query": {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"distances" : [
{
- "@type" : "korap:distance",
+ "@type" : "koral:distance",
"boundary" : {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"max" : 11,
"min" : 1
},
@@ -18,21 +18,21 @@
"inOrder" : true,
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "er",
"layer" : "orth",
"match" : "match:eq"
}
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"distances" : [
{
- "@type" : "korap:distance",
+ "@type" : "koral:distance",
"boundary" : {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"max" : 11,
"min" : 2
},
@@ -44,18 +44,18 @@
"inOrder" : true,
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "kann",
"layer" : "orth",
"match" : "match:eq"
}
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"key" : "sagte",
"layer" : "orth",
"match" : "match:eq"
diff --git a/src/test/resources/queries/sequence/negative-first-repetition-2.jsonld b/src/test/resources/queries/sequence/negative-first-repetition-2.jsonld
index ded4793..283c605 100644
--- a/src/test/resources/queries/sequence/negative-first-repetition-2.jsonld
+++ b/src/test/resources/queries/sequence/negative-first-repetition-2.jsonld
@@ -1,22 +1,22 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:repetition",
"boundary": {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"min" : 0,
"max" : 5
},
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
@@ -25,9 +25,9 @@
}]
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
diff --git a/src/test/resources/queries/sequence/negative-first-repetition-3.jsonld b/src/test/resources/queries/sequence/negative-first-repetition-3.jsonld
index 7ab3c24..6cd81a0 100644
--- a/src/test/resources/queries/sequence/negative-first-repetition-3.jsonld
+++ b/src/test/resources/queries/sequence/negative-first-repetition-3.jsonld
@@ -1,22 +1,22 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:repetition",
"boundary": {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"min" : 0,
"max" : 0
},
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
@@ -25,9 +25,9 @@
}]
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
diff --git a/src/test/resources/queries/sequence/negative-first-repetition.jsonld b/src/test/resources/queries/sequence/negative-first-repetition.jsonld
index 63df1bf..e040207 100644
--- a/src/test/resources/queries/sequence/negative-first-repetition.jsonld
+++ b/src/test/resources/queries/sequence/negative-first-repetition.jsonld
@@ -1,22 +1,22 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:repetition",
"boundary": {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"min" : 4,
"max" : 5
},
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
@@ -25,9 +25,9 @@
}]
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
diff --git a/src/test/resources/queries/sequence/negative-first.jsonld b/src/test/resources/queries/sequence/negative-first.jsonld
index 5f4a130..8c801bf 100644
--- a/src/test/resources/queries/sequence/negative-first.jsonld
+++ b/src/test/resources/queries/sequence/negative-first.jsonld
@@ -1,12 +1,12 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
@@ -14,9 +14,9 @@
}
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
diff --git a/src/test/resources/queries/sequence/negative-last-class-repetition-2.jsonld b/src/test/resources/queries/sequence/negative-last-class-repetition-2.jsonld
index 0d7207a..a1ab7f7 100644
--- a/src/test/resources/queries/sequence/negative-last-class-repetition-2.jsonld
+++ b/src/test/resources/queries/sequence/negative-last-class-repetition-2.jsonld
@@ -1,12 +1,12 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
@@ -14,23 +14,23 @@
}
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:repetition",
"boundary": {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"min" : 4,
"max" : 5
},
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"classOut" : 2,
"operation" : "operation:class",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
diff --git a/src/test/resources/queries/sequence/negative-last-class-repetition.jsonld b/src/test/resources/queries/sequence/negative-last-class-repetition.jsonld
index 71cc4f3..4dd9e31 100644
--- a/src/test/resources/queries/sequence/negative-last-class-repetition.jsonld
+++ b/src/test/resources/queries/sequence/negative-last-class-repetition.jsonld
@@ -1,12 +1,12 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
@@ -14,23 +14,23 @@
}
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"classOut" : 2,
"operation" : "operation:class",
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:repetition",
"boundary": {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"min" : 4,
"max" : 5
},
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
diff --git a/src/test/resources/queries/sequence/negative-last-class.jsonld b/src/test/resources/queries/sequence/negative-last-class.jsonld
index b668db6..fe7bb08 100644
--- a/src/test/resources/queries/sequence/negative-last-class.jsonld
+++ b/src/test/resources/queries/sequence/negative-last-class.jsonld
@@ -1,12 +1,12 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
@@ -14,14 +14,14 @@
}
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"classOut" : 2,
"operation" : "operation:class",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
diff --git a/src/test/resources/queries/sequence/negative-last-constraint.jsonld b/src/test/resources/queries/sequence/negative-last-constraint.jsonld
index 6c61d11..07be775 100644
--- a/src/test/resources/queries/sequence/negative-last-constraint.jsonld
+++ b/src/test/resources/queries/sequence/negative-last-constraint.jsonld
@@ -1,13 +1,13 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:sequence",
"distances" : [
{
- "@type" : "korap:distance",
+ "@type" : "koral:distance",
"boundary" : {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"min" : 1,
"max" : 2
},
@@ -17,9 +17,9 @@
],
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
@@ -27,9 +27,9 @@
}
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
diff --git a/src/test/resources/queries/sequence/negative-last-sequence-2.jsonld b/src/test/resources/queries/sequence/negative-last-sequence-2.jsonld
index 3e6f4dd..eaa1e94 100644
--- a/src/test/resources/queries/sequence/negative-last-sequence-2.jsonld
+++ b/src/test/resources/queries/sequence/negative-last-sequence-2.jsonld
@@ -1,13 +1,13 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:sequence",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
@@ -15,13 +15,13 @@
}
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:sequence",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "DET",
"layer" : "p",
@@ -29,9 +29,9 @@
}
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "ADJ",
"layer" : "p",
diff --git a/src/test/resources/queries/sequence/negative-last-sequence.jsonld b/src/test/resources/queries/sequence/negative-last-sequence.jsonld
index c3e2777..6e55d60 100644
--- a/src/test/resources/queries/sequence/negative-last-sequence.jsonld
+++ b/src/test/resources/queries/sequence/negative-last-sequence.jsonld
@@ -1,13 +1,13 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:sequence",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
@@ -15,13 +15,13 @@
}
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:sequence",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "DET",
"layer" : "p",
@@ -29,9 +29,9 @@
}
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "ADJ",
"layer" : "p",
diff --git a/src/test/resources/queries/sequence/negative-last.jsonld b/src/test/resources/queries/sequence/negative-last.jsonld
index 7b29c8b..3df451b 100644
--- a/src/test/resources/queries/sequence/negative-last.jsonld
+++ b/src/test/resources/queries/sequence/negative-last.jsonld
@@ -1,12 +1,12 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
@@ -14,9 +14,9 @@
}
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
diff --git a/src/test/resources/queries/sequence/negative.jsonld b/src/test/resources/queries/sequence/negative.jsonld
index c0f5c21..ea1cf1b 100644
--- a/src/test/resources/queries/sequence/negative.jsonld
+++ b/src/test/resources/queries/sequence/negative.jsonld
@@ -1,9 +1,9 @@
{
"@context" : "http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
"query" : {
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "NN",
"layer" : "p",
diff --git a/src/test/resources/queries/submatch/embedded-negative-class-seq.jsonld b/src/test/resources/queries/submatch/embedded-negative-class-seq.jsonld
index 62e48c7..bd938cf 100644
--- a/src/test/resources/queries/submatch/embedded-negative-class-seq.jsonld
+++ b/src/test/resources/queries/submatch/embedded-negative-class-seq.jsonld
@@ -8,30 +8,30 @@
]],
"collection": {},
"query": {
- "@type": "korap:reference",
+ "@type": "koral:reference",
"operation": "operation:focus",
"operands": [{
- "@type": "korap:group",
+ "@type": "koral:group",
"operation": "operation:class",
"class": 1,
"classOut": 1,
"operands": [{
- "@type": "korap:group",
+ "@type": "koral:group",
"operation": "operation:sequence",
"operands": [
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "lemma",
"key": "Baum",
"match": "match:ne"
}
},
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "orth",
"key": "dass",
"match": "match:eq"
diff --git a/src/test/resources/queries/submatch/embedded-negative-repetition.jsonld b/src/test/resources/queries/submatch/embedded-negative-repetition.jsonld
index 29f676d..69b3efd 100644
--- a/src/test/resources/queries/submatch/embedded-negative-repetition.jsonld
+++ b/src/test/resources/queries/submatch/embedded-negative-repetition.jsonld
@@ -5,35 +5,35 @@
"messages": [],
"collection": {},
"query": {
- "@type": "korap:reference",
+ "@type": "koral:reference",
"operation": "operation:focus",
"operands": [{
- "@type": "korap:group",
+ "@type": "koral:group",
"operation": "operation:sequence",
"operands": [
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "orth",
"key": "das",
"match": "match:eq"
}
},
{
- "@type": "korap:group",
+ "@type": "koral:group",
"operation": "operation:repetition",
"operands": [{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "lemma",
"key": "Baum",
"match": "match:ne"
}
}],
"boundary": {
- "@type": "korap:boundary",
+ "@type": "koral:boundary",
"min": 1,
"max": 3
}
diff --git a/src/test/resources/queries/submatch/embedded-negative-seq.jsonld b/src/test/resources/queries/submatch/embedded-negative-seq.jsonld
index 5f9b1a8..fb48ea1 100644
--- a/src/test/resources/queries/submatch/embedded-negative-seq.jsonld
+++ b/src/test/resources/queries/submatch/embedded-negative-seq.jsonld
@@ -5,25 +5,25 @@
"messages": [],
"collection": {},
"query": {
- "@type": "korap:reference",
+ "@type": "koral:reference",
"operation": "operation:focus",
"operands": [{
- "@type": "korap:group",
+ "@type": "koral:group",
"operation": "operation:sequence",
"operands": [
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "orth",
"key": "das",
"match": "match:eq"
}
},
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "lemma",
"key": "Baum",
"match": "match:ne"
diff --git a/src/test/resources/queries/submatch/embedded-null.jsonld b/src/test/resources/queries/submatch/embedded-null.jsonld
index 4672473..2666187 100644
--- a/src/test/resources/queries/submatch/embedded-null.jsonld
+++ b/src/test/resources/queries/submatch/embedded-null.jsonld
@@ -2,13 +2,13 @@
"@context":"http://ids-mannheim.de/ns/KorAP/json-ld/v0.2/context.jsonld",
"collection":null,
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation":"operation:sequence",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "opennlp",
"key" : "die",
"layer" : "orth",
@@ -16,13 +16,13 @@
}
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:reference",
+ "@type" : "koral:reference",
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}
],
"operation" : "operation:focus",
diff --git a/src/test/resources/queries/submatch/embedded-valid-empty.jsonld b/src/test/resources/queries/submatch/embedded-valid-empty.jsonld
index a6f22bd..54025a9 100644
--- a/src/test/resources/queries/submatch/embedded-valid-empty.jsonld
+++ b/src/test/resources/queries/submatch/embedded-valid-empty.jsonld
@@ -2,13 +2,13 @@
"@context":"http://ids-mannheim.de/ns/KorAP/json-ld/v0.2/context.jsonld",
"collection":null,
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation":"operation:sequence",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "opennlp",
"key" : "die",
"layer" : "orth",
@@ -16,20 +16,20 @@
}
},
{
- "@type" : "korap:reference",
+ "@type" : "koral:reference",
"spanRef" : [2],
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operation" : "operation:repetition",
"boundary" : {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"max" : 5,
"min" : 0
},
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}
]
}
diff --git a/src/test/resources/queries/submatch/embedded.jsonld b/src/test/resources/queries/submatch/embedded.jsonld
index e09bef5..22d0707 100644
--- a/src/test/resources/queries/submatch/embedded.jsonld
+++ b/src/test/resources/queries/submatch/embedded.jsonld
@@ -2,15 +2,15 @@
"@context":"http://ids-mannheim.de/ns/KorAP/json-ld/v0.2/context.jsonld",
"collection":null,
"query" : {
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "opennlp",
"key" : "die",
"layer" : "orth",
@@ -21,18 +21,18 @@
"operation" : "operation:class"
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:reference",
+ "@type" : "koral:reference",
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "opennlp",
"key" : "der",
"layer" : "orth",
@@ -40,14 +40,14 @@
}
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"boundary" : {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"min" : 1
},
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}
],
"operation" : "operation:repetition"
diff --git a/src/test/resources/queries/submatch/empty-max.jsonld b/src/test/resources/queries/submatch/empty-max.jsonld
index dc4d321..3dd1fd9 100644
--- a/src/test/resources/queries/submatch/empty-max.jsonld
+++ b/src/test/resources/queries/submatch/empty-max.jsonld
@@ -11,15 +11,15 @@
],
"collection":null,
"query":{
- "@type" : "korap:reference",
+ "@type" : "koral:reference",
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "opennlp",
"key" : "der",
"layer" : "orth",
@@ -27,15 +27,15 @@
}
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"boundary" : {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"min" : 1,
"max" : 8
},
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}
],
"operation" : "operation:repetition"
diff --git a/src/test/resources/queries/submatch/empty-minusStart.jsonld b/src/test/resources/queries/submatch/empty-minusStart.jsonld
index 3efaeba..20de16f 100644
--- a/src/test/resources/queries/submatch/empty-minusStart.jsonld
+++ b/src/test/resources/queries/submatch/empty-minusStart.jsonld
@@ -11,15 +11,15 @@
],
"collection":null,
"query":{
- "@type" : "korap:reference",
+ "@type" : "koral:reference",
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "opennlp",
"key" : "der",
"layer" : "orth",
@@ -27,15 +27,15 @@
}
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"boundary" : {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"min" : 1,
"max" : 8
},
"operands" : [
{
- "@type" : "korap:token"
+ "@type" : "koral:token"
}
],
"operation" : "operation:repetition"
diff --git a/src/test/resources/queries/submatch/minusStart.jsonld b/src/test/resources/queries/submatch/minusStart.jsonld
index 38c593a..3b6df37 100644
--- a/src/test/resources/queries/submatch/minusStart.jsonld
+++ b/src/test/resources/queries/submatch/minusStart.jsonld
@@ -11,10 +11,10 @@
],
"collection":null,
"query":{
- "@type" : "korap:reference",
+ "@type" : "koral:reference",
"operands" : [
{
- "@type" : "korap:span",
+ "@type" : "koral:span",
"key" : "s"
}
],
diff --git a/src/test/resources/queries/submatch/negative-repetition.jsonld b/src/test/resources/queries/submatch/negative-repetition.jsonld
index b869ba2..efbea0a 100644
--- a/src/test/resources/queries/submatch/negative-repetition.jsonld
+++ b/src/test/resources/queries/submatch/negative-repetition.jsonld
@@ -5,35 +5,35 @@
"messages": [],
"collection": {},
"query": {
- "@type": "korap:group",
+ "@type": "koral:group",
"operation": "operation:sequence",
"operands": [
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "orth",
"key": "das",
"match": "match:eq"
}
},
{
- "@type": "korap:reference",
+ "@type": "koral:reference",
"operation": "operation:focus",
"operands": [{
- "@type": "korap:group",
+ "@type": "koral:group",
"operation": "operation:repetition",
"operands": [{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "lemma",
"key": "Baum",
"match": "match:ne"
}
}],
"boundary": {
- "@type": "korap:boundary",
+ "@type": "koral:boundary",
"min": 1,
"max": 3
}
diff --git a/src/test/resources/queries/submatch/negative-seq.jsonld b/src/test/resources/queries/submatch/negative-seq.jsonld
index 0d4a733..3c53de0 100644
--- a/src/test/resources/queries/submatch/negative-seq.jsonld
+++ b/src/test/resources/queries/submatch/negative-seq.jsonld
@@ -5,25 +5,25 @@
"messages": [],
"collection": {},
"query": {
- "@type": "korap:group",
+ "@type": "koral:group",
"operation": "operation:sequence",
"operands": [
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "orth",
"key": "das",
"match": "match:eq"
}
},
{
- "@type": "korap:reference",
+ "@type": "koral:reference",
"operation": "operation:focus",
"operands": [{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "lemma",
"key": "Baum",
"match": "match:ne"
diff --git a/src/test/resources/queries/submatch/negative-sequence-class.jsonld b/src/test/resources/queries/submatch/negative-sequence-class.jsonld
index 63b6e56..45a05c7 100644
--- a/src/test/resources/queries/submatch/negative-sequence-class.jsonld
+++ b/src/test/resources/queries/submatch/negative-sequence-class.jsonld
@@ -8,30 +8,30 @@
]],
"collection": {},
"query": {
- "@type": "korap:group",
+ "@type": "koral:group",
"operation": "operation:sequence",
"operands": [
{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "orth",
"key": "das",
"match": "match:eq"
}
},
{
- "@type": "korap:group",
+ "@type": "koral:group",
"operation": "operation:class",
"class": 1,
"classOut": 1,
"operands": [{
- "@type": "korap:reference",
+ "@type": "koral:reference",
"operation": "operation:focus",
"operands": [{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "lemma",
"key": "Baum",
"match": "match:ne"
diff --git a/src/test/resources/queries/submatch/negative-token.jsonld b/src/test/resources/queries/submatch/negative-token.jsonld
index c4c0408..3d52879 100644
--- a/src/test/resources/queries/submatch/negative-token.jsonld
+++ b/src/test/resources/queries/submatch/negative-token.jsonld
@@ -5,12 +5,12 @@
"messages": [],
"collection": {},
"query": {
- "@type": "korap:reference",
+ "@type": "koral:reference",
"operation": "operation:focus",
"operands": [{
- "@type": "korap:token",
+ "@type": "koral:token",
"wrap": {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "lemma",
"key": "Baum",
"match": "match:ne"
diff --git a/src/test/resources/queries/submatch/noLength.jsonld b/src/test/resources/queries/submatch/noLength.jsonld
index 6363de6..230b4cb 100644
--- a/src/test/resources/queries/submatch/noLength.jsonld
+++ b/src/test/resources/queries/submatch/noLength.jsonld
@@ -11,10 +11,10 @@
],
"collection":null,
"query":{
- "@type" : "korap:reference",
+ "@type" : "koral:reference",
"operands" : [
{
- "@type" : "korap:span",
+ "@type" : "koral:span",
"key" : "s"
}
],
diff --git a/src/test/resources/queries/submatch/simpleElement.jsonld b/src/test/resources/queries/submatch/simpleElement.jsonld
index cc4a529..a48b56e 100644
--- a/src/test/resources/queries/submatch/simpleElement.jsonld
+++ b/src/test/resources/queries/submatch/simpleElement.jsonld
@@ -11,22 +11,22 @@
],
"collection":null,
"query":{
- "@type" : "korap:reference",
+ "@type" : "koral:reference",
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"frames" : [
"frames:isAround"
],
"operands" : [
{
- "@type" : "korap:span",
+ "@type" : "koral:span",
"key" : "s"
},
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "Haus",
"layer" : "lemma",
diff --git a/src/test/resources/queries/submatch/term-null.jsonld b/src/test/resources/queries/submatch/term-null.jsonld
index 71b0b11..136dbe0 100644
--- a/src/test/resources/queries/submatch/term-null.jsonld
+++ b/src/test/resources/queries/submatch/term-null.jsonld
@@ -11,12 +11,12 @@
],
"collection":null,
"query":{
- "@type" : "korap:reference",
+ "@type" : "koral:reference",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "Haus",
"layer" : "lemma",
diff --git a/src/test/resources/queries/submatch/term-start-offset.jsonld b/src/test/resources/queries/submatch/term-start-offset.jsonld
index 84a6395..2ff9017 100644
--- a/src/test/resources/queries/submatch/term-start-offset.jsonld
+++ b/src/test/resources/queries/submatch/term-start-offset.jsonld
@@ -11,12 +11,12 @@
],
"collection":null,
"query":{
- "@type" : "korap:reference",
+ "@type" : "koral:reference",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "Haus",
"layer" : "lemma",
diff --git a/src/test/resources/queries/submatch/termquery.jsonld b/src/test/resources/queries/submatch/termquery.jsonld
index 7a831b1..aaaa825 100644
--- a/src/test/resources/queries/submatch/termquery.jsonld
+++ b/src/test/resources/queries/submatch/termquery.jsonld
@@ -11,12 +11,12 @@
],
"collection":null,
"query":{
- "@type" : "korap:reference",
+ "@type" : "koral:reference",
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "tt",
"key" : "Haus",
"layer" : "lemma",
diff --git a/src/test/resources/queries/submatch/wrapped.jsonld b/src/test/resources/queries/submatch/wrapped.jsonld
index 8bc7b0c..26c7480 100644
--- a/src/test/resources/queries/submatch/wrapped.jsonld
+++ b/src/test/resources/queries/submatch/wrapped.jsonld
@@ -2,18 +2,18 @@
"@context":"http://ids-mannheim.de/ns/KorAP/json-ld/v0.2/context.jsonld",
"collection":null,
"query" : {
- "@type" : "korap:reference",
+ "@type" : "koral:reference",
"classRef" : [
129
],
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"distances" : [
{
"@type" : "cosmas:distance",
"boundary" : {
- "@type" : "korap:boundary",
+ "@type" : "koral:boundary",
"max" : 0,
"min" : 0
},
@@ -25,14 +25,14 @@
"inOrder" : true,
"operands" : [
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"class" : 129,
"classOut" : 129,
"operands" : [
{
- "@type" : "korap:token",
+ "@type" : "koral:token",
"wrap" : {
- "@type" : "korap:term",
+ "@type" : "koral:term",
"foundry" : "opennlp",
"key" : "der",
"layer" : "orth",
@@ -43,15 +43,15 @@
"operation" : "operation:class"
},
{
- "@type" : "korap:group",
+ "@type" : "koral:group",
"class" : 129,
"classOut" : 129,
"operands" : [
{
- "@type" : "korap:reference",
+ "@type" : "koral:reference",
"operands" : [
{
- "@type" : "korap:span",
+ "@type" : "koral:span",
"key" : "s"
}
],