From 1e16db9c0ce5c0a02d8d89f7d0eb0df3d565c7fb Mon Sep 17 00:00:00 2001 From: ryounes Date: Fri, 25 Mar 2011 22:01:52 +0000 Subject: [PATCH] NIHVIVO-2413 Fixed datetime interval validation in forms; had been broken by a change to the name fields. Removed unneeded page imports from jsps. --- .../n3editing/DateTimeIntervalValidation.java | 12 +++++----- .../controller/PagedSearchController.java | 22 ++----------------- .../web/edit/forms/dateTimeIntervalForm.jsp | 1 - webapp/web/edit/forms/dateTimeValueForm.jsp | 1 - 4 files changed, 8 insertions(+), 28 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/DateTimeIntervalValidation.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/DateTimeIntervalValidation.java index 88e935808..d474f4019 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/DateTimeIntervalValidation.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/DateTimeIntervalValidation.java @@ -31,10 +31,10 @@ public class DateTimeIntervalValidation implements N3Validator { public DateTimeIntervalValidation(String startFieldName, String endFieldName){ this.startFieldName = startFieldName; this.endFieldName = endFieldName; - startValueName = startFieldName + ".value"; - endValueName = endFieldName + ".value"; - startPrecisionName = startFieldName + ".precision"; - endPrecisionName = endFieldName + ".precision"; + startValueName = startFieldName + "-value"; + endValueName = endFieldName + "-value"; + startPrecisionName = startFieldName + "-precision"; + endPrecisionName = endFieldName + "-precision"; } public Map validate(EditConfiguration editConfig, @@ -128,8 +128,8 @@ public class DateTimeIntervalValidation implements N3Validator { } } }catch(ClassCastException cce){ - errors.put(startFieldName, "could not format star or end date"); - errors.put(endFieldName, "could not format star or end date"); + errors.put(startFieldName, "could not format start or end date"); + errors.put(endFieldName, "could not format start or end date"); log.debug("could not format dates " + cce); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java index 3ccdd12ea..d6a225cb4 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java @@ -113,24 +113,6 @@ public class PagedSearchController extends FreemarkerHttpServlet implements Sear static{ templateTable = setupTemplateTable(); } - -// protected enum SearchTemplate { -// PAGED_RESULTS("search-pagedResults.ftl"), -// FORM("search-form.ftl"), -// ERROR("search-error.ftl"), -// BAD_QUERY("search-badQuery.ftl"), -// XML_RESULT("search-xmlResults.ftl"); -// -// private final String filename; -// -// SearchTemplate(String filename) { -// this.filename = filename; -// } -// -// public String toString() { -// return filename; -// } -// } /** * Overriding doGet from FreemarkerHttpController to do a page template (as @@ -141,7 +123,7 @@ public class PagedSearchController extends FreemarkerHttpServlet implements Sear @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - boolean wasXmlRequested = isRequesedFormatXml(request); + boolean wasXmlRequested = isRequestedFormatXml(request); if( ! wasXmlRequested ){ super.doGet(request,response); }else{ @@ -877,7 +859,7 @@ public class PagedSearchController extends FreemarkerHttpServlet implements Sear throw new Error("PagedSearchController.search() is unimplemented"); } - protected boolean isRequesedFormatXml(HttpServletRequest req){ + protected boolean isRequestedFormatXml(HttpServletRequest req){ if( req != null ){ String param = req.getParameter(XML_REQUEST_PARAM); if( param != null && "1".equals(param)){ diff --git a/webapp/web/edit/forms/dateTimeIntervalForm.jsp b/webapp/web/edit/forms/dateTimeIntervalForm.jsp index 691770657..9e6e250b0 100644 --- a/webapp/web/edit/forms/dateTimeIntervalForm.jsp +++ b/webapp/web/edit/forms/dateTimeIntervalForm.jsp @@ -14,7 +14,6 @@ <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.web.MiscWebUtils"%> -<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.StartYearBeforeEndYear"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.JavaScript" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Css" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.edit.elements.DateTimeWithPrecision"%> diff --git a/webapp/web/edit/forms/dateTimeValueForm.jsp b/webapp/web/edit/forms/dateTimeValueForm.jsp index e10540c8a..664f23060 100644 --- a/webapp/web/edit/forms/dateTimeValueForm.jsp +++ b/webapp/web/edit/forms/dateTimeValueForm.jsp @@ -14,7 +14,6 @@ <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.web.MiscWebUtils"%> -<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.StartYearBeforeEndYear"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.JavaScript" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Css" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.edit.elements.DateTimeWithPrecision"%>