hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DS-2701] Oops, multivalued request attributes are now List, not Array.

Browse Source
This commit is contained in:
Mark H. Wood
2015-09-22 12:41:08 -04:00
parent c2b0b361ed
commit 5ac282a7f4
2 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dspace-jspui/src/main/webapp/search/advanced.jsp
View File

@@ -7,7 +7,6 @@
http://www.dspace.org/license/
--%>
<%@page import="org.dspace.content.Item"%>
<%--
- Advanced Search JSP
-
@@ -16,18 +15,23 @@
--%>
<%@ page contentType="text/html;charset=UTF-8" %>
<%@ page import="java.util.ArrayList" %>
<%@ page import="java.util.List"%>
<%@ page import="org.apache.commons.lang.StringEscapeUtils" %>
<%@ page import="org.dspace.content.Community" %>
<%@ page import="org.dspace.search.QueryResults" %>
<%@ page import="java.util.ArrayList" %>
<%@ page import="org.dspace.content.Item"%>
<%@ page import="org.dspace.core.ConfigurationManager" %>
<%@ page import="org.dspace.search.QueryResults" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
<%
Community [] communityArray = (Community[] )request.getAttribute("communities");
String query1 = request.getParameter("query1") == null ? "" : request.getParameter("query1");
List<Community> communities = (List<Community>)request.getAttribute("communities");
String query1 = request.getParameter("query1") == null ? "" : request.getParameter("query1");
String query2 = request.getParameter("query2") == null ? "" : request.getParameter("query2");
String query3 = request.getParameter("query3") == null ? "" : request.getParameter("query3");
@@ -83,11 +87,11 @@
<option selected="selected" value="/"><fmt:message key="jsp.general.genericScope"/></option>
<%
for (int i = 0; i < communityArray.length; i++)
for (Community community : communities)
{
%>
<option value="<%= communityArray[i].getHandle() %>">
<%= communityArray[i].getName() %>
<option value="<%= community.getHandle() %>">
<%= community.getName() %>
</option>
<%
}

36
dspace-jspui/src/main/webapp/search/results.jsp
View File

@@ -22,8 +22,8 @@
- array of the collections in the community to put in
- the drop-down box
- items - the results. An array of Items, most relevant first
- communities - results, Community[]
- collections - results, Collection[]
- communities - results, List<Community>
- collections - results, List<Collection>
-
- query - The original query
-
@@ -40,6 +40,7 @@
<%@ page import="java.net.URLEncoder" %>
<%@ page import="java.util.Enumeration" %>
<%@ page import="java.util.List" %>
<%@ page import="java.util.Set" %>
<%@ page import="org.apache.commons.lang.StringEscapeUtils" %>
<%@ page import="org.dspace.content.Community" %>
@@ -58,12 +59,13 @@
// Get the attributes
Community community = (Community ) request.getAttribute("community" );
Collection collection = (Collection ) request.getAttribute("collection");
Community[] communityArray = (Community[] ) request.getAttribute("community.array");
Collection[] collectionArray = (Collection[]) request.getAttribute("collection.array");
Item [] items = (Item[] )request.getAttribute("items");
Community [] communities = (Community[] )request.getAttribute("communities");
Collection[] collections = (Collection[])request.getAttribute("collections");
List<Community> allCommunities = (List<Community> ) request.getAttribute("community.array");
List<Collection> allCollections = (List<Collection>) request.getAttribute("collection.array");
List<Item> items = (List<Item> )request.getAttribute("items");
List<Community> communities = (List<Community> )request.getAttribute("communities");
List<Collection> collections = (List<Collection>)request.getAttribute("collections");
String query = (String) request.getAttribute("query");
@@ -121,11 +123,11 @@
<%-- <option selected value="/">All of DSpace</option> --%>
<option selected="selected" value="/"><fmt:message key="jsp.general.genericScope"/></option>
<%
for (int i = 0; i < communityArray.length; i++)
for (Community aCommunity: allCommunities)
{
%>
<option value="<%= communityArray[i].getHandle() %>">
<%= communityArray[i].getName() %>
<option value="<%= aCommunity.getHandle() %>">
<%= aCommunity.getName() %>
</option>
<%
}
@@ -141,11 +143,11 @@
<%= community.getName() %>
</option>
<%
for (int i = 0; i < collectionArray.length; i++)
for (Collection aCollection : allCollections)
{
%>
<option value="<%= collectionArray[i].getHandle() %>">
<%= collectionArray[i].getName() %>
<option value="<%= aCollection.getHandle() %>">
<%= aCollection.getName() %>
</option>
<%
}
@@ -310,23 +312,23 @@ else
</div>
<%
if(0 < communities.length || 0 < collections.length || 0 < items.length){
if(!(communities.isEmpty() && collections.isEmpty() && items.isEmpty())){
%>
<div id="search-results-division">
<% if (communities.length > 0 ) { %>
<% if (!communities.isEmpty() ) { %>
<%-- <h3>Community Hits:</h3> --%>
<h3><fmt:message key="jsp.search.results.comhits"/></h3>
<dspace:communitylist communities="<%= communities %>" />
<% } %>
<% if (collections.length > 0 ) { %>
<% if (!collections.isEmpty()) { %>
<br/>
<%-- <h3>Collection hits:</h3> --%>
<h3><fmt:message key="jsp.search.results.colhits"/></h3>
<dspace:collectionlist collections="<%= collections %>" />
<% } %>
<% if (items.length > 0) { %>
<% if (!items.isEmpty()) { %>
<br/>
<%-- <h3>Item hits:</h3> --%>
<h3><fmt:message key="jsp.search.results.itemhits"/></h3>