litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-2413 Fixed datetime interval validation in forms; had been broken by a change to the name fields. Removed unneeded page imports from jsps.

Browse source
This commit is contained in:
ryounes 2011-03-25 22:01:52 +00:00
parent 4f003dc668
commit 1e16db9c0c
4 changed files with 8 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/DateTimeIntervalValidation.java
View file

@ -31,10 +31,10 @@ public class DateTimeIntervalValidation implements N3Validator {
public DateTimeIntervalValidation(String startFieldName, String endFieldName){ public DateTimeIntervalValidation(String startFieldName, String endFieldName){
this.startFieldName = startFieldName; this.startFieldName = startFieldName;
this.endFieldName = endFieldName; this.endFieldName = endFieldName;
startValueName = startFieldName + ".value"; startValueName = startFieldName + "-value";
endValueName = endFieldName + ".value"; endValueName = endFieldName + "-value";
startPrecisionName = startFieldName + ".precision"; startPrecisionName = startFieldName + "-precision";
endPrecisionName = endFieldName + ".precision"; endPrecisionName = endFieldName + "-precision";
} }
public Map<String, String> validate(EditConfiguration editConfig, public Map<String, String> validate(EditConfiguration editConfig,
@ -128,8 +128,8 @@ public class DateTimeIntervalValidation implements N3Validator {
} }
} }
}catch(ClassCastException cce){ }catch(ClassCastException cce){
errors.put(startFieldName, "could not format star or end date"); errors.put(startFieldName, "could not format start or end date");
errors.put(endFieldName, "could not format star or end date"); errors.put(endFieldName, "could not format start or end date");
log.debug("could not format dates " + cce); log.debug("could not format dates " + cce);
} }

22
webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java
View file

@ -114,24 +114,6 @@ public class PagedSearchController extends FreemarkerHttpServlet implements Sear
templateTable = setupTemplateTable(); 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 * Overriding doGet from FreemarkerHttpController to do a page template (as
* opposed to body template) style output for XML requests. * opposed to body template) style output for XML requests.
@ -141,7 +123,7 @@ public class PagedSearchController extends FreemarkerHttpServlet implements Sear
@Override @Override
public void doGet(HttpServletRequest request, HttpServletResponse response) public void doGet(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException { throws IOException, ServletException {
boolean wasXmlRequested = isRequesedFormatXml(request); boolean wasXmlRequested = isRequestedFormatXml(request);
if( ! wasXmlRequested ){ if( ! wasXmlRequested ){
super.doGet(request,response); super.doGet(request,response);
}else{ }else{
@ -877,7 +859,7 @@ public class PagedSearchController extends FreemarkerHttpServlet implements Sear
throw new Error("PagedSearchController.search() is unimplemented"); throw new Error("PagedSearchController.search() is unimplemented");
} }
protected boolean isRequesedFormatXml(HttpServletRequest req){ protected boolean isRequestedFormatXml(HttpServletRequest req){
if( req != null ){ if( req != null ){
String param = req.getParameter(XML_REQUEST_PARAM); String param = req.getParameter(XML_REQUEST_PARAM);
if( param != null && "1".equals(param)){ if( param != null && "1".equals(param)){

1
webapp/web/edit/forms/dateTimeIntervalForm.jsp
View file

@ -14,7 +14,6 @@
<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory"%> <%@ 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.controller.VitroRequest"%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.web.MiscWebUtils"%> <%@ 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.JavaScript" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Css" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Css" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.elements.DateTimeWithPrecision"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.edit.elements.DateTimeWithPrecision"%>

1
webapp/web/edit/forms/dateTimeValueForm.jsp
View file

@ -14,7 +14,6 @@
<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory"%> <%@ 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.controller.VitroRequest"%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.web.MiscWebUtils"%> <%@ 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.JavaScript" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Css" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Css" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.elements.DateTimeWithPrecision"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.edit.elements.DateTimeWithPrecision"%>