commit 9a2421617d7140937738427ec6c35989339a1dfd
author Michael Hanl <micha.hanl@gmail.com> Fri Jun 03 11:18:06 2016 +0200
committer Michael Hanl <micha.hanl@gmail.com> Fri Jun 03 11:18:06 2016 +0200
tree f4385e6707e76e1ac125292ed4ce96e3cc87f345
parent 168b6662ad069d48d5c5306b154e9017e55ad329

resource service tests

src/main/java/de/ids_mannheim/korap/web/service/CollectionLoader.java

diff --git a/src/main/java/de/ids_mannheim/korap/web/service/CollectionLoader.java b/src/main/java/de/ids_mannheim/korap/web/service/CollectionLoader.java
index ecb1133..084a686 100644
--- a/src/main/java/de/ids_mannheim/korap/web/service/CollectionLoader.java
+++ b/src/main/java/de/ids_mannheim/korap/web/service/CollectionLoader.java
@@ -39,7 +39,7 @@
         c1.setDescription("Goethe-Werke in Weimar (seit 1775)");
 
         bui = new KoralCollectionQueryBuilder();
-        bui.with("textType = Aphorismus");
+        bui.with("textType=Aphorismus");
 
         VirtualCollection c2 = new VirtualCollection();
         c2.setName("Aphorismen");

src/main/java/de/ids_mannheim/korap/web/service/full/ResourceService.java

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 0c54bd8..dd29b09 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
@@ -312,8 +312,6 @@
         meta.addEntry("cutOff", cutoff);
 
         ss.setMeta(meta.raw());
-        //fixme: parsing should be done only in search functions!
-        //String query = this.processor.processQuery(ss.toJSON(), user);
         return Response.ok(ss.toJSON()).build();
     }
 
@@ -367,6 +365,7 @@
         KoralCollectionQueryBuilder cquery = new KoralCollectionQueryBuilder();
         cquery.setBaseQuery(ss.toJSON());
 
+
         String query = "";
         KustvaktResource resource;
         try {
@@ -387,10 +386,11 @@
 
         if (resource != null) {
             if (resource instanceof VirtualCollection)
-                query = cquery.and().mergeToJSON(resource.getData());
+                query = JsonUtils.toJSON(cquery.and().mergeWith(
+                        resource.getData()));
             else if (resource instanceof Corpus) {
-                cquery.and().with(
-                        Attributes.CORPUS_SIGLE + resource.getPersistentID());
+                cquery.and().with(Attributes.CORPUS_SIGLE, "=",
+                        resource.getPersistentID());
                 query = cquery.toJSON();
             }
         }
@@ -464,7 +464,6 @@
         serializer.setMeta(meta.raw());
 
         String query = this.processor.processQuery(serializer.toJSON(), user);
-        //String query = serializer.toJSON();
 
         jlog.info("the serialized query {}", query);
 
@@ -484,7 +483,7 @@
             }
         }
         else
-            result = searchKrill.search(serializer.toJSON());
+            result = searchKrill.search(query);
         KustvaktLogger.QUERY_LOGGER.trace("The result set: {}", result);
         return Response.ok(result).build();
     }
@@ -503,7 +502,7 @@
      * @param locale
      * @return
      */
-    //fixme: does not use policyrewrite!
+    // todo: remove raw
     @GET
     @Path("/{type}/{id}/search")
     public Response searchbyName (@Context SecurityContext securityContext,
@@ -533,7 +532,6 @@
                 QuerySerializer s = new QuerySerializer();
                 s.setQuery(query, ql, v);
 
-                // fixme: be replaced by public collection rewrite
                 KoralCollectionQueryBuilder builder = new KoralCollectionQueryBuilder();
 
                 KustvaktResource resource;
@@ -565,10 +563,6 @@
                 s.setMeta(meta.raw());
 
                 query = s.toJSON();
-                //                PolicyParser parser = new PolicyParser(user);
-                //                query = parser.parse(s.toJSON());
-                //todo: 1
-
             }
             String result;
             try {