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

ECC-236: clean up

This commit is contained in:
Shahram Najm 2016-09-16 16:57:06 +01:00
parent 9bce800260
commit 640e7b36a6
2 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/grib_value.c
View File

@ -541,8 +541,10 @@ int grib_is_missing_double(grib_accessor* a,double x)
return ret; return ret;
} }
int grib_is_missing_string(grib_accessor* a,unsigned char* x,size_t len) int grib_is_missing_string(grib_accessor* a, unsigned char* x, size_t len)
{ {
/* For a string value to be missing, every character has to be */
/* all 1's (i.e. 0xFF) */
int ret; int ret;
size_t i=0; size_t i=0;

23
tools/grib_tools.c
View File

@ -786,22 +786,7 @@ void grib_skip_check(grib_runtime_options* options,grib_handle* h)
} }
} }
static int string_value_is_missing(const char* val, size_t length) void grib_print_key_values(grib_runtime_options* options, grib_handle* h)
{
/* For a string value to be missing, all its chars have to be */
/* all 1's i.e. -1 */
int i=0;
if (val == NULL || length == 0)
return 0;
for(i=0; i<length; ++i) {
if (val[i] != -1) {
return 0; /* not all bits set, so not missing */
}
}
return 1;
}
void grib_print_key_values(grib_runtime_options* options,grib_handle* h)
{ {
int i=0; int i=0;
int ret=0,width=0; int ret=0,width=0;
@ -811,6 +796,7 @@ void grib_print_key_values(grib_runtime_options* options,grib_handle* h)
char value[MAX_STRING_LEN]; char value[MAX_STRING_LEN];
char* notfound="not_found"; char* notfound="not_found";
int written_to_dump = 0; /* boolean */ int written_to_dump = 0; /* boolean */
grib_accessor* acc = NULL;
if (!options->verbose) return; if (!options->verbose) return;
@ -826,8 +812,10 @@ void grib_print_key_values(grib_runtime_options* options,grib_handle* h)
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, &(options->print_keys[i].type));
switch (options->print_keys[i].type) { switch (options->print_keys[i].type) {
case GRIB_TYPE_STRING: case GRIB_TYPE_STRING:
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);
if (string_value_is_missing(value, len)) sprintf(value,"MISSING"); if (grib_is_missing_string(acc, (unsigned char *)value, len))
sprintf(value,"MISSING");
break; break;
case GRIB_TYPE_DOUBLE: case GRIB_TYPE_DOUBLE:
ret=grib_get_double(h, options->print_keys[i].name, &dvalue); ret=grib_get_double(h, options->print_keys[i].name, &dvalue);
@ -848,6 +836,7 @@ void grib_print_key_values(grib_runtime_options* options,grib_handle* h)
} }
} }
} else { } else {
/* Other products e.g. GRIB */
if (grib_is_missing(h,options->print_keys[i].name,&ret) && ret==GRIB_SUCCESS) { if (grib_is_missing(h,options->print_keys[i].name,&ret) && ret==GRIB_SUCCESS) {
sprintf(value,"MISSING"); sprintf(value,"MISSING");
} }