Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

64 dontskip #65

Merged
merged 3 commits into from
Sep 26, 2024
Merged

64 dontskip #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f602aca
bugfix - when we skip extraneous files, ensure the default config pat…
aradhakrishnanGFDL Sep 26, 2024
34a6e3e
adding standard_name here. TODO eventually we need to streamline the …
aradhakrishnanGFDL Sep 26, 2024
eac4a51
Merge branch 'main' into 59-cli
aradhakrishnanGFDL Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion catalogbuilder/intakebuilder/builderconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
headerlist = ["activity_id", "institution_id", "source_id", "experiment_id",
"frequency", "realm", "table_id",
"member_id", "grid_label", "variable_id",
"time_range", "chunk_freq","grid_label","platform","dimensions","cell_methods","path"]
"time_range", "chunk_freq","grid_label","platform","dimensions","cell_methods","standard_name","path"]

#what kind of directory structure to expect?
#For a directory structure like /archive/am5/am5/am5f3b1r0/c96L65_am5f3b1r0_pdclim1850F/gfdl.ncrc5-deploy-prod-openmp/pp
Expand Down
15 changes: 12 additions & 3 deletions catalogbuilder/intakebuilder/gfdlcrawler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ def crawlLocal(projectdir, dictFilter,dictFilterIgnore,logger,configyaml,slow):
headerlist = configyaml.headerlist
else:
headerlist = builderconfig.headerlist

#For those columns that we cannot find in output path template or output file template from config yaml, we have hooks
#now to look up the netcdf dataset if slow option is True
#todo catch exceptions upon furhter testing
Expand All @@ -38,8 +37,18 @@ def crawlLocal(projectdir, dictFilter,dictFilterIgnore,logger,configyaml,slow):
if (configyaml.output_path_template is not None) & (configyaml.output_file_template is not None) :
list_ptemplate = configyaml.output_path_template
list_ftemplate = configyaml.output_file_template
set_ptemplate = set(list_ptemplate)
set_ftemplate = set(list_ftemplate)
else:
#if it is none, the user is likely using default config which may be phased out, or redesigned to use a config template json rather than builderconfig
try:
list_ptemplate = builderconfig.output_path_template
except:
sys.exit("output_path_template is not set. Check your configuration")
try:
list_ftemplate = builderconfig.output_file_template
except:
sys.exit("output_file_template is not set. Check your configuration")
set_ptemplate = set(list_ptemplate)
set_ftemplate = set(list_ftemplate)
#print(headerlist)
#print(list_ptemplate)
#print(list_ftemplate)
Expand Down