nbproject/private/private.xml
| @@ -23,14 +23,6 @@ |
| <file>file:/od/projects/csip-all/csip-example/test/service_tests/service.properties</file> |
| <file>file:/od/projects/csip-all/csip-example/test/service_tests/externalexe/STest.java</file> |
| </group> |
| - <group> |
| - <file>file:/home/pattersd/work/csip-weather/src/java/m/weather/NARR/V1_0.java</file> |
| - <file>file:/home/pattersd/work/csip-weather/src/java/m/weather/WeatherModelDataService.java</file> |
| - <file>file:/home/pattersd/work/csip-weather/test/service_tests/PRISM_V1_0/prism-req.json</file> |
| - <file>file:/home/pattersd/work/csip-weather/test/service_tests/NARR_V1_0/narr-res.json</file> |
| - <file>file:/home/pattersd/work/csip-weather/test/service_tests/NARR_V1_0/narr-req.json</file> |
| - <file>file:/home/pattersd/work/csip-weather/test/service_tests/PRISM_V1_0/prism-res.json</file> |
| - <file>file:/home/pattersd/work/csip-weather/src/java/m/weather/NARR/V1_0.json</file> |
| - </group> |
| + <group/> |
| </open-files> |
| </project-private> |
src/java/m/weather/WeatherModelDataService.java
| @@ -113,7 +113,7 @@ |
| env.put("HDF5_DISABLE_VERSION_CHECK", "1"); |
| |
| // Write console to file rather than read it directly because the output |
| - // is too larg1Ge and will cause the process to block. |
| + // is too large and will cause the process to block. |
| result_file = new File(getWorkspaceDir(), "results.csv"); |
| pb.redirectOutput(result_file); |
| |
src/java/python/weatherExtraction.py
| @@ -104,8 +104,8 @@ |
| def parseDates(req=None): |
| start_date, end_date = None, None |
| if req: |
| - start_date_str = req['start_date'] |
| - end_date_str = req['end_date'] |
| + start_date_str = req.get('start_date', None) |
| + end_date_str = req.get('end_date', None) |
| |
| if start_date_str: |
| try: |
| @@ -993,9 +993,11 @@ |
| |
| base_url = config["url"] |
| # NCWCD always gets all the data, so only send the first station ID |
| + start_date = self.start_date if self.start_date else datetime.datetime(1993, 1, 1) |
| + end_date = self.end_date if self.end_date else datetime.datetime.now() |
| url = base_url.format(uid=config['uid'], password=config['password'], |
| - start_date=self.start_date.strftime("%m/%d/%Y"), |
| - end_date=self.end_date.strftime("%m/%d/%Y"), |
| + start_date=start_date.strftime("%m/%d/%Y"), |
| + end_date=end_date.strftime("%m/%d/%Y"), |
| # 2: daily data |
| data_type=2, |
| stations=self.station_ids[0]) |