git://source.jalview.org / proteocache.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
1. Move query jsps into a separate directory
[proteocache.git] / webapp / view / reportProteinSequences.jsp
diff --git a/webapp/view/reportProteinSequences.jsp b/webapp/view/reportProteinSequences.jsp
index 19a7a79..668d653 100644 (file)
--- a/webapp/view/reportProteinSequences.jsp
+++ b/webapp/view/reportProteinSequences.jsp
@@ -11,13 +11,12 @@
 <body>
        <div class="container">
                <jsp:include page="fragments/mainmenu.jsp" />
-               <spring:url value="/sequence/query" var="searchquery" />
-               <spring:url value="/joblog/query" var="jobquery" />
+               <spring:url value="/job/results" var="job_query" />
 
        <div class="panel panel-default">
        <div class="panel-heading">
                <c:choose>
-                       <c:when test="${flag == 'whole'}">
+                       <c:when test="${searchtype == 'whole'}">
                                <p style="font-weight:bold;">Jobs for the protein sequence: ${prot}</p>
                        </c:when>
                        <c:otherwise>
@@ -45,22 +44,22 @@
                                                </thead>
                                                <tbody>
                                                        <c:forEach items="${results}" var="res" varStatus="status">
-                                                               <c:set var="ann" value="${res.predictions}" />
+                                                               <c:forEach items="${res.jobid}" var="id" varStatus="status">
                                                                <tr>
-                                                                       <th rowspan="${ann.mapsize + 2}"><a
+                                                                       <th rowspan="${res.size + 2}"><a
                                                                                title="Click to view the job log"
-                                                                               href="${jobquery}?IdJob=${res.id}">${res.id}</a></th>
+                                                                               href="${job_query}?IdJob=${id}">${id}</a></th>
                                                                </tr>
                                                                <tr>
                                                                        <td
                                                                                style="text-align: center; font-weight: bold; font-family: monospace">Protein
                                                                                Sequence</td>
-                                                                       <c:if test="${flag == 'whole'}">
+                                                                       <c:if test="${searchtype == 'whole'}">
                                                                                <td
                                                                                        style="text-align: left; border-buttom: dotted; font-family: monospace"><c:out
-                                                                                               value="${res.prot}" /></td>
+                                                                                               value="${res.sequence}" /></td>
                                                                        </c:if>
-                                                                       <c:if test="${flag == 'part'}">
+                                                                       <c:if test="${searchtype == 'partial'}">
                                                                                <td
                                                                                        style="text-align: left; border-buttom: dotted; font-family: monospace">
                                                                                        <c:forEach items="${res.subProt}" var="seq">
@@ -73,7 +72,7 @@
                                                                                </td>
                                                                        </c:if>
                                                                </tr>
-                                                               <c:forEach items="${ann.predictions}" var="seq"
+                                                               <c:forEach items="${res.predictions}" var="seq"
                                                                        varStatus="status">
                                                                        <tr>
                                                                                <td
@@ -85,6 +84,7 @@
                                                                        </tr>
                                                                </c:forEach>
                                                        </c:forEach>
+                                                       </c:forEach>
                                                </tbody>
                                        </table>
                                </div>