X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fcontrollers%2FIPDataController.java;h=d66b7cc695546db2d8a46acb09d2d2befee15f51;hb=6823d2f36ff55b7ab11d674e3fe4d04dc57d6bbf;hp=ae3ca753b086b6834523856112da316f288e1cc2;hpb=16fc8d7210b2e7e1141170ab93d50311a2e058ca;p=proteocache.git

diff --git a/server/compbio/controllers/IPDataController.java b/server/compbio/controllers/IPDataController.java
index ae3ca75..d66b7cc 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;
 
 /**
@@ -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,13 +61,20 @@ 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);
@@ -75,8 +85,8 @@ public class IPDataController extends BasicController {
 	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) {