Changed focus and KoralQuery prefix
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"
}
],