You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by si...@apache.org on 2006/05/04 19:38:05 UTC
svn commit: r399790 -
/lucene/nutch/trunk/contrib/web2/src/main/webapp/WEB-INF/jsp/search.jsp
Author: siren
Date: Thu May 4 10:38:02 2006
New Revision: 399790
URL: http://svn.apache.org/viewcvs?rev=399790&view=rev
Log:
replaced unneeded if tags with choose
Modified:
lucene/nutch/trunk/contrib/web2/src/main/webapp/WEB-INF/jsp/search.jsp
Modified: lucene/nutch/trunk/contrib/web2/src/main/webapp/WEB-INF/jsp/search.jsp
URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/contrib/web2/src/main/webapp/WEB-INF/jsp/search.jsp?rev=399790&r1=399789&r2=399790&view=diff
==============================================================================
--- lucene/nutch/trunk/contrib/web2/src/main/webapp/WEB-INF/jsp/search.jsp (original)
+++ lucene/nutch/trunk/contrib/web2/src/main/webapp/WEB-INF/jsp/search.jsp Thu May 4 10:38:02 2006
@@ -1,28 +1,32 @@
<%@ include file="common.jsp"%>
-<c:if test="${nutchSearch.isSearch == true}">
- <form name="search" action="search.do" method="get"><input name="query"
- size="44" value="<c:out value="${nutchSearch.queryString}"/>">
- <input
- type="submit" value="<fmt:message key="search.search"/>"> <a
- href="help.do"><fmt:message key="search.help" /></a></form>
- <c:if test="${nutchSearch.hasResults == true }">
- <fmt:message key="search.hits">
- <fmt:param value="${resultInfo[0]}" />
- <fmt:param value="${resultInfo[1]}" />
- <fmt:param value="${resultInfo[2]}" />
- <fmt:param value="${resultInfo[3]}" />
- </fmt:message>
- <br />
- <tiles:insert name="results" />
- <tiles:insert name="cluster" />
- <tiles:insert name="navigate" />
- </c:if>
- <c:if test="${nutchSearch.hasResults == false }">
- <tiles:insert name="noResults" />
- </c:if>
-</c:if>
-<c:if test="${nutchSearch.isSearch == false}">
- <tiles:insert name="i18nComponent">
- <tiles:put name="basePage" value="/search.html" />
- </tiles:insert>
-</c:if>
\ No newline at end of file
+<c:choose>
+ <c:when test="${nutchSearch.isSearch == true}">
+ <form name="search" action="search.do" method="get"><input
+ name="query" size="44"
+ value="<c:out value="${nutchSearch.queryString}"/>"> <input
+ type="submit" value="<fmt:message key="search.search"/>"> <a
+ href="help.do"><fmt:message key="search.help" /></a></form>
+ <c:choose>
+ <c:when test="${nutchSearch.hasResults == true }">
+ <fmt:message key="search.hits">
+ <fmt:param value="${resultInfo[0]}" />
+ <fmt:param value="${resultInfo[1]}" />
+ <fmt:param value="${resultInfo[2]}" />
+ <fmt:param value="${resultInfo[3]}" />
+ </fmt:message>
+ <br />
+ <tiles:insert name="results" />
+ <tiles:insert name="cluster" />
+ <tiles:insert name="navigate" />
+ </c:when>
+ <c:otherwise>
+ <tiles:insert name="noResults" />
+ </c:otherwise>
+ </c:choose>
+ </c:when>
+ <c:otherwise>
+ <tiles:insert name="i18nComponent">
+ <tiles:put name="basePage" value="/search.html" />
+ </tiles:insert>
+ </c:otherwise>
+</c:choose>