From e715cf0b45f377f5b0965f212a2ef32fb8d7c5ed Mon Sep 17 00:00:00 2001 From: Sasha Sherstnev Date: Thu, 23 Jan 2014 14:26:59 +0000 Subject: [PATCH] 1. Fix bug in SequenceReader 2. Simpligy links to dynamic pages --- datadb/compbio/cassandra/readers/SequenceReader.java | 1 + server/compbio/controllers/SequenceController.java | 6 +++++- webapp/view/query/Sequence.jsp | 2 +- webapp/view/reports/Sequences.jsp | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/datadb/compbio/cassandra/readers/SequenceReader.java b/datadb/compbio/cassandra/readers/SequenceReader.java index 3c0d6e6..7e77126 100644 --- a/datadb/compbio/cassandra/readers/SequenceReader.java +++ b/datadb/compbio/cassandra/readers/SequenceReader.java @@ -56,6 +56,7 @@ public class SequenceReader extends CassandraReader { String protein = r.getString("Protein"); if (protein.matches("(.*)" + sequence + "(.*)")) { ProteinBean foundsequence = new ProteinBean(protein, r.getMap("Predictions", String.class, String.class)); + foundsequence.setJobid(r.getString("JobID")); query.add(foundsequence); } } diff --git a/server/compbio/controllers/SequenceController.java b/server/compbio/controllers/SequenceController.java index 4eb5844..76b5e20 100644 --- a/server/compbio/controllers/SequenceController.java +++ b/server/compbio/controllers/SequenceController.java @@ -76,7 +76,7 @@ public class SequenceController extends BasicController { * be searched * @return link to the report JSP page */ - @RequestMapping(value = "sequence/results", method = RequestMethod.GET) + @RequestMapping(value = "results", method = RequestMethod.GET) public String findSequence(@RequestParam("sequence") String sequence, @RequestParam("searchtype") String searchtype, Map model) { model.put("username", getPrincipalName()); @@ -123,6 +123,10 @@ public class SequenceController extends BasicController { } } } + } else { + model.put("error", "The sequence after trimming is empty"); + model.put("value", sequence); + return "query/Sequence"; } model.put("csvfile", csvline.toString()); diff --git a/webapp/view/query/Sequence.jsp b/webapp/view/query/Sequence.jsp index e9cff65..18d50a7 100644 --- a/webapp/view/query/Sequence.jsp +++ b/webapp/view/query/Sequence.jsp @@ -11,7 +11,7 @@

- +

diff --git a/webapp/view/reports/Sequences.jsp b/webapp/view/reports/Sequences.jsp index b0f384a..a75f0bb 100644 --- a/webapp/view/reports/Sequences.jsp +++ b/webapp/view/reports/Sequences.jsp @@ -92,7 +92,7 @@ - + Jnetpred -- 1.7.10.2