Merge pull request #524 from PCMDI/429_stop_cmor_if_coordinate_table_…

…not_found Return error when tables are not found.
PCMDI · Jul 29, 2019 · f0dee24 · f0dee24
2 parents ecdc777 + a31569b
commit f0dee24
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Src/cmor_tables.c b/Src/cmor_tables.c
@@ -619,24 +619,28 @@ int cmor_load_table(char szTable[CMOR_MAX_STRING], int *table_id)
  snprintf(msg, CMOR_MAX_STRING, "Can't open/read JSON table %s",
  szAxisEntryFilenameJSON);
  cmor_handle_error(msg, CMOR_CRITICAL);
+ return (1);
  }
  rc = cmor_load_table_internal(szTable, table_id);
  if (rc != TABLE_SUCCESS) {
  snprintf(msg, CMOR_MAX_STRING, "Can't open/read JSON table %s",
  szTable);
  cmor_handle_error(msg, CMOR_CRITICAL);
+ return (1);
  }
  rc = cmor_load_table_internal(szFormulaVarFilenameJSON, table_id);
  if (rc != TABLE_SUCCESS) {
  snprintf(msg, CMOR_MAX_STRING, "Can't open/read JSON table %s",
  szFormulaVarFilenameJSON);
  cmor_handle_error(msg, CMOR_CRITICAL);
+ return (1);
  }
  rc = cmor_load_table_internal(szControlFilenameJSON, table_id);
  if (rc != TABLE_SUCCESS) {
  snprintf(msg, CMOR_MAX_STRING, "Can't open/read JSON table %s",
  szControlFilenameJSON);
  cmor_handle_error(msg, CMOR_CRITICAL);
+ return (1);
  }
 
  } else if (rc == TABLE_FOUND) {