commit e17eaa55c58f7e9cb1f8f80fbcca5d6690ab0882
author Michael Hanl <hanl@ids-mannheim.de> Fri Jan 22 20:55:05 2016 +0100
committer Michael Hanl <hanl@ids-mannheim.de> Fri Jan 22 20:55:05 2016 +0100
tree 47917bee4c948db2c20a655674d68f54348097d8
parent f1e85e7f2eecd5bb9377d63cf0d8ff878be20987

map conversion bug fix

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 d97b3fa..93a3d9d 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
@@ -652,7 +652,7 @@
         id = StringUtils.decodeHTML(id);
 
         Class sl = ResourceFactory.getResourceClass(type);
-        if (!sl.equals(VirtualCollection.class) & !sl.equals(Corpus.class))
+        if (!VirtualCollection.class.equals(sl) & !Corpus.class.equals(sl))
             throw KustvaktResponseHandler.throwit(StatusCodes.ILLEGAL_ARGUMENT,
                     "Requested Resource type not supported", type);
 
@@ -675,10 +675,9 @@
             }
 
             // rewrite process
-            String qstr = this.processor.preProcess(query.toJSON(), user);
+            String qstr = processor.preProcess(query.toJSON(), user);
             return Response.ok(searchKrill.getStatistics(qstr)).build();
         }catch (KustvaktException e) {
-            e.printStackTrace();
             throw KustvaktResponseHandler.throwit(e);
         }
     }

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

diff --git a/src/main/java/de/ids_mannheim/korap/web/service/full/UserService.java b/src/main/java/de/ids_mannheim/korap/web/service/full/UserService.java
index 1b162dd..d76d02f 100644
--- a/src/main/java/de/ids_mannheim/korap/web/service/full/UserService.java
+++ b/src/main/java/de/ids_mannheim/korap/web/service/full/UserService.java
@@ -59,7 +59,8 @@
     public Response signUp(
             @HeaderParam(ContainerRequest.USER_AGENT) String agent,
             @HeaderParam(ContainerRequest.HOST) String host,
-            @Context Locale locale, MultivaluedMap<String, String> form_values) {
+            @Context Locale locale,
+            MultivaluedMap<String, String> form_values) {
         Map<String, String> wrapper = FormRequestWrapper
                 .toMap(form_values, true);
 
@@ -103,7 +104,7 @@
 
     }
 
-    //todo: password update in special function?
+    //todo: password update in special function? --> password reset only!
     @POST
     @Path("update")
     @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@@ -120,7 +121,7 @@
             //            user = controller
             //                    .checkPasswordAllowance(ident, values.getPassword(),
             //                            node.path("new_password").asText());
-            controller.updateAccount(user);
+            //            controller.updateAccount(user);
         }catch (KustvaktException e) {
             throw KustvaktResponseHandler.throwit(e);
         }
@@ -247,8 +248,10 @@
             jlog.error("Exception encountered!", e);
             throw KustvaktResponseHandler.throwit(e);
         }
-        return Response.ok(JsonUtils.toJSON(user.getSettings().toObjectMap()))
-                .build();
+
+        Map m = user.getSettings().toObjectMap();
+        m.put(Attributes.USERNAME, ctx.getUsername());
+        return Response.ok(JsonUtils.toJSON(m)).build();
     }
 
     // todo: test
@@ -300,7 +303,9 @@
             throw KustvaktResponseHandler.throwit(e);
         }
 
-        return Response.ok(JsonUtils.toJSON(user.getDetails().toMap())).build();
+        Map m = user.getDetails().toMap();
+        m.put(Attributes.USERNAME, ctx.getUsername());
+        return Response.ok(JsonUtils.toJSON(m)).build();
     }
 
     @POST