Fix problem with access permissions and make better wording for the new servlet

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

diff --git a/server/compbio/controllers/SSFeaturesController.java b/server/compbio/controllers/SSFeaturesController.java
index 27015bb..f8e5d66 100644 (file)
--- a/server/compbio/controllers/SSFeaturesController.java
+++ b/server/compbio/controllers/SSFeaturesController.java
@@ -1,6 +1,5 @@
 package compbio.controllers;
 
-import java.util.List;
 import java.util.Map;
 
 import org.springframework.stereotype.Controller;
@@ -8,8 +7,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import compbio.cassandra.ProteinBean;
-import compbio.cassandra.TotalByCounterBean;
 import compbio.statistic.CassandraRequester;
 
 /**
@@ -26,61 +23,60 @@ import compbio.statistic.CassandraRequester;
 @RequestMapping("/features")
 public class SSFeaturesController extends BasicController {
 
-               @RequestMapping(value = "query", method = RequestMethod.GET)
-               public String formCounterQuery(Map<String, Object> model) {
-                       model.put("username", getPrincipalName());
-                       model.put("type", 'E');
-                       model.put("value", 80);
+       @RequestMapping(value = "query", method = RequestMethod.GET)
+       public String formCounterQuery(Map<String, Object> model) {
+               model.put("username", getPrincipalName());
+               model.put("type", 'E');
+               model.put("value", 50);
+               return "query/SSFeatures";
+       }
+
+       @RequestMapping(value = "features/results", method = RequestMethod.GET)
+       public String countSequences(@RequestParam("TypeFeatures") String typeFeature, @RequestParam("Percent") String percent,
+                       Map<String, Object> model) {
+               model.put("username", getPrincipalName());
+               final long startTime = System.currentTimeMillis();
+
+               if (percent.equals("")) {
+                       model.put("error", "The value must not be empty");
+                       model.put("type", typeFeature);
+                       model.put("value", percent);
                        return "query/SSFeatures";
                }
-                       
-               @RequestMapping(value = "features/results", method = RequestMethod.GET)
-               public String countSequences(@RequestParam("TypeFeatures") String typeFeature, @RequestParam("Percent") String percent,Map<String, Object> model) {
-                       model.put("username", getPrincipalName());
-                       final long startTime = System.currentTimeMillis();
-
-                       if (percent.equals("")) {
-                               model.put("error", "The value must not be empty");
-                               model.put("type", typeFeature);
-                               model.put("value", percent);
-                               return "query/SSFeatures";
-                       }
 
-                       int realpercent;
-                       try {
-                               realpercent = Integer.parseInt(percent.trim());
-                       } catch (NumberFormatException e) {
-                               model.put("error", "The value must be an integer number");
-                               model.put("value", percent);
-                               return "query/SSFeatures";
-                       }
+               int realpercent;
+               try {
+                       realpercent = Integer.parseInt(percent.trim());
+               } catch (NumberFormatException e) {
+                       model.put("error", "The value must be an integer number");
+                       model.put("value", percent);
+                       return "query/SSFeatures";
+               }
 
-                       if (realpercent < 1) {
-                               model.put("error", "The value must be greater than 0");
-                               model.put("value", percent);
-                               return "query/SSFeatures";
-                       }
-                       
-                       if (realpercent > 100) {
-                               model.put("error", "The value must be less than 100");
-                               model.put("value", percent);
-                               return "query/SSFeatures";
-                       }
+               if (realpercent < 1) {
+                       model.put("error", "The value must be greater than 0");
+                       model.put("value", percent);
+                       return "query/SSFeatures";
+               }
 
-                       CassandraRequester cr = new CassandraRequester();
-                       Map<String, String> r = cr.readProteinsPrediction(typeFeature, realpercent);
-                       model.put("results", r);
-                       model.put("njobs", 0);
-                       if (null != r) {
-                               model.put("njobs", r.size());
-                       }
-                       final long endTime = System.currentTimeMillis();
-                       model.put("timeExecution", (endTime - startTime));
-                       model.put("feature", typeFeature);
-                       model.put("percent", realpercent);
-                       return "reportSSFeatures";
+               if (realpercent > 100) {
+                       model.put("error", "The value must be less than 100");
+                       model.put("value", percent);
+                       return "query/SSFeatures";
                }
 
-       
+               CassandraRequester cr = new CassandraRequester();
+               Map<String, String> r = cr.readProteinsPrediction(typeFeature, realpercent);
+               model.put("results", r);
+               model.put("njobs", 0);
+               if (null != r) {
+                       model.put("njobs", r.size());
+               }
+               final long endTime = System.currentTimeMillis();
+               model.put("timeExecution", (endTime - startTime));
+               model.put("feature", typeFeature);
+               model.put("percent", realpercent);
+               return "reportSSFeatures";
+       }
 
 }