X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fcontrollers%2FIPDataController.java;h=5f3f5e1afb4299d8f46a85a96be6b8399e08e191;hb=c441a23b5f24da06199b9b5b830010e5a5833ab8;hp=a7cd7f006633c552ed009c17225c0b9d805617d3;hpb=67ee99b3cfa17f03dbe839f5ab3ec215541330d8;p=proteocache.git

diff --git a/server/compbio/controllers/IPDataController.java b/server/compbio/controllers/IPDataController.java
index a7cd7f0..5f3f5e1 100644
--- 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,30 @@ 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", 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());
-		model.put("value", "127.0.0.1");
-		return "queryIP";
+	public String initOneIPForm(Map<String, Object> model) {
+		model.put("username", getPrincipalName());
+		CassandraRequester cr = new CassandraRequester();
+		model.put("value", cr.getExample("ip"));
+		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 +49,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 +73,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);