diff --git a/archive_api/service/essdive_transfer/crosswalk.py b/archive_api/service/essdive_transfer/crosswalk.py index 8523c9d2..67dd29a8 100644 --- a/archive_api/service/essdive_transfer/crosswalk.py +++ b/archive_api/service/essdive_transfer/crosswalk.py @@ -270,14 +270,16 @@ def dataset_transform(dataset) -> Tuple[Dict, Optional[TextIO]]: # --- Funding Organization and Contract Numbers --- funders = [JSONLD_FUNDER] if dataset.funding_organizations: - # if there are line breaks, commas, or semicolons, we assume multiple funders - for f in re.split('[\n,;]', dataset.funding_organizations): + # if there are line breaks, we assume multiple funders + for f in re.split('\n', dataset.funding_organizations): funders.append({"name": f.strip()}) # --- DOE Funding Contract Numbers -- - awards = None + awards = [] if dataset.doe_funding_contract_numbers: - awards = re.split('[\n,;]', dataset.doe_funding_contract_numbers) + # if there are line breaks, we assume multiple funders + for f in re.split('[\n,]', dataset.doe_funding_contract_numbers): + awards.append(f.strip()) # --- ASSIGN TO JSON-LD ---- diff --git a/ui/static/js/metadata/dataset.json b/ui/static/js/metadata/dataset.json index 15a37739..8514e3c5 100644 --- a/ui/static/js/metadata/dataset.json +++ b/ui/static/js/metadata/dataset.json @@ -162,7 +162,7 @@ "description": "
(BER is assumed by default.)
U.S. DOE > Office of Science > Biological and Environmental Research (BER)
", "sequence": 16, "multiple": false, - "tooltip": "Identify the agencies and offices that funded the work to generate the dataset. Separate multiple funders with a comma and a space. This field has a limit of 1024 characters.
", + "tooltip": "Identify the agencies and offices that funded the work to generate the dataset. Separate multiple funders with a newline. This field has a limit of 1024 characters.
", "placeholder": "Add additional funding organizations other than the default." }, "doe_funding_contract_numbers": { @@ -173,7 +173,7 @@ "description": "(NGEE-Tropics is assumed by default through LBNL contract)
DE-AC02-05CH11231 will be automatically prepended
", "sequence": 17, "multiple": false, - "tooltip": "List the numbers of any DOE contract under which the work was funded. If no DOE funding for this dataset or field is empty set as 'DE-AC02-05CH11231'. If the dataset is a result of a joint effort between two or more DOE Site/Facility Management Contractors, etc., additional DOE contract numbers may be entered. This field has a limit of 100 characters.
", + "tooltip": "List the numbers of any DOE contract under which the work was funded.If no DOE funding for this dataset or field is empty set as 'DE-AC02-05CH11231'. If the dataset is a result of a joint effort between two or more DOE Site/Facility Management Contractors, etc., additional DOE contract numbers may be entered. This field has a limit of 100 characters. Separate multiple funders with a newline or comma(,).
", "placeholder": "Add additional contract numbers other than the default." }, "acknowledgement": {