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

ECC-1088: Samples path

This commit is contained in:
Shahram Najm 2020-03-04 22:15:10 +00:00
parent 9f1e9db4e0
commit 458d20311d
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/grib_context.c
View File

@ -496,6 +496,7 @@ grib_context* grib_context_get_default()
} }
#ifdef ECCODES_DEFINITION_PATH #ifdef ECCODES_DEFINITION_PATH
{ {
/* ECC-1088 */
if (strstr(default_grib_context.grib_definition_files_path, ECCODES_DEFINITION_PATH) == NULL) { if (strstr(default_grib_context.grib_definition_files_path, ECCODES_DEFINITION_PATH) == NULL) {
char buffer[ECC_PATH_MAXLEN]; char buffer[ECC_PATH_MAXLEN];
ecc_snprintf(buffer, ECC_PATH_MAXLEN, "%s%c%s", default_grib_context.grib_definition_files_path, ecc_snprintf(buffer, ECC_PATH_MAXLEN, "%s%c%s", default_grib_context.grib_definition_files_path,
@ -514,6 +515,16 @@ grib_context* grib_context_get_default()
default_grib_context.grib_samples_path = strdup(buffer); default_grib_context.grib_samples_path = strdup(buffer);
} }
} }
#ifdef ECCODES_SAMPLES_PATH
{
if (strstr(default_grib_context.grib_samples_path, ECCODES_SAMPLES_PATH) == NULL) {
char buffer[ECC_PATH_MAXLEN];
ecc_snprintf(buffer, ECC_PATH_MAXLEN, "%s%c%s", default_grib_context.grib_samples_path,
ECC_PATH_DELIMITER_CHAR, ECCODES_SAMPLES_PATH);
default_grib_context.grib_samples_path = strdup(buffer);
}
}
#endif
grib_context_log(&default_grib_context, GRIB_LOG_DEBUG, "Definitions path: %s", grib_context_log(&default_grib_context, GRIB_LOG_DEBUG, "Definitions path: %s",
default_grib_context.grib_definition_files_path); default_grib_context.grib_definition_files_path);