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

Refactoring

This commit is contained in:
Shahram Najm 2022-03-14 19:54:22 +00:00
parent d8d4e26654
commit 422ef77000
3 changed files with 15 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/grib_api_prototypes.h
View File

@ -1190,7 +1190,7 @@ long grib_get_decimal_scale_fact(double max, double min, long bpval, long binary
/*grib_handle *grib_internal_sample(grib_context *c, const char *name);*/
grib_handle* grib_external_template(grib_context* c, const char* name);
grib_handle* bufr_external_template(grib_context* c, const char* name);
char* grib_external_template_path(grib_context* c, const char* name);
char* get_external_template_path(grib_context* c, const char* name);
/* grib_dependency.c */
grib_handle* grib_handle_of_accessor(const grib_accessor* a);

52
src/grib_templates.c
View File

@ -49,7 +49,7 @@ grib_handle* grib_internal_sample(grib_context* c,const char* name)
#define ECC_PATH_DELIMITER_CHAR ':'
#endif
static grib_handle* try_template(grib_context* c, const char* dir, const char* name)
static grib_handle* try_product_template(grib_context* c, ProductKind product_kind, const char* dir, const char* name)
{
char path[1024];
grib_handle* g = NULL;
@ -61,7 +61,7 @@ static grib_handle* try_template(grib_context* c, const char* dir, const char* n
sprintf(path, "%s/%s.tmpl", dir, name);
if (c->debug) {
fprintf(stderr, "ECCODES DEBUG try_template path='%s'\n", path);
fprintf(stderr, "ECCODES DEBUG try_product_template path='%s'\n", path);
}
if (codes_access(path, F_OK) == 0) {
@ -70,40 +70,14 @@ static grib_handle* try_template(grib_context* c, const char* dir, const char* n
grib_context_log(c, GRIB_LOG_PERROR, "cannot open %s", path);
return NULL;
}
g = grib_handle_new_from_file(c, f, &err);
if (!g) {
grib_context_log(c, GRIB_LOG_ERROR, "cannot create GRIB handle from %s", path);
if (product_kind == PRODUCT_BUFR) {
g = codes_bufr_handle_new_from_file(c, f, &err);
} else {
/* Note: Pseudo GRIBs like DIAG and BUDG also come here */
g = grib_handle_new_from_file(c, f, &err);
}
fclose(f);
}
return g;
}
static grib_handle* try_bufr_template(grib_context* c, const char* dir, const char* name)
{
char path[1024];
grib_handle* g = NULL;
int err = 0;
if (string_ends_with(name, ".tmpl"))
sprintf(path, "%s/%s", dir, name);
else
sprintf(path, "%s/%s.tmpl", dir, name);
if (c->debug) {
fprintf(stderr, "ECCODES DEBUG try_template path='%s'\n", path);
}
if (codes_access(path, F_OK) == 0) {
FILE* f = codes_fopen(path, "r");
if (!f) {
grib_context_log(c, GRIB_LOG_PERROR, "cannot open %s", path);
return NULL;
}
g = codes_bufr_handle_new_from_file(c, f, &err);
if (!g) {
grib_context_log(c, GRIB_LOG_ERROR, "cannot create BUFR handle from %s", path);
grib_context_log(c, GRIB_LOG_ERROR, "cannot create handle from %s", path);
}
fclose(f);
}
@ -139,7 +113,7 @@ grib_handle* grib_external_template(grib_context* c, const char* name)
while (*base) {
if (*base == ECC_PATH_DELIMITER_CHAR) {
*p = 0;
g = try_template(c, buffer, name);
g = try_product_template(c, PRODUCT_GRIB, buffer, name);
if (g)
return g;
p = buffer;
@ -149,7 +123,7 @@ grib_handle* grib_external_template(grib_context* c, const char* name)
}
*p = 0;
return g = try_template(c, buffer, name);
return g = try_product_template(c, PRODUCT_GRIB, buffer, name);
}
grib_handle* bufr_external_template(grib_context* c, const char* name)
@ -165,7 +139,7 @@ grib_handle* bufr_external_template(grib_context* c, const char* name)
while (*base) {
if (*base == ECC_PATH_DELIMITER_CHAR) {
*p = 0;
g = try_bufr_template(c, buffer, name);
g = try_product_template(c, PRODUCT_BUFR, buffer, name);
if (g)
return g;
p = buffer;
@ -175,11 +149,11 @@ grib_handle* bufr_external_template(grib_context* c, const char* name)
}
*p = 0;
g = try_bufr_template(c, buffer, name);
g = try_product_template(c, PRODUCT_BUFR, buffer, name);
return g;
}
char* grib_external_template_path(grib_context* c, const char* name)
char* get_external_template_path(grib_context* c, const char* name)
{
const char* base = c->grib_samples_path;
char buffer[1024];

2
tools/codes_export_resource.c
View File

@ -58,7 +58,7 @@ int main(int argc, char* argv[])
}
if (resource_type == SAMPLE) {
full_path = grib_external_template_path(c, resource_path);
full_path = get_external_template_path(c, resource_path);
}
else if (resource_type == DEFINITION) {
full_path = grib_context_full_defs_path(c, resource_path);