1. Move query jsps into a separate directory

[proteocache.git] / server / compbio / controllers / IPDataController.java

diff --git a/server/compbio/controllers/IPDataController.java b/server/compbio/controllers/IPDataController.java
index a7cd7f0..7c17a7f 100644 (file)
--- a/server/compbio/controllers/IPDataController.java
+++ b/server/compbio/controllers/IPDataController.java
@@ -1,6 +1,5 @@
 package compbio.controllers;
 
-import java.security.Principal;
 import java.util.List;
 import java.util.Map;
 
@@ -18,29 +17,29 @@ import compbio.statistic.CassandraRequester;
  * @author Natasha Sherstneva
  */
 @Controller
-public class IPDataController {
+public class IPDataController extends BasicController {
 
        @RequestMapping(value = "/admin/ip/counts/query", method = RequestMethod.GET)
-       public String initStatisticsForm(Map<String, Object> model, Principal principal) {
-               model.put("username", principal.getName());
+       public String initStatisticsForm(Map<String, Object> model) {
+               model.put("username", "name:" + getPrincipalName());
                model.put("value", 5);
-               return "queryIPStatistics";
+               return "query/IPStatistics";
        }
 
        @RequestMapping(value = "/admin/ip/query", method = RequestMethod.GET)
-       public String initOneIPForm(Map<String, Object> model, Principal principal) {
-               model.put("username", principal.getName());
+       public String initOneIPForm(Map<String, Object> model) {
+               model.put("username", getPrincipalName());
                model.put("value", "127.0.0.1");
-               return "queryIP";
+               return "query/IP";
        }
 
        @RequestMapping(value = "/admin/ip/counts/results", method = RequestMethod.GET)
-       public String findIPwithCounter(@RequestParam("JobCounter") String counter, Map<String, Object> model, Principal principal) {
-               model.put("username", principal.getName());
+       public String findIPwithCounter(@RequestParam("JobCounter") String counter, Map<String, Object> model) {
+               model.put("username", getPrincipalName());
                if (counter.equals("")) {
                        model.put("error", "The value must not be empty");
                        model.put("value", counter);
-                       return "queryIPStatistics";
+                       return "query/IPStatistics";
                }
 
                int realcounter;
@@ -49,13 +48,13 @@ public class IPDataController {
                } catch (NumberFormatException e) {
                        model.put("error", "The value must be an integer number");
                        model.put("value", counter);
-                       return "queryIPStatistics";
+                       return "query/IPStatistics";
                }
 
                if (realcounter < 1) {
                        model.put("error", "The value must be greater than 0");
                        model.put("value", counter);
-                       return "queryIPStatistics";
+                       return "query/IPStatistics";
                }
 
                final long startTime = System.currentTimeMillis();
@@ -73,8 +72,8 @@ public class IPDataController {
        }
 
        @RequestMapping(value = "/admin/ip/results", method = RequestMethod.GET)
-       public String findIP(@RequestParam("ip") String ip, Map<String, Object> model, Principal principal) {
-               model.put("username", principal.getName());
+       public String findIP(@RequestParam("ip") String ip, Map<String, Object> model) {
+               model.put("username", getPrincipalName());
                final long startTime = System.currentTimeMillis();
                CassandraRequester cr = new CassandraRequester();
                UserBean r = cr.readIp(ip);