Changed status code and error messages.
Change-Id: I2dfbd6894597c97eb7eb5498792204f96951e5f2
diff --git a/src/main/java/de/ids_mannheim/korap/query/serialize/FCSQLQueryProcessor.java b/src/main/java/de/ids_mannheim/korap/query/serialize/FCSQLQueryProcessor.java
index 06036ad..3717cba 100644
--- a/src/main/java/de/ids_mannheim/korap/query/serialize/FCSQLQueryProcessor.java
+++ b/src/main/java/de/ids_mannheim/korap/query/serialize/FCSQLQueryProcessor.java
@@ -70,12 +70,12 @@
private boolean isVersionValid() {
if (version == null || version.isEmpty()) {
addError(StatusCodes.MISSING_VERSION,
- "SRU diagnostic 7: Version number is missing.");
+ "Version number is missing.");
return false;
}
else if (!version.equals(VERSION_2_0)) {
- addError(StatusCodes.MISSING_VERSION,
- "SRU diagnostic 5: Only supports SRU version 2.0.");
+ addError(StatusCodes.UNSUPPORTED_VERSION,
+ "Only supports SRU version 2.0.");
return false;
}
return true;
@@ -88,25 +88,24 @@
private FCSSRUQuery parseQueryStringtoFCSQuery(String query) {
if ((query == null) || query.isEmpty())
addError(StatusCodes.NO_QUERY,
- "SRU diagnostic 1: No query has been passed.");
+ "No query has been passed.");
FCSSRUQuery fcsQuery = null;
try {
QueryNode parsedQuery = fcsParser.parse(query);
fcsQuery = new FCSSRUQuery(query, parsedQuery);
if (fcsQuery == null) {
addError(StatusCodes.UNKNOWN_QUERY_ERROR,
- "FCS diagnostic 10: Unexpected error while parsing query.");
+ "Unexpected error while parsing query.");
}
}
catch (QueryParserException e) {
addError(
StatusCodes.UNKNOWN_QUERY_ERROR,
- "FCS diagnostic 10: Query cannot be parsed, "
+ "Query cannot be parsed, "
+ e.getMessage());
}
catch (Exception e) {
- addError(StatusCodes.UNKNOWN_QUERY_ERROR, "FCS diagnostic 10: "
- + "Unexpected error while parsing query.");
+ addError(StatusCodes.UNKNOWN_QUERY_ERROR, "Unexpected error while parsing query.");
}
return fcsQuery;
}
diff --git a/src/main/java/de/ids_mannheim/korap/query/serialize/util/StatusCodes.java b/src/main/java/de/ids_mannheim/korap/query/serialize/util/StatusCodes.java
index 1f896b3..8a7f6e0 100644
--- a/src/main/java/de/ids_mannheim/korap/query/serialize/util/StatusCodes.java
+++ b/src/main/java/de/ids_mannheim/korap/query/serialize/util/StatusCodes.java
@@ -10,6 +10,7 @@
public final static int UNKNOWN_QUERY_LANGUAGE = 307;
public final static int UNBOUND_ANNIS_RELATION = 308;
public final static int MISSING_VERSION = 309;
- public final static int QUERY_TOO_COMPLEX = 310;
+ public final static int UNSUPPORTED_VERSION = 310;
+ public final static int QUERY_TOO_COMPLEX = 311;
public final static int UNKNOWN_QUERY_ERROR = 399;
}
\ No newline at end of file