Skip to content

Commit 2bf514b

Browse files
TomBlockTomBlock
committed
escape names alread when reading from configuration
1 parent 88752a0 commit 2bf514b

File tree

10 files changed

+153
-123
lines changed

10 files changed

+153
-123
lines changed

‎post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/FieldsProcessor.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
package com.bc.fiduceo.post.plugin.era5;
22

3-
import com.bc.fiduceo.util.NetCDFUtils;
4-
53
class FieldsProcessor {
64

75
TemplateVariable createTemplate(String name, String units, String longName, String standardName, boolean is3d) {
8-
return new TemplateVariable(NetCDFUtils.escapeVariableName(name),
9-
units, longName, standardName, is3d);
6+
return new TemplateVariable(name, units, longName, standardName, is3d);
107
}
118
}

‎post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/MatchupFieldsConfiguration.java‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.bc.fiduceo.post.plugin.era5;
22

3+
import com.bc.fiduceo.util.NetCDFUtils;
34
import org.esa.snap.core.util.StringUtils;
45

56
class MatchupFieldsConfiguration {
@@ -49,79 +50,79 @@ String get_an_u10_name() {
4950
}
5051

5152
void set_an_u10_name(String an_u10_name) {
52-
this.an_u10_name = an_u10_name;
53+
this.an_u10_name = NetCDFUtils.escapeVariableName(an_u10_name);
5354
}
5455

5556
String get_an_v10_name() {
5657
return an_v10_name;
5758
}
5859

5960
void set_an_v10_name(String an_v10_name) {
60-
this.an_v10_name = an_v10_name;
61+
this.an_v10_name = NetCDFUtils.escapeVariableName(an_v10_name);
6162
}
6263

6364
String get_an_siconc_name() {
6465
return an_siconc_name;
6566
}
6667

6768
void set_an_siconc_name(String an_siconc_name) {
68-
this.an_siconc_name = an_siconc_name;
69+
this.an_siconc_name = NetCDFUtils.escapeVariableName(an_siconc_name);
6970
}
7071

7172
String get_an_sst_name() {
7273
return an_sst_name;
7374
}
7475

7576
void set_an_sst_name(String an_sst_name) {
76-
this.an_sst_name = an_sst_name;
77+
this.an_sst_name = NetCDFUtils.escapeVariableName(an_sst_name);
7778
}
7879

7980
String get_fc_metss_name() {
8081
return fc_metss_name;
8182
}
8283

8384
void set_fc_metss_name(String fc_metss_name) {
84-
this.fc_metss_name = fc_metss_name;
85+
this.fc_metss_name = NetCDFUtils.escapeVariableName(fc_metss_name);
8586
}
8687

8788
String get_fc_mntss_name() {
8889
return fc_mntss_name;
8990
}
9091

9192
void set_fc_mntss_name(String fc_mntss_name) {
92-
this.fc_mntss_name = fc_mntss_name;
93+
this.fc_mntss_name = NetCDFUtils.escapeVariableName(fc_mntss_name);
9394
}
9495

9596
String get_fc_mslhf_name() {
9697
return fc_mslhf_name;
9798
}
9899

99100
void set_fc_mslhf_name(String fc_mslhf_name) {
100-
this.fc_mslhf_name = fc_mslhf_name;
101+
this.fc_mslhf_name = NetCDFUtils.escapeVariableName(fc_mslhf_name);
101102
}
102103

103104
String get_fc_msnlwrf_name() {
104105
return fc_msnlwrf_name;
105106
}
106107

107108
void set_fc_msnlwrf_name(String fc_msnlwrf_name) {
108-
this.fc_msnlwrf_name = fc_msnlwrf_name;
109+
this.fc_msnlwrf_name = NetCDFUtils.escapeVariableName(fc_msnlwrf_name);
109110
}
110111

111112
String get_fc_msnswrf_name() {
112113
return fc_msnswrf_name;
113114
}
114115

115116
void set_fc_msnswrf_name(String fc_msnswrf_name) {
116-
this.fc_msnswrf_name = fc_msnswrf_name;
117+
this.fc_msnswrf_name = NetCDFUtils.escapeVariableName(fc_msnswrf_name);
117118
}
118119

119120
String get_fc_msshf_name() {
120121
return fc_msshf_name;
121122
}
122123

123124
void set_fc_msshf_name(String fc_msshf_name) {
124-
this.fc_msshf_name = fc_msshf_name;
125+
this.fc_msshf_name = NetCDFUtils.escapeVariableName(fc_msshf_name);
125126
}
126127

127128
int get_time_steps_past() {
@@ -145,39 +146,39 @@ String get_time_dim_name() {
145146
}
146147

147148
void set_time_dim_name(String time_dim_name) {
148-
this.time_dim_name = time_dim_name;
149+
this.time_dim_name = NetCDFUtils.escapeVariableName(time_dim_name);
149150
}
150151

151152
String get_time_variable_name() {
152153
return time_variable_name;
153154
}
154155

155156
void set_time_variable_name(String time_variable_name) {
156-
this.time_variable_name = time_variable_name;
157+
this.time_variable_name = NetCDFUtils.escapeVariableName(time_variable_name);
157158
}
158159

159160
String get_longitude_variable_name() {
160161
return longitude_variable_name;
161162
}
162163

163164
void set_longitude_variable_name(String longitude_variable_name) {
164-
this.longitude_variable_name = longitude_variable_name;
165+
this.longitude_variable_name = NetCDFUtils.escapeVariableName(longitude_variable_name);
165166
}
166167

167168
String get_latitude_variable_name() {
168169
return latitude_variable_name;
169170
}
170171

171172
void set_latitude_variable_name(String latitude_variable_name) {
172-
this.latitude_variable_name = latitude_variable_name;
173+
this.latitude_variable_name = NetCDFUtils.escapeVariableName(latitude_variable_name);
173174
}
174175

175176
String get_nwp_time_variable_name() {
176177
return nwp_time_variable_name;
177178
}
178179

179180
void set_nwp_time_variable_name(String nwp_time_variable_name) {
180-
this.nwp_time_variable_name = nwp_time_variable_name;
181+
this.nwp_time_variable_name = NetCDFUtils.escapeVariableName(nwp_time_variable_name);
181182
}
182183

183184
boolean verify() {

‎post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/SatelliteFields.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -333,14 +333,9 @@ List<Dimension> getDimensions(TemplateVariable template) {
333333

334334
// package access for testing purpose only tb 2020-12-02
335335
void setDimensions(SatelliteFieldsConfiguration satFieldsConfig, NetcdfFileWriter writer, NetcdfFile reader) {
336-
final String x_dim_name = NetCDFUtils.escapeVariableName(satFieldsConfig.get_x_dim_name());
337-
final Dimension xDim = writer.addDimension(x_dim_name, satFieldsConfig.get_x_dim());
338-
339-
final String y_dim_name = NetCDFUtils.escapeVariableName(satFieldsConfig.get_y_dim_name());
340-
final Dimension yDim = writer.addDimension(y_dim_name, satFieldsConfig.get_y_dim());
341-
342-
final String z_dim_name = NetCDFUtils.escapeVariableName(satFieldsConfig.get_z_dim_name());
343-
final Dimension zDim = writer.addDimension(z_dim_name, satFieldsConfig.get_z_dim());
336+
final Dimension xDim = writer.addDimension(satFieldsConfig.get_x_dim_name(), satFieldsConfig.get_x_dim());
337+
final Dimension yDim = writer.addDimension(satFieldsConfig.get_y_dim_name(), satFieldsConfig.get_y_dim());
338+
final Dimension zDim = writer.addDimension(satFieldsConfig.get_z_dim_name(), satFieldsConfig.get_z_dim());
344339

345340
final Dimension matchupDim = reader.findDimension(FiduceoConstants.MATCHUP_COUNT);
346341

‎post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/SatelliteFieldsConfiguration.java‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.bc.fiduceo.post.plugin.era5;
22

3+
import com.bc.fiduceo.util.NetCDFUtils;
34
import org.esa.snap.core.util.StringUtils;
45

56
class SatelliteFieldsConfiguration {
@@ -55,103 +56,103 @@ String get_an_q_name() {
5556
}
5657

5758
void set_an_q_name(String an_q_name) {
58-
this.an_q_name = an_q_name;
59+
this.an_q_name = NetCDFUtils.escapeVariableName(an_q_name);
5960
}
6061

6162
String get_an_t_name() {
6263
return an_t_name;
6364
}
6465

6566
void set_an_t_name(String an_t_name) {
66-
this.an_t_name = an_t_name;
67+
this.an_t_name = NetCDFUtils.escapeVariableName(an_t_name);
6768
}
6869

6970
String get_an_o3_name() {
7071
return an_o3_name;
7172
}
7273

7374
void set_an_o3_name(String an_o3_name) {
74-
this.an_o3_name = an_o3_name;
75+
this.an_o3_name = NetCDFUtils.escapeVariableName(an_o3_name);
7576
}
7677

7778
String get_an_lnsp_name() {
7879
return an_lnsp_name;
7980
}
8081

8182
void set_an_lnsp_name(String an_lnsp_name) {
82-
this.an_lnsp_name = an_lnsp_name;
83+
this.an_lnsp_name = NetCDFUtils.escapeVariableName(an_lnsp_name);
8384
}
8485

8586
String get_an_t2m_name() {
8687
return an_t2m_name;
8788
}
8889

8990
void set_an_t2m_name(String an_t2m_name) {
90-
this.an_t2m_name = an_t2m_name;
91+
this.an_t2m_name = NetCDFUtils.escapeVariableName(an_t2m_name);
9192
}
9293

9394
String get_an_siconc_name() {
9495
return an_siconc_name;
9596
}
9697

9798
void set_an_siconc_name(String an_siconc_name) {
98-
this.an_siconc_name = an_siconc_name;
99+
this.an_siconc_name = NetCDFUtils.escapeVariableName(an_siconc_name);
99100
}
100101

101102
String get_an_u10_name() {
102103
return an_u10_name;
103104
}
104105

105106
void set_an_u10_name(String an_u10_name) {
106-
this.an_u10_name = an_u10_name;
107+
this.an_u10_name = NetCDFUtils.escapeVariableName(an_u10_name);
107108
}
108109

109110
String get_an_v10_name() {
110111
return an_v10_name;
111112
}
112113

113114
void set_an_v10_name(String an_v10_name) {
114-
this.an_v10_name = an_v10_name;
115+
this.an_v10_name = NetCDFUtils.escapeVariableName(an_v10_name);
115116
}
116117

117118
String get_an_msl_name() {
118119
return an_msl_name;
119120
}
120121

121122
void set_an_msl_name(String an_msl_name) {
122-
this.an_msl_name = an_msl_name;
123+
this.an_msl_name = NetCDFUtils.escapeVariableName(an_msl_name);
123124
}
124125

125126
String get_an_skt_name() {
126127
return an_skt_name;
127128
}
128129

129130
void set_an_skt_name(String an_skt_name) {
130-
this.an_skt_name = an_skt_name;
131+
this.an_skt_name = NetCDFUtils.escapeVariableName(an_skt_name);
131132
}
132133

133134
String get_an_sst_name() {
134135
return an_sst_name;
135136
}
136137

137138
void set_an_sst_name(String an_sst_name) {
138-
this.an_sst_name = an_sst_name;
139+
this.an_sst_name = NetCDFUtils.escapeVariableName(an_sst_name);
139140
}
140141

141142
String get_an_tcc_name() {
142143
return an_tcc_name;
143144
}
144145

145146
void set_an_tcc_name(String an_tcc_name) {
146-
this.an_tcc_name = an_tcc_name;
147+
this.an_tcc_name = NetCDFUtils.escapeVariableName(an_tcc_name);
147148
}
148149

149150
String get_an_tcwv_name() {
150151
return an_tcwv_name;
151152
}
152153

153154
void set_an_tcwv_name(String an_tcwv_name) {
154-
this.an_tcwv_name = an_tcwv_name;
155+
this.an_tcwv_name = NetCDFUtils.escapeVariableName(an_tcwv_name);
155156
}
156157

157158
int get_x_dim() {
@@ -183,58 +184,58 @@ String get_x_dim_name() {
183184
}
184185

185186
void set_x_dim_name(String x_dim_name) {
186-
this.x_dim_name = x_dim_name;
187+
this.x_dim_name = NetCDFUtils.escapeVariableName(x_dim_name);
187188
}
188189

189190
String get_y_dim_name() {
190191
return y_dim_name;
191192
}
192193

193194
void set_y_dim_name(String y_dim_name) {
194-
this.y_dim_name = y_dim_name;
195+
this.y_dim_name = NetCDFUtils.escapeVariableName(y_dim_name);
195196
}
196197

197198
String get_z_dim_name() {
198199
return z_dim_name;
199200
}
200201

201202
void set_z_dim_name(String z_dim_name) {
202-
this.z_dim_name = z_dim_name;
203+
this.z_dim_name = NetCDFUtils.escapeVariableName(z_dim_name);
204+
}
205+
206+
String get_nwp_time_variable_name() {
207+
return nwp_time_variable_name;
203208
}
204209

205210
void set_nwp_time_variable_name(String nwp_time_variable_name) {
206211
this.nwp_time_variable_name = nwp_time_variable_name;
207212
}
208213

209-
String get_nwp_time_variable_name() {
210-
return nwp_time_variable_name;
214+
String get_time_variable_name() {
215+
return time_variable_name;
211216
}
212-
217+
213218
void set_time_variable_name(String time_variable_name) {
214-
this.time_variable_name = time_variable_name;
219+
this.time_variable_name = NetCDFUtils.escapeVariableName(time_variable_name);
215220
}
216221

217222
String get_longitude_variable_name() {
218223
return longitude_variable_name;
219224
}
220225

221226
void set_longitude_variable_name(String longitude_variable_name) {
222-
this.longitude_variable_name = longitude_variable_name;
227+
this.longitude_variable_name = NetCDFUtils.escapeVariableName(longitude_variable_name);
223228
}
224229

225230
String get_latitude_variable_name() {
226231
return latitude_variable_name;
227232
}
228233

229234
void set_latitude_variable_name(String latitude_variable_name) {
230-
this.latitude_variable_name = latitude_variable_name;
235+
this.latitude_variable_name = NetCDFUtils.escapeVariableName(latitude_variable_name);
231236
}
232237

233238

234-
String get_time_variable_name() {
235-
return time_variable_name;
236-
}
237-
238239
void verify() {
239240
if (x_dim < 1 || y_dim < 1) {
240241
// do not check z-dimension, this might be not configured tb 2020-11-16

‎post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/VariableUtils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ static void addAttributes(TemplateVariable template, Variable variable) {
2727
}
2828

2929
static Array readTimeArray(String timeVariableName, NetcdfFile reader) throws IOException, InvalidRangeException {
30-
final Variable timeVariable = NetCDFUtils.getVariable(reader, timeVariableName);
30+
final Variable timeVariable = NetCDFUtils.getVariable(reader, timeVariableName, false);
3131

3232
Array timeArray;
3333
final int rank = timeVariable.getRank();
@@ -101,7 +101,7 @@ static int[] getNwpOffset(int[] shape, int[] nwpShape) {
101101
}
102102

103103
static Array readGeolocationVariable(com.bc.fiduceo.core.Dimension dimension, NetcdfFile reader, String lonVarName) throws IOException, InvalidRangeException {
104-
final Variable geoVariable = NetCDFUtils.getVariable(reader, lonVarName);
104+
final Variable geoVariable = NetCDFUtils.getVariable(reader, lonVarName, false);
105105

106106
final int[] shape = geoVariable.getShape();
107107

‎post-processing-tool/src/test/java/com/bc/fiduceo/post/plugin/era5/Era5PostProcessingPluginTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public void testCreateConfiguration_satelliteFields() throws JDOMException, IOEx
9898
assertEquals("skinTemp", satConfig.get_an_skt_name());
9999
assertEquals("ozeanTemp", satConfig.get_an_sst_name());
100100
assertEquals("cloudy", satConfig.get_an_tcc_name());
101-
assertEquals("steam!", satConfig.get_an_tcwv_name());
101+
assertEquals("steam\\!", satConfig.get_an_tcwv_name());
102102

103103
assertEquals(5, satConfig.get_x_dim());
104104
assertEquals("left", satConfig.get_x_dim_name());

0 commit comments

Comments
 (0)