X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fcontrollers%2FIPDataController.java;fp=server%2Fcompbio%2Fcontrollers%2FIPDataController.java;h=248389a2772cd5fe1ad92844f75876de8d177487;hb=9bb6ee99ca7f738fac1087190b5481b8fe6e8d9f;hp=7c17a7f92b829f027d0b8cd02097ad2a4bf90de8;hpb=2e3f6b76be585306f1003d849831840c0adb3360;p=proteocache.git

diff --git a/server/compbio/controllers/IPDataController.java b/server/compbio/controllers/IPDataController.java
index 7c17a7f..248389a 100644
--- a/server/compbio/controllers/IPDataController.java
+++ b/server/compbio/controllers/IPDataController.java
@@ -8,8 +8,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import compbio.cassandra.TotalByCounterBean;
-import compbio.cassandra.UserBean;
+import compbio.beans.TotalByCounterBean;
+import compbio.beans.UserBean;
+import compbio.cassandra.readers.IpReader;
+import compbio.cassandra.readers.ReaderByCounter;
 import compbio.statistic.CassandraRequester;
 
 /**
@@ -21,7 +23,7 @@ public class IPDataController extends BasicController {
 
 	@RequestMapping(value = "/admin/ip/counts/query", method = RequestMethod.GET)
 	public String initStatisticsForm(Map<String, Object> model) {
-		model.put("username", "name:" + getPrincipalName());
+		model.put("username", getPrincipalName());
 		model.put("value", 5);
 		return "query/IPStatistics";
 	}
@@ -29,7 +31,8 @@ public class IPDataController extends BasicController {
 	@RequestMapping(value = "/admin/ip/query", method = RequestMethod.GET)
 	public String initOneIPForm(Map<String, Object> model) {
 		model.put("username", getPrincipalName());
-		model.put("value", "127.0.0.1");
+		CassandraRequester cr = new CassandraRequester();
+		model.put("value", cr.getExample("ip"));
 		return "query/IP";
 	}
 
@@ -58,25 +61,32 @@ public class IPDataController extends BasicController {
 		}
 
 		final long startTime = System.currentTimeMillis();
-		CassandraRequester cr = new CassandraRequester();
-		List<TotalByCounterBean> r = cr.readIpByCounter(realcounter);
+		ReaderByCounter reader = new ReaderByCounter();
+		List<TotalByCounterBean> r = reader.readIpByCounter(realcounter);
 		model.put("results", r);
 		model.put("njobs", 0);
+		String csvline = "";
 		if (null != r) {
 			model.put("njobs", r.size());
+			csvline = "\'Job%20 count\', \'IP\'%0A";
 		}
+		// form line for CSV file
+		for (TotalByCounterBean b : r) {
+			csvline += "\'" + b.getTotaljobs() + "\',\'" + b.getName() + "\'%0A";
+		}
+		model.put("csvfile", csvline);
 		final long endTime = System.currentTimeMillis();
 		model.put("timeExecution", (endTime - startTime));
 		model.put("counter", realcounter);
-		return "reportIPstatistics";
+		return "reports/IPstatistics";
 	}
 
 	@RequestMapping(value = "/admin/ip/results", method = RequestMethod.GET)
 	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);
+		IpReader reader = new IpReader();
+		UserBean r = reader.readIp(ip);
 		model.put("results", r);
 		model.put("njobs", 0);
 		if (null != r) {
@@ -85,6 +95,6 @@ public class IPDataController extends BasicController {
 		final long endTime = System.currentTimeMillis();
 		model.put("timeExecution", (endTime - startTime));
 		model.put("ip", ip);
-		return "reportIP";
+		return "reports/IP";
 	}
 }