core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GRIB message validity checker: Check sections for both editions

This commit is contained in:
shahramn 2024-12-23 13:32:33 +00:00
parent 2d9732f009
commit aba80c4d04
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/accessor/grib_accessor_class_message_is_valid.cc
View File

@ -104,37 +104,39 @@ static int check_geoiterator(grib_handle* h)
return err; return err;
} }
static int check_section_numbers(grib_handle* h, long edition, const int* sec_nums, size_t N)
{
for (size_t i = 0; i < N; ++i) {
char sname[16] = {0,};
const int sec_num = sec_nums[i];
snprintf(sname, sizeof(sname), "section_%d", sec_num);
if (!grib_is_defined(h, sname)) {
grib_context_log(h->context, GRIB_LOG_ERROR, "GRIB%ld: Section %d is missing!", edition, sec_num);
return GRIB_INVALID_MESSAGE;
}
}
return GRIB_SUCCESS;
}
static int check_sections(grib_handle* h) static int check_sections(grib_handle* h)
{ {
int err = 0; int err = 0;
long edition = 0; long edition = 0;
err = grib_get_long_internal(h, "edition", &edition); err = grib_get_long_internal(h, "edition", &edition);
if (err) return err; if (err) return err;
const int grib1_section_nums[] = {1, 2, 4};
const int grib2_section_nums[] = {1, 3, 4, 5, 6, 7, 8}; // section 2 is optional
if (edition == 1) { if (edition == 1) {
const int grib1_section_nums[] = {1, 2, 4};
const size_t N = sizeof(grib1_section_nums) / sizeof(grib1_section_nums[0]); const size_t N = sizeof(grib1_section_nums) / sizeof(grib1_section_nums[0]);
for (size_t i=0; i<N; ++i) { err = check_section_numbers(h, edition, grib1_section_nums, N);
char sname[16] = {0,}; if (err) return err;
const int sec_num = grib1_section_nums[i];
snprintf(sname, sizeof(sname), "section_%d", sec_num);
if (!grib_is_defined(h, sname)) {
grib_context_log(h->context, GRIB_LOG_ERROR, "GRIB%ld: Section %d is missing!", edition, sec_num);
return GRIB_INVALID_MESSAGE;
}
}
} }
else if (edition == 2) { else if (edition == 2) {
const int grib2_section_nums[] = {1, 3, 4, 5, 6, 7, 8}; // section 2 is optional
const size_t N = sizeof(grib2_section_nums) / sizeof(grib2_section_nums[0]); const size_t N = sizeof(grib2_section_nums) / sizeof(grib2_section_nums[0]);
for (size_t i=0; i<N; ++i) { err = check_section_numbers(h, edition, grib2_section_nums, N);
char sname[16] = {0,}; if (err) return err;
const int sec_num = grib2_section_nums[i];
snprintf(sname, sizeof(sname), "section_%d", sec_num);
if (!grib_is_defined(h, sname)) {
grib_context_log(h->context, GRIB_LOG_ERROR, "GRIB%ld: Section %d is missing!", edition, sec_num);
return GRIB_INVALID_MESSAGE;
}
}
} }
return GRIB_SUCCESS; return GRIB_SUCCESS;
} }