hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 06:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1057 from KevinVdV/DS-2701-service-api-jspui-search-browse

Browse Source 
[DS-2701-service-api-jspui-search-browse] Migrating the search & brow…
This commit is contained in:
Tim Donohue
2015-09-14 10:51:25 -05:00
parent 877cd18ac0 a2a5f00251
commit 322d25f3c7
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-jspui/src/main/java/org/dspace/app/webui/discovery/DiscoverySearchRequestProcessor.java
View File

@@ -233,6 +233,7 @@ public class DiscoverySearchRequestProcessor implements SearchRequestProcessor
HttpServletResponse response) throws SearchProcessorException, HttpServletResponse response) throws SearchProcessorException,
IOException, ServletException IOException, ServletException
{ {
init();
List<Item> resultsItems; List<Item> resultsItems;
List<Collection> resultsCollections; List<Collection> resultsCollections;
List<Community> resultsCommunities; List<Community> resultsCommunities;
@@ -514,6 +515,7 @@ public class DiscoverySearchRequestProcessor implements SearchRequestProcessor
public void doItemMapSearch(Context context, HttpServletRequest request, public void doItemMapSearch(Context context, HttpServletRequest request,
HttpServletResponse response) throws SearchProcessorException, ServletException, IOException HttpServletResponse response) throws SearchProcessorException, ServletException, IOException
{ {
init();
String queryString = (String) request.getParameter("query"); String queryString = (String) request.getParameter("query");
Collection collection = (Collection) request.getAttribute("collection"); Collection collection = (Collection) request.getAttribute("collection");
int page = UIUtil.getIntParameter(request, "page")-1; int page = UIUtil.getIntParameter(request, "page")-1;

4
dspace-jspui/src/main/webapp/browse/full.jsp
View File

@@ -70,11 +70,11 @@
if (community != null) if (community != null)
{ {
scope = "\"" + community.getMetadata("name") + "\""; scope = "\"" + community.getName() + "\"";
} }
if (collection != null) if (collection != null)
{ {
scope = "\"" + collection.getMetadata("name") + "\""; scope = "\"" + collection.getName() + "\"";
} }
type = bix.getName(); type = bix.getName();

4
dspace-jspui/src/main/webapp/browse/single.jsp
View File

@@ -51,11 +51,11 @@
if (community != null) if (community != null)
{ {
scope = "\"" + community.getMetadata("name") + "\""; scope = "\"" + community.getName() + "\"";
} }
if (collection != null) if (collection != null)
{ {
scope = "\"" + collection.getMetadata("name") + "\""; scope = "\"" + collection.getName() + "\"";
} }
type = bix.getName(); type = bix.getName();

14
dspace-jspui/src/main/webapp/search/discovery.jsp
View File

@@ -407,9 +407,9 @@
<% <%
DiscoverResult qResults = (DiscoverResult)request.getAttribute("queryresults"); DiscoverResult qResults = (DiscoverResult)request.getAttribute("queryresults");
Item [] items = (Item[] )request.getAttribute("items"); List<Item> items = (List<Item> )request.getAttribute("items");
Community [] communities = (Community[] )request.getAttribute("communities"); List<Community> communities = (List<Community> )request.getAttribute("communities");
Collection[] collections = (Collection[])request.getAttribute("collections"); List<Collection>collections = (List<Collection>)request.getAttribute("collections");
if( error ) if( error )
{ {
@@ -531,21 +531,21 @@ else if( qResults != null)
<!-- give a content to the div --> <!-- give a content to the div -->
</div> </div>
<div class="discovery-result-results"> <div class="discovery-result-results">
<% if (communities.length > 0 ) { %> <% if (communities.size() > 0 ) { %>
<div class="panel panel-info"> <div class="panel panel-info">
<div class="panel-heading"><fmt:message key="jsp.search.results.comhits"/></div> <div class="panel-heading"><fmt:message key="jsp.search.results.comhits"/></div>
<dspace:communitylist communities="<%= communities %>" /> <dspace:communitylist communities="<%= communities %>" />
</div> </div>
<% } %> <% } %>
<% if (collections.length > 0 ) { %> <% if (collections.size() > 0 ) { %>
<div class="panel panel-info"> <div class="panel panel-info">
<div class="panel-heading"><fmt:message key="jsp.search.results.colhits"/></div> <div class="panel-heading"><fmt:message key="jsp.search.results.colhits"/></div>
<dspace:collectionlist collections="<%= collections %>" /> <dspace:collectionlist collections="<%= collections %>" />
</div> </div>
<% } %> <% } %>
<% if (items.length > 0) { %> <% if (items.size() > 0) { %>
<div class="panel panel-info"> <div class="panel panel-info">
<div class="panel-heading"><fmt:message key="jsp.search.results.itemhits"/></div> <div class="panel-heading"><fmt:message key="jsp.search.results.itemhits"/></div>
<dspace:itemlist items="<%= items %>" authorLimit="<%= etAl %>" /> <dspace:itemlist items="<%= items %>" authorLimit="<%= etAl %>" />
@@ -553,7 +553,7 @@ else if( qResults != null)
<% } %> <% } %>
</div> </div>
<%-- if the result page is enought long... --%> <%-- if the result page is enought long... --%>
<% if ((communities.length + collections.length + items.length) > 10) {%> <% if ((communities.size() + collections.size() + items.size()) > 10) {%>
<%-- show again the navigation info/links --%> <%-- show again the navigation info/links --%>
<div class="discovery-result-pagination row container"> <div class="discovery-result-pagination row container">
<%-- <p align="center">Results <//%=qResults.getStart()+1%>-<//%=qResults.getStart()+qResults.getHitHandles().size()%> of --%> <%-- <p align="center">Results <//%=qResults.getStart()+1%>-<//%=qResults.getStart()+qResults.getHitHandles().size()%> of --%>