src/java/m/weps/V1_3_1.java
| @@ -105,6 +105,7 @@ |
| private GIS_DB db = null; |
| private WepsModelRun wmr = new WepsModelRun(); |
| public WepsOutput wo = new WepsOutput(); |
| + private File stdout; |
| |
| |
| @Override |
| @@ -214,7 +215,7 @@ |
| // Z50 is required with calibration flag |
| exe.addArguments("-C15", "-Z50"); |
| } |
| - |
| + stdout = exe.stdout(); |
| int result = exe.exec(); |
| if (result != 0) { |
| throw new ServiceException("WEPS exit error :" + result); |
| @@ -912,8 +913,8 @@ |
| |
| // Load the file data. |
| LOG.info("WorkingDir: " + getWorkspaceDir().toString()); |
| - reportdata.loadFiles(getWorkspaceDir().toString()); |
| - //reportdata.loadFiles(getWorkspaceDir().toString(),getResourceExe(WEPS_EXE).stdout().getName()); |
| + //reportdata.loadFiles(getWorkspaceDir().toString()); |
| + reportdata.loadFiles(getWorkspaceDir().toString(),stdout.getName()); |
| |
| // // Dump the loaded data as text for debugging purposes. |
| // LOG.info("hash map output=" + con.toString()); |
| @@ -999,8 +1000,8 @@ |
| // Load the file data. |
| LOG.info("WorkingDir: " + getWorkspaceDir().toString()); |
| |
| - reportdata.loadFiles(getWorkspaceDir().toString()); |
| - //reportdata.loadFiles(getWorkspaceDir().toString(),getResourceExe(WEPS_EXE).stdout().getName()); |
| + //reportdata.loadFiles(getWorkspaceDir().toString()); |
| + reportdata.loadFiles(getWorkspaceDir().toString(),stdout.getName()); |
| |
| // // Dump the loaded data as text for debugging purposes. |
| // LOG.info("hash map output=" + con.toString()); |
web/META-INF/csip-conf.json
| @@ -1,5 +1,5 @@ |
| { |
| - "csip-erosion.version": "$version: 0.2.124 0034fc8ac898 2016-08-09 Jakob23, built at 2016-08-10 08:45 by brad$", |
| + "csip-erosion.version": "$version: 0.2.133 0169dd97b844 2016-08-11 Jakob23, built at 2016-08-11 15:41 by brad$", |
| "weps.version" : "1.3.9", |
| "lmod.db": "jdbc:sqlserver:\/\/129.82.20.242:1433;databaseName=lmod_zedx;user=lmod-rw;password=managements", |
| "conservation_resources.db": "jdbc:sqlserver://129.82.20.241:1433;databaseName=conservation_resources;user=sa;password=csurams#1", |