From 3cb0e5afcf6f210186feb3de19fd4bc90facd421 Mon Sep 17 00:00:00 2001 From: Yannick-Rousseau Date: Thu, 4 Jul 2024 17:04:40 +1000 Subject: [PATCH 1/3] Cahnged NSW-DPE to NSW in the regex reading file names --- aodndata/aodn_wave/handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aodndata/aodn_wave/handler.py b/aodndata/aodn_wave/handler.py index 036e2d01..85818177 100644 --- a/aodndata/aodn_wave/handler.py +++ b/aodndata/aodn_wave/handler.py @@ -38,7 +38,7 @@ DATA_FILE_REGEX = re.compile(r""" (?PBOM|DOT-WA|DTA|DES-QLD|MHL|IMOS_NTP-WAVE|IMOS_ANMN-DEEP-WATER-WAVES| - IMOS_ANMN-WAVE-BUOYS|NSW-DPE|VIC-DEAKIN-UNI|UWA|PPA|GP-VIC|SA-FLINDERS)_ + IMOS_ANMN-WAVE-BUOYS|NSW|VIC-DEAKIN-UNI|UWA|PPA|GP-VIC|SA-FLINDERS)_ (?P[0-9]{8}|[0-9]{8}T[0-9]{6}Z)_ (?P(.*))_ (?PRT|DM)_ From 45ecb21c8981318920854a6c72e4725050d2fe03 Mon Sep 17 00:00:00 2001 From: Yannick-Rousseau Date: Mon, 8 Jul 2024 08:51:09 +1000 Subject: [PATCH 2/3] Changed NSW-DPE to NSW in the institution_pathname --- aodndata/aodn_wave/handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aodndata/aodn_wave/handler.py b/aodndata/aodn_wave/handler.py index 85818177..e38662ea 100644 --- a/aodndata/aodn_wave/handler.py +++ b/aodndata/aodn_wave/handler.py @@ -18,7 +18,7 @@ "IMOS_NTP-WAVE": 'IMOS/NTP/Low_Cost_Wave_Buoy_Technology', "IMOS_ANMN-DEEP-WATER-WAVES": 'IMOS/ANMN/Deep_Water_Waves', "IMOS_ANMN-WAVE-BUOYS": 'IMOS/ANMN/Wave_Buoys', - "NSW-DPE": 'Department_of_Planning_and_Environment-New_South_Wales', + "NSW": 'Department_of_Planning_and_Environment-New_South_Wales', "VIC-DEAKIN-UNI": 'Deakin_University', "UWA": 'UWA', "PPA": "Pilbara_Ports_Authority", From 9e07cebc2faaf20d6da8d08b504d1130fd887ce3 Mon Sep 17 00:00:00 2001 From: Xavier Hoenner Date: Wed, 4 Sep 2024 16:04:27 +1000 Subject: [PATCH 3/3] Re-add in NSW-DPE --- aodndata/aodn_wave/handler.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aodndata/aodn_wave/handler.py b/aodndata/aodn_wave/handler.py index e38662ea..ba64a8e6 100644 --- a/aodndata/aodn_wave/handler.py +++ b/aodndata/aodn_wave/handler.py @@ -18,6 +18,7 @@ "IMOS_NTP-WAVE": 'IMOS/NTP/Low_Cost_Wave_Buoy_Technology', "IMOS_ANMN-DEEP-WATER-WAVES": 'IMOS/ANMN/Deep_Water_Waves', "IMOS_ANMN-WAVE-BUOYS": 'IMOS/ANMN/Wave_Buoys', + "NSW-DPE": 'Department_of_Planning_and_Environment-New_South_Wales', "NSW": 'Department_of_Planning_and_Environment-New_South_Wales', "VIC-DEAKIN-UNI": 'Deakin_University', "UWA": 'UWA', @@ -38,7 +39,7 @@ DATA_FILE_REGEX = re.compile(r""" (?PBOM|DOT-WA|DTA|DES-QLD|MHL|IMOS_NTP-WAVE|IMOS_ANMN-DEEP-WATER-WAVES| - IMOS_ANMN-WAVE-BUOYS|NSW|VIC-DEAKIN-UNI|UWA|PPA|GP-VIC|SA-FLINDERS)_ + IMOS_ANMN-WAVE-BUOYS|NSW|NSW-DPE|VIC-DEAKIN-UNI|UWA|PPA|GP-VIC|SA-FLINDERS)_ (?P[0-9]{8}|[0-9]{8}T[0-9]{6}Z)_ (?P(.*))_ (?PRT|DM)_