hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-08 10:34:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

DS-2733 Erronous string comparing fix

Browse Source
This commit is contained in:
Jonas Van Goolen
2015-09-01 14:43:40 +02:00
committed by Tim Donohue
parent 52ce1eb52b
commit 9885ed851a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -435,7 +435,7 @@ else if( qResults != null)
// create the URLs accessing the previous and next search result pages // create the URLs accessing the previous and next search result pages
String baseURL = request.getContextPath() String baseURL = request.getContextPath()
+ (searchScope != "" ? "/handle/" + searchScope : "") + (!searchScope.equals("") ? "/handle/" + searchScope : "")
+ "/simple-search?query=" + "/simple-search?query="
+ URLEncoder.encode(query,"UTF-8") + URLEncoder.encode(query,"UTF-8")
+ httpFilters + httpFilters
@@ -690,7 +690,7 @@ else
if (idx != limit && !appliedFilterQueries.contains(f+"::"+fvalue.getFilterType()+"::"+fvalue.getAsFilterQuery())) if (idx != limit && !appliedFilterQueries.contains(f+"::"+fvalue.getFilterType()+"::"+fvalue.getAsFilterQuery()))
{ {
%><li class="list-group-item"><span class="badge"><%= fvalue.getCount() %></span> <a href="<%= request.getContextPath() %><li class="list-group-item"><span class="badge"><%= fvalue.getCount() %></span> <a href="<%= request.getContextPath()
+ (searchScope!=""?"/handle/"+searchScope:"") + (!searchScope.equals("")?"/handle/"+searchScope:"")
+ "/simple-search?query=" + "/simple-search?query="
+ URLEncoder.encode(query,"UTF-8") + URLEncoder.encode(query,"UTF-8")
+ "&amp;sort_by=" + sortedBy + "&amp;sort_by=" + sortedBy
@@ -715,7 +715,7 @@ else
%><li class="list-group-item"><span style="visibility: hidden;">.</span> %><li class="list-group-item"><span style="visibility: hidden;">.</span>
<% if (currFp > 0) { %> <% if (currFp > 0) { %>
<a class="pull-left" href="<%= request.getContextPath() <a class="pull-left" href="<%= request.getContextPath()
+ (searchScope!=""?"/handle/"+searchScope:"") + (!searchScope.equals("")?"/handle/"+searchScope:"")
+ "/simple-search?query=" + "/simple-search?query="
+ URLEncoder.encode(query,"UTF-8") + URLEncoder.encode(query,"UTF-8")
+ "&amp;sort_by=" + sortedBy + "&amp;sort_by=" + sortedBy
@@ -727,7 +727,7 @@ else
<% } %> <% } %>
<% if (idx == limit) { %> <% if (idx == limit) { %>
<a href="<%= request.getContextPath() <a href="<%= request.getContextPath()
+ (searchScope!=""?"/handle/"+searchScope:"") + (!searchScope.equals("")?"/handle/"+searchScope:"")
+ "/simple-search?query=" + "/simple-search?query="
+ URLEncoder.encode(query,"UTF-8") + URLEncoder.encode(query,"UTF-8")
+ "&amp;sort_by=" + sortedBy + "&amp;sort_by=" + sortedBy