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

ECC-1316: GRIB: Fortran API: codes_index_select doesn't work with 'parameterName' as key

This commit is contained in:
Shahram Najm 2021-12-01 18:32:34 +00:00
parent 15ba25ab22
commit d3b83b44fc
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fortran/grib_fortran.c
View File

@ -163,7 +163,8 @@ static l_bufr_keys_iterator* bufr_keys_iterator_set = NULL;
static grib_oarray* binary_messages = NULL; static grib_oarray* binary_messages = NULL;
static grib_oarray* info_messages = NULL; static grib_oarray* info_messages = NULL;
static char* cast_char(char* buf, char* fortstr,int len) /* Convert from Fortran string to C string - chop at first space character */
static char* cast_char(char* buf, char* fortstr, int len)
{ {
char *p,*end; char *p,*end;
if (len == 0 || fortstr == NULL) return NULL; if (len == 0 || fortstr == NULL) return NULL;
@ -180,7 +181,8 @@ static char* cast_char(char* buf, char* fortstr,int len)
return buf; return buf;
} }
static char* cast_char_no_cut(char* buf, char* fortstr,int len) /* Convert from Fortran string to C string - non chopping version */
static char* cast_char_no_cut(char* buf, char* fortstr, int len)
{ {
if (len == 0 || fortstr == NULL) return NULL; if (len == 0 || fortstr == NULL) return NULL;
memcpy(buf,fortstr,len); memcpy(buf,fortstr,len);
@ -189,7 +191,7 @@ static char* cast_char_no_cut(char* buf, char* fortstr,int len)
return buf; return buf;
} }
static void czstr_to_fortran(char* str,int len) static void czstr_to_fortran(char* str, int len)
{ {
char *p,*end; char *p,*end;
p=str; end=str+len-1; p=str; end=str+len-1;
@ -2857,7 +2859,12 @@ int grib_f_index_select_string_(int* gid, char* key, char* val, int len, int val
char bufval[1024]; char bufval[1024];
if(!h) return GRIB_INVALID_GRIB; if(!h) return GRIB_INVALID_GRIB;
return grib_index_select_string(h, cast_char(buf,key,len), cast_char(bufval,val,vallen));
/* ECC-1316 */
cast_char_no_cut(bufval,val,vallen);
rtrim( bufval );
return grib_index_select_string(h, cast_char(buf,key,len), bufval);
} }
int grib_f_index_select_string__(int* gid, char* key, char* val, int len, int vallen){ int grib_f_index_select_string__(int* gid, char* key, char* val, int len, int vallen){
return grib_f_index_select_string_(gid,key,val,len,vallen); return grib_f_index_select_string_(gid,key,val,len,vallen);