Merge "Updated supported foundries for FCSQL."
diff --git a/src/main/java/de/ids_mannheim/korap/query/serialize/CqlQueryProcessor.java b/src/main/java/de/ids_mannheim/korap/query/serialize/CqlQueryProcessor.java
index 40e6755..7b33e5d 100644
--- a/src/main/java/de/ids_mannheim/korap/query/serialize/CqlQueryProcessor.java
+++ b/src/main/java/de/ids_mannheim/korap/query/serialize/CqlQueryProcessor.java
@@ -159,7 +159,7 @@
distanceMap.put("key", "s");
Map<String, Object> boundary = new LinkedHashMap<String, Object>();
- boundary.put("type", "koral:boundary");
+ boundary.put("@type", "koral:boundary");
boundary.put("min", "0");
boundary.put("max", "0");
distanceMap.put("boundary", boundary);
diff --git a/src/test/java/de/ids_mannheim/korap/query/test/CqlQueryProcessorTest.java b/src/test/java/de/ids_mannheim/korap/query/test/CqlQueryProcessorTest.java
index 56f435c..7f446be 100644
--- a/src/test/java/de/ids_mannheim/korap/query/test/CqlQueryProcessorTest.java
+++ b/src/test/java/de/ids_mannheim/korap/query/test/CqlQueryProcessorTest.java
@@ -61,7 +61,7 @@
query = "(Sonne) and (scheint)";
String jsonLd = "{@type : koral:group, operation : operation:sequence, inOrder : false,"
+ "distances:[ "
- + "{@type : cosmas:distance, key : s, boundary:{type:koral:boundary,min:0,max:0}} ],"
+ + "{@type : cosmas:distance, key : s, boundary:{@type:koral:boundary,min:0,max:0}} ],"
+ "operands : ["
+ "{@type : koral:token, wrap : {@type : koral:term,key : Sonne, layer : orth, match : match:eq}},"
+ "{@type : koral:token,wrap : {@type : koral:term,key : scheint,layer : orth,match : match:eq}"
@@ -84,7 +84,7 @@
Exception {
query = "((Sonne) or (Mond)) and (scheint)";
String jsonLd = "{@type:koral:group, operation:operation:sequence, inOrder : false, distances:["
- + "{@type:cosmas:distance, key:s, boundary:{type:koral:boundary,min:0,max:0}}"
+ + "{@type:cosmas:distance, key:s, boundary:{@type:koral:boundary,min:0,max:0}}"
+ "], operands:["
+ "{@type:koral:group, operation:operation:or, operands:["
+ "{@type:koral:token, wrap:{@type:koral:term, key:Sonne, layer:orth, match:match:eq}},"
@@ -99,7 +99,7 @@
query = "(scheint) and ((Sonne) or (Mond))";
jsonLd = "{@type:koral:group, operation:operation:sequence, inOrder : false, distances:["
- + "{@type:cosmas:distance, key:s, boundary:{type:koral:boundary,min:0,max:0}}"
+ + "{@type:cosmas:distance, key:s, boundary:{@type:koral:boundary,min:0,max:0}}"
+ "], operands:["
+ "{@type:koral:token, wrap:{@type:koral:term, key:scheint, layer:orth, match:match:eq}},"
+ "{@type:koral:group, operation:operation:or, operands:["