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

Print user-friendly type for keys

This commit is contained in:
Shahram Najm 2019-08-05 16:23:06 +01:00
parent 4b65c47cdc
commit a5f5a77f51
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/grib_dumper_class_default.c
View File

@ -155,7 +155,7 @@ static void dump_long(grib_dumper* d,grib_accessor* a,const char* comment)
if ((d->option_flags & GRIB_DUMP_FLAG_TYPE) != 0){ if ((d->option_flags & GRIB_DUMP_FLAG_TYPE) != 0){
fprintf(self->dumper.out," "); fprintf(self->dumper.out," ");
fprintf(self->dumper.out,"# type %s \n",a->creator->op); fprintf(self->dumper.out,"# type %s (int)\n",a->creator->op);
} }
if (size>1) { if (size>1) {
@ -290,7 +290,7 @@ static void dump_double(grib_dumper* d,grib_accessor* a,const char* comment)
if ((d->option_flags & GRIB_DUMP_FLAG_TYPE) != 0) { if ((d->option_flags & GRIB_DUMP_FLAG_TYPE) != 0) {
fprintf(self->dumper.out," "); fprintf(self->dumper.out," ");
fprintf(self->dumper.out,"# type %s \n",a->creator->op); fprintf(self->dumper.out,"# type %s (double)\n",a->creator->op);
} }
aliases(d,a); aliases(d,a);
@ -353,7 +353,7 @@ static void dump_string_array(grib_dumper* d,grib_accessor* a,const char* commen
if ((d->option_flags & GRIB_DUMP_FLAG_TYPE) != 0) { if ((d->option_flags & GRIB_DUMP_FLAG_TYPE) != 0) {
fprintf(self->dumper.out," "); fprintf(self->dumper.out," ");
fprintf(self->dumper.out,"# type %s \n",a->creator->op); fprintf(self->dumper.out,"# type %s (str)\n",a->creator->op);
} }
aliases(d,a); aliases(d,a);
@ -417,7 +417,7 @@ static void dump_string(grib_dumper* d,grib_accessor* a,const char* comment)
if ((d->option_flags & GRIB_DUMP_FLAG_TYPE) != 0) { if ((d->option_flags & GRIB_DUMP_FLAG_TYPE) != 0) {
fprintf(self->dumper.out," "); fprintf(self->dumper.out," ");
fprintf(self->dumper.out,"# type %s \n",a->creator->op); fprintf(self->dumper.out,"# type %s (str)\n",a->creator->op);
} }
aliases(d,a); aliases(d,a);
@ -541,13 +541,19 @@ static void dump_values(grib_dumper* d,grib_accessor* a)
dump_double(d,a,NULL); dump_double(d,a,NULL);
return ; return ;
} }
buf = (double*)grib_context_malloc(d->handle->context,size * sizeof(double)); buf = (double*)grib_context_malloc(d->handle->context,size * sizeof(double));
print_offset(self->dumper.out,d,a); print_offset(self->dumper.out,d,a);
if ((d->option_flags & GRIB_DUMP_FLAG_TYPE) != 0) { if ((d->option_flags & GRIB_DUMP_FLAG_TYPE) != 0) {
char type_name[32]="";
const long native_type = grib_accessor_get_native_type(a);
if (native_type == GRIB_TYPE_LONG) strcpy(type_name, "(int)");
else if (native_type == GRIB_TYPE_DOUBLE) strcpy(type_name, "(double)");
else if (native_type == GRIB_TYPE_STRING) strcpy(type_name, "(str)");
fprintf(self->dumper.out," "); fprintf(self->dumper.out," ");
fprintf(self->dumper.out,"# type %s \n",a->creator->op); fprintf(self->dumper.out,"# type %s %s\n",a->creator->op, type_name);
} }
aliases(d,a); aliases(d,a);