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

ECC-1260: grib_get -p step does not show step ranges with hyphens

This commit is contained in:
Shahram Najm 2021-06-25 19:19:41 +01:00
parent 93ba7c8e1b
commit a04b01bee0
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/grib_tools.c
View File

@ -1100,8 +1100,9 @@ void grib_print_key_values(grib_runtime_options* options, grib_handle* h)
} }
for (i = 0; i < options->print_keys_count; i++) { for (i = 0; i < options->print_keys_count; i++) {
size_t len = MAX_STRING_LEN; size_t len = MAX_STRING_LEN;
ret = GRIB_SUCCESS; int keyType = options->print_keys[i].type;
ret = GRIB_SUCCESS;
if (h->product_kind == PRODUCT_BUFR) { if (h->product_kind == PRODUCT_BUFR) {
/* ECC-236: Do not use grib_is_missing for BUFR */ /* ECC-236: Do not use grib_is_missing for BUFR */
@ -1111,9 +1112,9 @@ void grib_print_key_values(grib_runtime_options* options, grib_handle* h)
ret = grib_get_size(h, options->print_keys[i].name, &num_vals); ret = grib_get_size(h, options->print_keys[i].name, &num_vals);
} }
if (ret == GRIB_SUCCESS) { if (ret == GRIB_SUCCESS) {
if (options->print_keys[i].type == GRIB_TYPE_UNDEFINED) if (keyType == GRIB_TYPE_UNDEFINED)
grib_get_native_type(h, options->print_keys[i].name, &(options->print_keys[i].type)); grib_get_native_type(h, options->print_keys[i].name, &keyType);
switch (options->print_keys[i].type) { switch (keyType) {
case GRIB_TYPE_STRING: case GRIB_TYPE_STRING:
acc = grib_find_accessor(h, options->print_keys[i].name); acc = grib_find_accessor(h, options->print_keys[i].name);
ret = grib_get_string(h, options->print_keys[i].name, value, &len); ret = grib_get_string(h, options->print_keys[i].name, value, &len);
@ -1154,9 +1155,9 @@ void grib_print_key_values(grib_runtime_options* options, grib_handle* h)
} }
else if (ret == GRIB_SUCCESS) { else if (ret == GRIB_SUCCESS) {
const char* pName = NULL; const char* pName = NULL;
if (options->print_keys[i].type == GRIB_TYPE_UNDEFINED) if (keyType == GRIB_TYPE_UNDEFINED)
grib_get_native_type(h, options->print_keys[i].name, &(options->print_keys[i].type)); grib_get_native_type(h, options->print_keys[i].name, &keyType);
switch (options->print_keys[i].type) { switch (keyType) {
case GRIB_TYPE_STRING: case GRIB_TYPE_STRING:
pName = options->print_keys[i].name; pName = options->print_keys[i].name;
if (fix_lsdate && strcmp(pName, "date") == 0) { /* ECC-707 */ if (fix_lsdate && strcmp(pName, "date") == 0) { /* ECC-707 */