| @@ -4,15 +4,12 @@ |
| import csip.ServiceException; |
| import java.io.BufferedReader; |
| import java.io.File; |
| -import java.io.FileNotFoundException; |
| import java.io.FileReader; |
| import java.io.IOException; |
| import java.io.InputStreamReader; |
| import java.io.PrintWriter; |
| -import java.net.URI; |
| import java.net.URISyntaxException; |
| import java.net.URL; |
| -import java.net.URLConnection; |
| import java.nio.file.Files; |
| import java.nio.file.Paths; |
| import org.apache.commons.io.FileUtils; |
| @@ -103,32 +100,20 @@ |
| |
| public void generateStormFile(String cligen_db, double Ke) throws ServiceException, URISyntaxException { |
| try { |
| - String cligenFileName; |
| if (isIntl()) { |
| try { |
| - cligenFileName = "/international/" + climatestationId + ".txt"; |
| - URL url = new URL(cligen_db + cligenFileName); |
| - |
| -// FileUtils.copyInputStreamToFile(url.openStream(), new File(workSpaceDir, stormFileName)); |
| -// File file = Paths.get(url.toURI()).toFile(); |
| - Files.createSymbolicLink(Paths.get(workSpaceDir.toString(), stormFileName), Paths.get(url.toURI())); |
| - |
| + URL u = new URL(cligen_db + "/international/" + climatestationId + ".txt"); |
| + Files.createSymbolicLink(Paths.get(workSpaceDir.toString(), stormFileName), Paths.get(u.toURI())); |
| } catch (IOException E) { |
| throw new ServiceException("Climate Station not found: " + climatestationId); |
| } |
| return; |
| } |
| |
| - cligenFileName = "/" + stateId.toLowerCase() + "/300yr/" + stateId + "_" + climatestationId + "_300yr.out"; |
| - URL conn = new URL(cligen_db + cligenFileName); |
| - |
| -// String file = stateId + "_" + climatestationId + ".out"; |
| -// File workSpaceFile = new File(workSpaceDir, file); |
| -// FileUtils.copyInputStreamToFile(conn.openStream(), workSpaceFile); |
| - |
| + String cligenFileName = "/" + stateId.toLowerCase() + "/300yr/" + stateId + "_" + climatestationId + "_300yr.out"; |
| + URL u = new URL(cligen_db + cligenFileName); |
| long counter = 0; |
| -// try (BufferedReader bufferedReader = new BufferedReader(new FileReader(workSpaceFile))) { |
| - try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(conn.openStream()))) { |
| + try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(u.openStream()))) { |
| File tempFile = new File(workSpaceDir, "tempSummaryFile.pre"); |
| try (PrintWriter writer = new PrintWriter(tempFile)) { |
| for (int i = 0; i <= 17; i++) { |
| @@ -176,13 +161,10 @@ |
| } |
| |
| |
| - public void generateRunFile() throws ServiceException { |
| - try (PrintWriter writer = new PrintWriter(new File(workSpaceDir, runFileName))) { |
| - writer.println(parameterFileName + ", " + stormFileName + ", " |
| - + summaryFileName + ", \"" + scenarioName + "\", 0, 2, y, y, n, n, y"); |
| - } catch (IOException E) { |
| - throw new ServiceException("Problem in generating the run file.", E); |
| - } |
| + public void generateRunFile() throws ServiceException, IOException { |
| + FileUtils.writeStringToFile(new File(workSpaceDir, runFileName), |
| + parameterFileName + ", " + stormFileName + ", " |
| + + summaryFileName + ", \"" + scenarioName + "\", 0, 2, y, y, n, n, y"); |
| } |
| |
| |