Handling requests with unauthorized availability values.
Change-Id: Ifd66aa2158b93c267de5410b97426ccd84afeb7d
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 11169d8..64a5351 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
@@ -470,6 +470,8 @@
// was heißt search by name all? FB
+ // EM: ich glaube es ist ALL corpora gemeint (ohne spezifische name),
+ // weil es searchbyName() auch gibt.
@SuppressWarnings("unchecked")
@GET
@Path("search")
@@ -503,7 +505,7 @@
serializer.setQuery(q, ql, v);
if (cq != null)
serializer.setCollection(cq);
- // combine cq with availability CQ according to corpusAccess
+
MetaQueryBuilder meta = createMetaQuery(pageIndex, pageInteger, ctx,
pageLength, cutoff);
serializer.setMeta(meta.raw());
@@ -595,8 +597,9 @@
* @return
*/
// todo: remove raw
- @GET
- @Path("/{type}/{id}/search")
+// @GET
+// @Path("/{type}/{id}/search")
+ @Deprecated //EM
public Response searchbyName (@Context SecurityContext securityContext,
@Context Locale locale, @QueryParam("q") String query,
@QueryParam("ql") String ql, @QueryParam("v") String v,
@@ -630,7 +633,9 @@
// add collection query
KoralCollectionQueryBuilder builder = new KoralCollectionQueryBuilder();
builder.setBaseQuery(s.toJSON());
- query = createQuery(user, type, id, builder);
+ //query = createQuery(user, type, id, builder);
+ builder.with(Attributes.CORPUS_SIGLE, "=", id);
+ builder.toJSON();
}
else {
@@ -648,7 +653,7 @@
}
String result = doSearch(eng, query, pageLength, meta);
- KustvaktLogger.QUERY_LOGGER.trace("The result set: {}", result);
+ jlog.debug("The result set: {}", result);
return Response.ok(result).build();
}
catch (KustvaktException e) {
@@ -659,6 +664,7 @@
}
+ @Deprecated
private String createQuery (User user, String type, String id,
KoralCollectionQueryBuilder builder) {
KustvaktResource resource = null;