csip-cfa Displaying differences for changeset

Displaying differences for changeset

display as Allow wrapping

src/java/m/cfa/Baseflow_V1_0.java

@@ -23,7 +23,6 @@

guiBaseflow_Model model = new guiBaseflow_Model();

-

@Override

protected String process() throws Exception {

model.setMainFolder(getWorkspaceDir().toString());

src/java/m/cfa/Download_V1_0.java

 @@ -1,62 +1,45 @@
   package m.cfa;
   import cfa.guiDownload_Data;
--import csip.AbstractModelService;
--import java.util.Map;
--import java.util.concurrent.Callable;
++import csip.ModelDataService;
   import javax.ws.rs.Path;
   import oms3.annotations.Description;
   import oms3.annotations.Name;
   import oms3.annotations.VersionInfo;
--import org.codehaus.jettison.json.*;
--import csip.utils.JSONUtils;
--import csip.utils.Services;
--import java.io.File;
   @Name("download")
   @Description("download")
   @VersionInfo("1.0")
   @Path("m/cfa/download/1.0")
--public class Download_V1_0 extends AbstractModelService {
++public class Download_V1_0 extends ModelDataService {
       guiDownload_Data model = new guiDownload_Data();
       @Override
--    protected Callable<String> createCallable() throws Exception {
--        return new Callable<String>() {
--            @Override
--            public String call() throws Exception {
--                Map<String, JSONObject> m = getParamMap();
++    protected String process() throws Exception {
++        model.setMainFolder(getWorkspaceDir().toString());
++        model.setDatabase(getStringParam("database"));
++        model.setOrganizationName(getStringParam("org"));
++        model.setStationID(getStringParam("station_id"));
++        model.setWaterQualityTest(getStringParam("wq_test"));
++        model.setBeginDate(getStringParam("begin_date"));
++        model.setEndDate(getStringParam("end_date"));
++        model.setUseSTORETretrieval(getBooleanParam("useSTORETretrieval"));
++        model.setSTORETdata(getStringParam("STORETdata"));
--                model.setMainFolder(getWorkspaceDir().toString());
--                model.setDatabase(m.get("database").getString(VALUE));
--                model.setOrganizationName(m.get("org").getString(VALUE));
--                model.setStationID(m.get("station_id").getString(VALUE));
--                model.setWaterQualityTest(m.get("wq_test").getString(VALUE));
--                model.setBeginDate(m.get("begin_date").getString(VALUE));
--                model.setEndDate(m.get("end_date").getString(VALUE));
--                model.setUseSTORETretrieval(m.get("useSTORETretrieval").getBoolean(VALUE));
--                model.setSTORETdata(m.get("STORETdata").getString(VALUE));
--
--                model.run();
--                return EXEC_OK;
--            }
--        };
++        model.run();
++        return EXEC_OK;
       }
       @Override
--    public File[] postprocess() throws Exception {
--        return Services.toFiles(model.getOutput().getName());
--    }
--
--    @Override
--    protected JSONArray createResults() throws Exception {
--//        String output = FileUtils.readFileToString(model.getOutput());
--        JSONArray result = new JSONArray();
--        result.put(JSONUtils.data("start", model.getStart()));
--        result.put(JSONUtils.data("end", model.getEnd()));
--        result.put(JSONUtils.data("output_location", model.getOutput().getName()));
--        return result;
++    protected void postProcess() throws Exception {
++        // files
++        putResult(model.getOutput());
++
++        // values
++        putResult("start", model.getStart());
++        putResult("end", model.getEnd());
++        putResult("output_location", model.getOutput().getName());
       }
   }