From d3fb0d8f501d09d20cb882dbfe79de0ae03894fa Mon Sep 17 00:00:00 2001 From: ryounes Date: Wed, 20 Jul 2011 19:25:54 +0000 Subject: [PATCH] Merge r8739, r8744 from maint-rel-vivo-1.3 branch --- .../webapp/controller/freemarker/IndividualController.java | 4 ++-- .../controller/freemarker/IndividualListController.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java index 3faacb482..9cbe0c38e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java @@ -487,7 +487,7 @@ public class IndividualController extends FreemarkerHttpServlet { String formatParam = (String) vreq.getParameter("format"); if ( formatParam == null ) { Matcher m = URI_PATTERN.matcher(url); - if ( m.matches() && m.groupCount() == 1 ) { + if ( m.matches() && m.groupCount() == 1 ) { ContentType c = checkAcceptHeaderForLinkedDataRequest(url, vreq); if ( c != null ) { String redirectUrl = "/individual/" + m.group(1) + "/" + m.group(1) ; @@ -753,7 +753,7 @@ public class IndividualController extends FreemarkerHttpServlet { body.put("title","Individual Not Found"); body.put("errorMessage", "The individual was not found in the system."); - return new TemplateResponseValues(Template.TITLED_ERROR_MESSAGE.toString(), body); + return new TemplateResponseValues(Template.TITLED_ERROR_MESSAGE.toString(), body, HttpServletResponse.SC_NOT_FOUND); } public static Map getAcceptedContentTypes() { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java index 90bf0a36e..9f11d4b87 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java @@ -274,8 +274,7 @@ public class IndividualListController extends FreemarkerHttpServlet { } else { log.debug("Docs size is 0"); } - // Test index < hitCount ensures that there are still some docs left - if ( hitCount > INDIVIDUALS_PER_PAGE && index < hitCount ){ + if ( hitCount > INDIVIDUALS_PER_PAGE ){ rvMap.put("showPages", Boolean.TRUE); List pageRecords = makePagesList(hitCount, INDIVIDUALS_PER_PAGE, page); rvMap.put("pages", pageRecords);