Author: tchemit Date: 2014-03-08 13:46:01 +0100 (Sat, 08 Mar 2014) New Revision: 1138 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1138 Log: fix source action + use xml validation Added: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/source/ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/source/SourceDataAction-validation.xml Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceDataAction.java Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceAction.java 2014-03-08 07:26:39 UTC (rev 1137) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceAction.java 2014-03-08 12:46:01 UTC (rev 1138) @@ -73,22 +73,27 @@ } public String getZoneDisplayName() { - return getService().getZoneDisplayName(request); + return getService().getZoneDisplayName(getRequest()); } @Override public String execute() { - - request = requestBuilder(). - addFacade(facade). - addZone(zone). - toRawDataRequest(); Map<String, String> zonePictures = getService().getZonePictures(); zonePicture = zonePictures.get(zone); return SUCCESS; } -// public String getFacadeDisplayName() { + protected RawDataRequest getRequest() { + if (request == null) { + request = requestBuilder(). + addFacade(facade). + addZone(zone). + toRawDataRequest(); + } + return request; + } + + // public String getFacadeDisplayName() { // WebService webService = ServiceFactory.getWebService(); // String displayName = null; // try { Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceDataAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceDataAction.java 2014-03-08 07:26:39 UTC (rev 1137) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/source/SourceDataAction.java 2014-03-08 12:46:01 UTC (rev 1138) @@ -2,7 +2,7 @@ * #%L * Coser :: Web * %% - * Copyright (C) 2010 - 2012 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2012 Ifremer, Codelutin, Chatellier Eric, Chemit Tony * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -49,21 +49,15 @@ this.accepted = accepted; } - @Override - public void validate() { - - if (!accepted) { - addFieldError("accepted", getText("message.quality.notaccepted")); - } - + // used by validator + public boolean isAccepted() { + return accepted; } // @Action(results = {@Result(type = "stream", params = {"contentType", "application/zip", "inputName", "inputStream", "contentDisposition", "attachment; filename=\"${filename}\""})}) @Action(results = {@Result(type = "stream", params = {"contentType", "application/zip", "contentDisposition", "attachment; filename=\"${filename}\""})}) public String execute() { - super.execute(); - - result = getService().getFileResult(request); + result = getService().getFileResult(getRequest()); return SUCCESS; } @@ -75,6 +69,15 @@ return result.getInputStream(); } +// @Override +// public void validate() { +// +// if (!accepted) { +// addFieldError("accepted", getText("message.quality.notaccepted")); +// } +// +// } +// // public InputStream getInputStream() { // WebService webService = ServiceFactory.getWebService(); // Added: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/source/SourceDataAction-validation.xml =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/source/SourceDataAction-validation.xml (rev 0) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/source/SourceDataAction-validation.xml 2014-03-08 12:46:01 UTC (rev 1138) @@ -0,0 +1,34 @@ +<!-- + #%L + Coser :: Web + %% + Copyright (C) 2010 - 2014 Ifremer, Codelutin, Chemit Tony + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="accepted"> + + <field-validator type="fieldexpression"> + <param name="expression">accepted</param> + <message key="message.quality.notaccepted"/> + </field-validator> + + </field> + +</validators> \ No newline at end of file Property changes on: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/source/SourceDataAction-validation.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native