corpusAccess and Location for /search/ and /matchInfo/ implemented.
diff --git a/src/main/java/de/ids_mannheim/korap/web/service/full/ResourceService.java b/src/main/java/de/ids_mannheim/korap/web/service/full/ResourceService.java
index 0cbbe13..246a57f 100644
--- a/src/main/java/de/ids_mannheim/korap/web/service/full/ResourceService.java
+++ b/src/main/java/de/ids_mannheim/korap/web/service/full/ResourceService.java
@@ -15,6 +15,7 @@
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
@@ -463,11 +464,14 @@
}
+ // was heißt search by name all? FB
@SuppressWarnings("unchecked")
@GET
@Path("search")
- public Response searchbyNameAll (@Context SecurityContext securityContext,
- @Context Locale locale, @QueryParam("q") String q,
+ public Response searchbyNameAll (
+ @Context SecurityContext securityContext,
+ @Context HttpHeaders headers,
+ @Context Locale locale, @QueryParam("q") String q,
@QueryParam("ql") String ql, @QueryParam("v") String v,
@QueryParam("context") String ctx,
@QueryParam("cutoff") Boolean cutoff,
@@ -482,7 +486,8 @@
User user;
try {
user = controller.getUser(context.getUsername());
- }
+ controller.setAccessAndLocation(user, headers);
+ }
catch (KustvaktException e) {
jlog.error("Failed retrieving user in the search service: {}",
e.string());
@@ -1095,6 +1100,7 @@
// EM: legacy support
// should be deprecated after a while
+ /*
@GET
@Path("/corpus/{corpusId}/{docId}/{matchId}/matchInfo")
public Response getMatchInfo (@Context SecurityContext ctx,
@@ -1115,12 +1121,16 @@
return getMatchInfo(ctx, locale, corpusId, ids[0], ids[1], matchId, foundries, layers, spans);
}
+ */
// fixme: only allowed for corpus?!
@GET
@Path("/corpus/{corpusId}/{docId}/{textId}/{matchId}/matchInfo")
- public Response getMatchInfo (@Context SecurityContext ctx,
- @Context Locale locale, @PathParam("corpusId") String corpusId,
+ public Response getMatchInfo (
+ @Context SecurityContext ctx,
+ @Context HttpHeaders headers,
+ @Context Locale locale,
+ @PathParam("corpusId") String corpusId,
@PathParam("docId") String docId,
@PathParam("textId") String textId,
@PathParam("matchId") String matchId,
@@ -1131,8 +1141,7 @@
TokenContext tokenContext = (TokenContext) ctx.getUserPrincipal();
spans = spans != null ? spans : false;
- String matchid = searchKrill.getMatchId(corpusId, docId, textId,
- matchId);
+ String matchid = searchKrill.getMatchId(corpusId, docId, textId, matchId);
if (layers == null || layers.isEmpty())
layers = new HashSet<>();
@@ -1141,7 +1150,9 @@
User user;
try {
user = controller.getUser(tokenContext.getUsername());
- }
+ controller.setAccessAndLocation(user, headers);
+ System.out.println("Debug: getMatchInfo: setting Access & Location: done.");
+ }
catch (KustvaktException e) {
jlog.error("Failed getting user in the matchInfo service: {}",
e.string());