Added debug flags & order on fields parameter of search get request-
Change-Id: I07ef9c234c4a6a72757f9a3385b42f0b61818ddf
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/SearchKrill.java b/core/src/main/java/de/ids_mannheim/korap/web/SearchKrill.java
index 65be493..f81b5aa 100644
--- a/core/src/main/java/de/ids_mannheim/korap/web/SearchKrill.java
+++ b/core/src/main/java/de/ids_mannheim/korap/web/SearchKrill.java
@@ -132,7 +132,9 @@
if (licensePattern!=null && availability != null){
Matcher m = licensePattern.matcher(availability);
if (!m.matches()){
- jlog.debug("availability: "+availability);
+ if (DEBUG){
+ jlog.debug("availability: "+availability);
+ }
if (availability.isEmpty()){
km.addError(StatusCodes.MISSING_ATTRIBUTE,
"Availability for "+ id +"is empty.", id);
@@ -198,7 +200,9 @@
}
Matcher m = licensePattern.matcher(availability);
if (!m.matches()){
- jlog.debug("pattern: "+ licensePattern.toString() + ", availability: "+availability);
+ if (DEBUG){
+ jlog.debug("pattern: "+ licensePattern.toString() + ", availability: "+availability);
+ }
km = new Match();
km.addError(StatusCodes.ACCESS_DENIED,
"Retrieving match info with ID "+id+" is not allowed.", id);
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/controller/SearchController.java b/core/src/main/java/de/ids_mannheim/korap/web/controller/SearchController.java
index 90e9435..d83ce1f 100644
--- a/core/src/main/java/de/ids_mannheim/korap/web/controller/SearchController.java
+++ b/core/src/main/java/de/ids_mannheim/korap/web/controller/SearchController.java
@@ -49,6 +49,8 @@
@Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
public class SearchController {
+ private static final boolean DEBUG = false;
+
private static Logger jlog = LogManager.getLogger(SearchController.class);
@Autowired
@@ -98,7 +100,9 @@
scopeService.verifyScope(ctx, OAuth2Scope.SERIALIZE_QUERY);
String result = searchService.serializeQuery(q, ql, v, cq,
pageIndex, startPage, pageLength, context, cutoff);
- jlog.debug("Query: " + result);
+ if (DEBUG){
+ jlog.debug("Query: " + result);
+ }
return Response.ok(result).build();
}
catch (KustvaktException e) {
@@ -119,9 +123,13 @@
throw kustvaktResponseHandler.throwit(e);
}
- jlog.debug("Serialized search: " + jsonld);
+ if (DEBUG){
+ jlog.debug("Serialized search: " + jsonld);
+ }
String result = searchService.search(jsonld);
- jlog.debug("The result set: " + result);
+ if (DEBUG){
+ jlog.debug("The result set: " + result);
+ }
return Response.ok(result).build();
}
@@ -135,7 +143,7 @@
@QueryParam("count") Integer pageLength,
@QueryParam("offset") Integer pageIndex,
@QueryParam("page") Integer pageInteger,
- @QueryParam("fields") Set<String> fields,
+ @QueryParam("fields") String fields,
@QueryParam("cq") String cq, @QueryParam("engine") String engine) {
TokenContext context =
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/controller/StatisticController.java b/core/src/main/java/de/ids_mannheim/korap/web/controller/StatisticController.java
index 43970be..61bf57a 100644
--- a/core/src/main/java/de/ids_mannheim/korap/web/controller/StatisticController.java
+++ b/core/src/main/java/de/ids_mannheim/korap/web/controller/StatisticController.java
@@ -42,6 +42,7 @@
public class StatisticController {
+ private static final boolean DEBUG = false;
private static Logger jlog =
LogManager.getLogger(StatisticController.class);
@Autowired
@@ -86,9 +87,12 @@
stats = searchKrill.getStatistics(null);
};
- if (stats.contains("-1"))
+ if (stats.contains("-1")){
throw kustvaktResponseHandler.throwit(StatusCodes.NO_RESULT_FOUND);
- jlog.debug("Stats: " + stats);
+ }
+ if (DEBUG){
+ jlog.debug("Stats: " + stats);
+ }
return Response.ok(stats).build();
}
}
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/utils/NotFoundMapper.java b/core/src/main/java/de/ids_mannheim/korap/web/utils/NotFoundMapper.java
index 7f5db5c..e8db76d 100644
--- a/core/src/main/java/de/ids_mannheim/korap/web/utils/NotFoundMapper.java
+++ b/core/src/main/java/de/ids_mannheim/korap/web/utils/NotFoundMapper.java
@@ -27,6 +27,7 @@
LogManager.getLogger(NotFoundMapper.class);
public static final Pattern VERSION_PATTERN =
Pattern.compile("/(v[0-9][^/]*)(/.*)");
+ private static final boolean DEBUG = false;
@Autowired
private KustvaktConfiguration config;
@@ -46,7 +47,9 @@
path = baseUrl + "/" + config.getCurrentVersion() + path;
URI redirectUri = UriBuilder.fromUri(notFoundUri)
.replacePath(path).build();
- jlog.debug("REDIRECT: "+redirectUri.toString());
+ if (DEBUG){
+ jlog.debug("REDIRECT: "+redirectUri.toString());
+ }
return Response.status(HttpStatus.PERMANENT_REDIRECT_308)
.location(redirectUri).build();
}
@@ -55,7 +58,9 @@
+ matcher.group(2);
URI redirectUri = UriBuilder.fromUri(notFoundUri)
.replacePath(path).build();
- jlog.debug("REDIRECT replace: "+ redirectUri.toString());
+ if (DEBUG){
+ jlog.debug("REDIRECT replace: "+ redirectUri.toString());
+ }
return Response.status(HttpStatus.PERMANENT_REDIRECT_308)
.location(redirectUri).build();
}