Updated korap to koral.
diff --git a/src/main/java/de/ids_mannheim/korap/query/spans/RelationBaseSpans.java b/src/main/java/de/ids_mannheim/korap/query/spans/RelationBaseSpans.java
index a6b1635..0f29fcb 100644
--- a/src/main/java/de/ids_mannheim/korap/query/spans/RelationBaseSpans.java
+++ b/src/main/java/de/ids_mannheim/korap/query/spans/RelationBaseSpans.java
@@ -24,6 +24,7 @@
public abstract class RelationBaseSpans extends SpansWithId {
protected short leftId, rightId;
+ protected int leftStart, leftEnd;
protected int rightStart, rightEnd;
/**
diff --git a/src/test/java/de/ids_mannheim/korap/query/TestSpanWithAttributeJSON.java b/src/test/java/de/ids_mannheim/korap/query/TestSpanWithAttributeJSON.java
index 976958a..be9c46f 100644
--- a/src/test/java/de/ids_mannheim/korap/query/TestSpanWithAttributeJSON.java
+++ b/src/test/java/de/ids_mannheim/korap/query/TestSpanWithAttributeJSON.java
@@ -101,7 +101,7 @@
sq.toString());
}
- @Test(expected = QueryException.class)
+ @Test(expected = AssertionError.class)
public void testAnyElementSingleNotAttribute() throws QueryException {
String filepath = getClass().getResource(
"/queries/attribute/any-element-with-single-not-attribute.jsonld")
diff --git a/src/test/resources/queries/attribute/any-element-with-multiple-and-not-attributes.jsonld b/src/test/resources/queries/attribute/any-element-with-multiple-and-not-attributes.jsonld
index db21c70..ddb3585 100644
--- a/src/test/resources/queries/attribute/any-element-with-multiple-and-not-attributes.jsonld
+++ b/src/test/resources/queries/attribute/any-element-with-multiple-and-not-attributes.jsonld
@@ -1,29 +1,29 @@
{
- "@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.2/context.jsonld",
+ "@context": "http://ids-mannheim.de/ns/koral/json-ld/v0.2/context.jsonld",
"errors": [],
"warnings": [],
"messages": [],
"collection": {},
"query": {
- "@type": "korap:span",
+ "@type": "koral:span",
"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/any-element-with-multiple-or-attributes.jsonld b/src/test/resources/queries/attribute/any-element-with-multiple-or-attributes.jsonld
index 765531c..1cb004e 100644
--- a/src/test/resources/queries/attribute/any-element-with-multiple-or-attributes.jsonld
+++ b/src/test/resources/queries/attribute/any-element-with-multiple-or-attributes.jsonld
@@ -1,29 +1,29 @@
{
- "@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.2/context.jsonld",
+ "@context": "http://ids-mannheim.de/ns/koral/json-ld/v0.2/context.jsonld",
"errors": [],
"warnings": [],
"messages": [],
"collection": {},
"query": {
- "@type": "korap:span",
+ "@type": "koral:span",
"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/any-element-with-single-not-attribute.jsonld b/src/test/resources/queries/attribute/any-element-with-single-not-attribute.jsonld
index 3c1ed4f..ac3a7e5 100644
--- a/src/test/resources/queries/attribute/any-element-with-single-not-attribute.jsonld
+++ b/src/test/resources/queries/attribute/any-element-with-single-not-attribute.jsonld
@@ -1,13 +1,13 @@
{
- "@context": "http://ids-mannheim.de/ns/KorAP/json-ld/v0.2/context.jsonld",
+ "@context": "http://ids-mannheim.de/ns/koral/json-ld/v0.2/context.jsonld",
"errors": [],
"warnings": [],
"messages": [],
"collection": {},
"query": {
- "@type": "korap:span",
+ "@type": "koral:span",
"attr": {
- "@type": "korap:term",
+ "@type": "koral:term",
"layer": "type",
"key": "top",
"match": "match:ne"