Skip to content

Commit

Permalink
Merge pull request #164 from HakaiInstitute/fix-kc-research
Browse files Browse the repository at this point in the history
Fix KC Research dataset
  • Loading branch information
JessyBarrette authored Nov 15, 2023
2 parents 1562778 + b7b4b8b commit 4d5a203
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions datasets.d/HakaiKCBuoyResearch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<firstDataRow>8</firstDataRow>
<fileTableInMemory>false</fileTableInMemory>
<accessibleViaFiles>true</accessibleViaFiles>
<cacheFromUrl>https://www.ncei.noaa.gov/data/oceans/ncei/ocads/data/0208810/</cacheFromUrl>
<!-- <cacheFromUrl>https://www.ncei.noaa.gov/data/oceans/ncei/ocads/data/0208810/</cacheFromUrl> -->
<!-- sourceAttributes>
</sourceAttributes -->
<!-- Please specify the actual cdm_data_type (TimeSeries?) and related info below, for example...
Expand Down Expand Up @@ -92,7 +92,7 @@
</addAttributes>
</dataVariable>
<dataVariable>
<sourceName>=Calendar2.parseToEpochSeconds(row.columnString("Date") + "T" + row.columnString("Time UTC") + "Z", "mm/DD/yyyy'T'H:mm'Z'")</sourceName>
<sourceName>=Calendar2.parseToEpochSeconds(row.columnString("Date") + 'T' + row.columnString("Time UTC") + row.columnString("Time") + 'Z', "M/d/yyyy'T'H:mm'Z'")</sourceName>
<destinationName>time</destinationName>
<dataType>double</dataType>
<!-- sourceAttributes>
Expand Down
5 changes: 2 additions & 3 deletions docker-compose.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ services:
image: ${ERDDAP_DOCKER_IMAGE:-axiom/docker-erddap:2.22-jdk17-openjdk}
restart: always
container_name: ${CONTAINER_NAME:-erddap}
platform: linux/x86_64
env_file:
- .env
ports:
Expand All @@ -14,9 +15,7 @@ services:
- "./erddap/content:/usr/local/tomcat/content/erddap"
- "./erddap/data:/erddapData"
- "${DATASETS_DIR:-./datasets}:/datasets"
- "./datasets.d.sh:/datasets.d.sh"
- "./datasets.d:/datasets.d"
- "/tmp/:/usr/local/tomcat/temp/"
- ".tmp/:/usr/local/tomcat/temp/"
- "./datasets.d:/datasets.d:ro"
- "./init.d:/init.d"
healthcheck:
Expand Down
2 changes: 1 addition & 1 deletion sample.env
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DOCKER SETUP
CONTAINER_NAME=erddap
DATASETS_DIR=/data2/erddap_data
DATASETS_DIR=./datasets

# Reports emails
ERDDAP_logLevel=info
Expand Down

0 comments on commit 4d5a203

Please sign in to comment.