diff --git a/input/ATMOS_reserve_Insight_Bundle_20200624/aaaSubmitted_by_ATMOS_reserve_2020624/DOI_Requests_ATM-2020-06-30.xlsx b/input/ATMOS_reserve_Insight_Bundle_20200624/aaaSubmitted_by_ATMOS_reserve_2020624/DOI_Requests_ATM-2020-06-30.xlsx deleted file mode 100644 index dabf2d92..00000000 Binary files a/input/ATMOS_reserve_Insight_Bundle_20200624/aaaSubmitted_by_ATMOS_reserve_2020624/DOI_Requests_ATM-2020-06-30.xlsx and /dev/null differ diff --git a/input/DOI_GEO_Apollo_Reserved_Bundles_20200316.xlsx b/input/DOI_GEO_Apollo_Reserved_Bundles_20200316.xlsx deleted file mode 100644 index ae837fcd..00000000 Binary files a/input/DOI_GEO_Apollo_Reserved_Bundles_20200316.xlsx and /dev/null differ diff --git a/input/DOI_RMS_U-occs-Reserved-2020-05-12_edited.xlsx b/input/DOI_RMS_U-occs-Reserved-2020-05-12_edited.xlsx deleted file mode 100644 index 90482395..00000000 Binary files a/input/DOI_RMS_U-occs-Reserved-2020-05-12_edited.xlsx and /dev/null differ diff --git a/input/DOI_Release_20200727_from_draft.xml b/input/DOI_Release_20200727_from_draft.xml deleted file mode 100644 index f0a1ec0e..00000000 --- a/input/DOI_Release_20200727_from_draft.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - InSight Cameras Bundle - National Aeronautics and Space Administration (NASA) - urn:nasa:pds:insight_cameras::1.0 - NASA Planetary Data System - NASA Planetary Data System - 2019-01-01 - US - InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products - https://pds.nasa.gov/ds-view/pds/viewBundle.jsp?identifier=urn%3Anasa%3Apds%3Ainsight_cameras&version=1.0 - Dataset - PDS4 Refereed Data Bundle - 2021-04-01 - PDS;PDS4;camera;context;data;deployment;edr;engineering;experiment;insight;lander;mars;product;raw;rdr;record;reduced;science - - - Deen - R. - - - Abarca - H. - - - Zamani - P. - - - Maki - J. - - - - - - Smith - P. H. - Editor - - - - - Lemmon - M. - Editor - - - - - Beebe - R. F. - Editor - - - - Planetary Data System: Engineering Node - DataCurator - - - PDS Operator - PDS - pds-operator@jpl.nasa.gov - 818.393.7165 - - diff --git a/input/DOI_Release_20210216_from_draft.json b/input/DOI_Release_20210216_from_draft.json deleted file mode 100644 index 3be5a5c6..00000000 --- a/input/DOI_Release_20210216_from_draft.json +++ /dev/null @@ -1,41 +0,0 @@ -[ - { - "status": "draft", - "title": "InSight Cameras Bundle", - "sponsoring_organization": "National Aeronautics and Space Administration (NASA)", - "accession_number": "urn:nasa:pds:insight_cameras::1.0", - "publisher": "NASA Planetary Data System", - "availability": "NASA Planetary Data System", - "publication_date": "2019-01-01", - "country": "US", - "description": "InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products", - "site_url": "https://pds.nasa.gov/ds-view/pds/viewBundle.jsp?identifier=urn%3Anasa%3Apds%3Ainsight_cameras&version=1.0", - "product_type": "Dataset", - "product_type_specific": "PDS4 Refereed Data Bundle", - "date_record_added": "2021-04-01", - "keywords": "PDS;PDS4;camera;context;data;deployment;edr;engineering;experiment;insight;lander;mars;product;raw;rdr;record;reduced;science", - "authors": [ - { - "first_name": "R.", - "last_name": "Deen" - }, - { - "first_name": "H.", - "last_name": "Abarca" - }, - { - "first_name": "P.", - "last_name": "Zamani" - }, - { - "first_name": "J.", - "last_name": "Maki" - } - ], - "contributors": [], - "contact_name": "PDS Operator", - "contact_org": "PDS", - "contact_email": "pds-operator@jpl.nasa.gov", - "contact_phone": "818.393.7165" - } -] diff --git a/input/DOI_Release_20210216_from_review.json b/input/DOI_Release_20210216_from_review.json deleted file mode 100644 index 2714992b..00000000 --- a/input/DOI_Release_20210216_from_review.json +++ /dev/null @@ -1,63 +0,0 @@ -[ - { - "status": "review", - "id": "29569", - "title": "InSight Cameras Bundle", - "doi": "10.17189/29569", - "sponsoring_organization": "National Aeronautics and Space Administration (NASA)", - "accession_number": "urn:nasa:pds:insight_cameras::1.0", - "publisher": "NASA Planetary Data System", - "availability": "NASA Planetary Data System", - "publication_date": "2019-01-01", - "country": "US", - "description": "InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products", - "site_url": "https://pds.nasa.gov/ds-view/pds/viewBundle.jsp?identifier=urn%3Anasa%3Apds%3Ainsight_cameras&version=1.0", - "product_type": "Dataset", - "product_type_specific": "PDS4 Refereed Data Bundle", - "date_record_added": "2021-04-01", - "keywords": "PDS;PDS4;camera;context;data;deployment;edr;engineering;experiment;insight;lander;mars;product;raw;rdr;record;reduced;science", - "authors": [ - { - "first_name": "R.", - "last_name": "Deen" - }, - { - "first_name": "H.", - "last_name": "Abarca" - }, - { - "first_name": "P.", - "last_name": "Zamani" - }, - { - "first_name": "J.", - "last_name": "Maki" - } - ], - "contributors": [ - { - "last_name": "Smith", - "first_name": "P. H.", - "contributor_type": "Editor" - }, - { - "last_name": "Lemmon", - "first_name": "M.", - "contributor_type": "Editor" - }, - { - "last_name": "Beebe", - "first_name": "R. F.", - "contributor_type": "Editor" - }, - { - "full_name": "Planetary Data System: Engineering Node", - "contributor_type": "DataCurator" - } - ], - "contact_name": "PDS Operator", - "contact_org": "PDS", - "contact_email": "pds-operator@jpl.nasa.gov", - "contact_phone": "818.393.7165" - } -] diff --git a/input/DOI_Reserved_GEO_200318_with_submitter_email.xlsx b/input/DOI_Reserved_GEO_200318_with_submitter_email.xlsx deleted file mode 100644 index 50613c15..00000000 Binary files a/input/DOI_Reserved_GEO_200318_with_submitter_email.xlsx and /dev/null differ diff --git a/input/OSTI_IAD_submitted_records_Reserved-only_20200304.csv b/input/OSTI_IAD_submitted_records_Reserved-only_20200304.csv deleted file mode 100644 index e535f92b..00000000 --- a/input/OSTI_IAD_submitted_records_Reserved-only_20200304.csv +++ /dev/null @@ -1,119 +0,0 @@ -site_code,title,accession_number,doi,publication_date,product_type,product_type_specific,date_record_added,date_record_updated,authors_author_first_name,authors_author_last_name,authors_author_affiliations,authors_author,authors,contributors,related_identifiers, -"NASA-PDS","Cassini ISS Observations of the Saturn System","urn:nasa:pds:cassini_iss_saturn","10.17189/1504133","2019-09-15","Collection","PDS4 Bundle Product","2019-07-23","2019-07-23","Carolyn","Porco","","","","","","" -"NASA-PDS","Cassini VIMS Observations of the Saturn System","urn:nasa:pds:cassini_vims_saturn","10.17189/1504134","2019-09-15","Collection","PDS4 Bundle Product","2019-07-23","2019-07-23","R. H.","Brown","","","","","","" -"NASA-PDS","Cassini Imaging Science Subsystem (ISS) Data User's Guide","urn:nasa:pds:cassini_iss_saturn:document:iss-data-user-guide","10.17189/1504135","2019-09-15","Dataset","PDS4 Document Product","2019-07-23","2019-07-23","Benjamin","Knowles","","","","","","" -"NASA-PDS","Cassini VIMS IR Pixel Timing","urn:nasa:pds:cassini_vims_saturn:document:vims-ir-pixel-timing","10.17189/1504136","2019-09-15","Dataset","PDS4 Document Product","2019-07-23","2019-07-23","R. H.","Brown","","","","","","" -"NASA-PDS","The VIMS Wavelength and Radiometric Calibration 19, Final Report","urn:nasa:pds:cassini_vims_saturn:document:vims-wavelength-and-radiometric-calibration-report","10.17189/1504137","2019-09-15","Dataset","PDS4 Document Product","2019-07-23","2019-07-23","R. N.","Clark","","","","","","" -"NASA-PDS","Cassini ISS Observations from Launch to Entry in the Saturn System, including the Jupiter Encounter","urn:nasa:pds:cassini_iss_cruise","10.17189/1504154","2019-09-15","Collection","PDS4 Bundle Product","2019-07-29","2019-07-29","Carolyn","Porco","","","","","","" -"NASA-PDS","Cassini VIMS Observations from Launch to Entry in the Saturn System, including the Jupiter Encounter","urn:nasa:pds:cassini_vims_cruise","10.17189/1504155","2019-09-15","Collection","PDS4 Bundle Product","2019-07-29","2019-07-29","R. H.","Brown","","","","","","" -"NASA-PDS","Apollo 17 Surface Electrical Properties Experiment Calibrated ASCII Data Bundle","urn:nasa:pds:a17sep","10.17189/1518359","2020-02-24","Collection","PDS4 Bundle Product","2020-02-27","2020-02-27","D.R.","Williams","","","","","","" -"NASA-PDS","MAVEN Particle and Fields instrument Data Return Files (DRF) Collection","10.17189/1517674","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","Mars InSight Lander HP3 Data Archive","urn:nasa:pds:insight_hp3_tem","10.17189/1517573","2020-01-01","Collection","PDS4 Bundle Product","2020-01-08","2020-01-08","Tilman","Spohn","","","","","","" -"NASA-PDS","MAVEN Periapsis Timing Estimator Data Return Files (DRF) Collection","10.17189/1517675","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Periapsis Timing Estimator Data Return Files (DRF) Collection","10.17189/1517676","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Remote Sensing (IUVS) instrument Data Return Files (DRF) Collection","10.17189/1517677","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Solar Array Switch Module 1 Data Return Files (DRF) Collection","10.17189/1517678","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Solar Array Switch Module 2 Data Return Files (DRF) Collection","10.17189/1517679","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Solar Array Switch Module 3 Data Return Files (DRF) Collection","10.17189/1517680","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Universal Switching Module 1 Data Return Files (DRF) Collection","10.17189/1517681","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Universal Switching Module 2 Data Return Files (DRF) Collection","10.17189/1517682","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Universal Switching Module 3 Data Return Files (DRF) Collection","10.17189/1517683","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Universal Switching Module 4 Data Return Files (DRF) Collection","10.17189/1517684","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Universal Switching Module 5 Data Return Files (DRF) Collection","10.17189/1517685","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Universal Switching Module 6 Data Return Files (DRF) Collection","10.17189/1517686","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Events List Data Collection","10.17189/1517687","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Intertial Measurement Unit Data Collection","10.17189/1517688","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","Uranus System Occultation of star u17b (Hipparcos 80841) Observed from the SAAO 188cm Telescope Data Bundle","urn:nasa:pds:uranus_occ_u17b_saao_188cm","10.17189/1517613","2020-01-23","Collection","PDS4 Bundle Product","2020-01-23","2020-01-23","R. G.","French","","","","","","" -"NASA-PDS","Data Collection for the Uranus System occultation of star u17b (Hipparcos 80841) Observed from the SAAO 188cm Telescope.","urn:nasa:pds:uranus_occ_u17b_saao_188cm:data::1.0","10.17189/1517614","2020-01-23","Dataset","PDS4 Collection Product","2020-01-23","2020-01-23","R. G.","French","","","","","","" -"NASA-PDS","MAVEN Extreme ultraviolet (EUV) Calibrated Data Bundle","10.17189/1517689","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Frank","Eparvier","","","","","","" -"NASA-PDS","MAVEN Extreme ultraviolet (EUV) calibrated irradiances Data Collection","10.17189/1517690","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Frank","Eparvier","","","","","","" -"NASA-PDS","MAVEN Extreme ultraviolet (EUV) Modelled Data Bundle","10.17189/1517691","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Frank","Eparvier","","","","","","" -"NASA-PDS","MAVEN Extreme ultraviolet (EUV) daily averaged modelled irradiance spectra Data Collection","10.17189/1517692","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Frank","Eparvier","","","","","","" -"NASA-PDS","MAVEN Extreme ultraviolet (EUV) minute averaged modelled irradiance spectra Data Collection","10.17189/1517693","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Frank","Eparvier","","","","","","" -"NASA-PDS","MAVEN Insitu Key Parameters Data Bundle","10.17189/1517694","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Patrick","Dunn","","","","","","" -"NASA-PDS","MAVEN Insitu Key Parameters Data Collection","10.17189/1517695","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Patrick","Dunn","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Calibrated Data Bundle","10.17189/1517696","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Calibrated Current-Voltage Relationships Data Collection","10.17189/1517697","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Spacecraft Potential Data Collection","10.17189/1517698","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Low Frequency Electric-Field Data Collection","10.17189/1517699","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) High Frequency Burst Mode Calibrated Electric-Field Data Collection","10.17189/1517700","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Low Frequency Burst Mode Calibrated Electric-Field Data Collection","10.17189/1517701","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Medium Frequency Burst Mode Calibrated Electric-Field Data Collection","10.17189/1517702","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Calibrated Active Mode Spectra Data Collection","10.17189/1517703","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Calibrated Passive Mode Spectra Data Collection","10.17189/1517704","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Derived Data Bundle","10.17189/1517705","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Derived Electron Temperature Data Collection","10.17189/1517706","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Derived Electron Density Data Collection","10.17189/1517707","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Data Bundle","10.17189/1517708","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Wave Active Sub-Cycle Potentials Data Collection","10.17189/1517709","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Active DAC Readback Data Collection","10.17189/1517710","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Active Table Readback Data Collection","10.17189/1517711","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Raw Extreme ultraviolet (EUV) Packet Data Collection","10.17189/1517712","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw High Frequency High Speed Burst Mode (HSBM) Data Collection","10.17189/1517713","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Low Frequency High Speed Burst Mode (HSBM) Data Collection","10.17189/1517714","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Medium Frequency High Speed Burst Mode (HSBM) Data Collection","10.17189/1517715","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Housekeeping Data Collection","10.17189/1517716","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Wave Passive Sub-Cycle Potentials Data Collection","10.17189/1517717","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Wave Active Sub-Cycle Onboard FFT in High Frequency Range Data Collection","10.17189/1517718","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Wave Passive Sub-Cycle Onboard FFT in High Frequency Range Data Collection","10.17189/1517719","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Wave Active Sub-Cycle Onboard FFT in Low Frequency Range Data Collection","10.17189/1517720","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Wave Passive Sub-Cycle Onboard FFT in Low Frequency Range Data Collection","10.17189/1517721","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Wave Active Sub-Cycle Onboard FFT in Medium Frequency Range Data Collection","10.17189/1517722","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Wave Passive Sub-Cycle Onboard FFT in Medium Frequency Range Data Collection","10.17189/1517723","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Langmuir Probe Sensor 1 Sub-Cycle Sweep Data Collection","10.17189/1517724","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Langmuir Probe Sensor 2 Sub-Cycle Sweep Data Collection","10.17189/1517725","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Magnetometer (MAG) Calibrated Data Bundle","10.17189/1517726","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Jack","Connerney","","","","","","" -"NASA-PDS","MAVEN Tabulated vector magnetic field vs. time in planetocentric coordinates Data Collection","10.17189/1517727","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Jack","Connerney","","","","","","" -"NASA-PDS","MAVEN Tabulated vector magnetic field vs. time in payload coordinates Data Collection","10.17189/1517728","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Jack","Connerney","","","","","","" -"NASA-PDS","MAVEN Tabulated vector magnetic field vs. time in Sun-state coordinates Data Collection","10.17189/1517729","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Jack","Connerney","","","","","","" -"NASA-PDS","MAVEN ROSE Calibrated Data Bundle","10.17189/1517730","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Paul","Withers","","","","","","" -"NASA-PDS","MAVEN ROSE Sky and Resudual Frequencies Data Collection","10.17189/1517731","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Paul","Withers","","","","","","" -"NASA-PDS","MAVEN ROSE Derived Data Bundle","10.17189/1517732","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Paul","Withers","","","","","","" -"NASA-PDS","MAVEN ROSE Electron Density Profile Data Collection","10.17189/1517733","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Paul","Withers","","","","","","" -"NASA-PDS","MAVEN ROSE Raw Data Bundle","10.17189/1517734","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Paul","Withers","","","","","","" -"NASA-PDS","MAVEN ROSE Radio Science Receiver (RSR) Data Collection","10.17189/1517735","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Paul","Withers","","","","","","" -"NASA-PDS","MAVEN ROSE Radio Science Tracking and Navigation File (TNF) Data Collection","10.17189/1517736","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Paul","Withers","","","","","","" -"NASA-PDS","MAVEN Solar Energetic Particle (SEP) Calibrated Data Bundle","10.17189/1517737","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Davin","Larson","","","","","","" -"NASA-PDS","MAVEN Solar Energetic Particle (SEP) Ancillary Data Collection","10.17189/1517738","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Robert","Lillis","","","","","","" -"NASA-PDS","MAVEN Solar Energetic Particle (SEP) Raw Ion and Electron Counts Data Collection","10.17189/1517739","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Davin","Larson","","","","","","" -"NASA-PDS","MAVEN Solar Energetic Particle (SEP) Calibrated Ion and Electron Spectra Data Collection","10.17189/1517740","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Davin","Larson","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Data Bundle","10.17189/1517741","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Housekeeping Data Collection","10.17189/1517742","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 64 Energy x 2 Mass Bins Data Collection","10.17189/1517743","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 32 Energy x 32 Mass Bins Data Collection","10.17189/1517744","2019-05-12","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 4 Energy X 64 Mass Bins Data Collection","10.17189/1517745","2019-05-12","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 32 Energy X 64 Mass Bins Data Collection","10.17189/1517746","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","Uranus Occultation Support Bundle","urn:nasa:pds:uranus_occ_support","10.17189/1517663","2020-02-01","Collection","PDS4 Bundle Product","2020-02-03","2020-02-03","R. G.","French","","","","","","" -"NASA-PDS","Data Collection for the Uranus Occultation Support Bundle","urn:nasa:pds:uranus_occ_support:data","10.17189/1517664","2020-02-01","Collection","PDS4 Collection Product","2020-02-03","2020-02-03","R. G.","French","","","","","","" -"NASA-PDS","Earth-based Uranus Stellar Occultations User Guide","urn:nasa:pds:uranus_occ_support:document:earth_based_uranus_stellar_occultation_user_guide","10.17189/1517665","2020-02-01","Dataset","PDS4 Document Product","2020-02-03","2020-02-03","R. G.","French","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 32 Energy X 16 Solid Angle Bins Data Collection","10.17189/1517747","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 16 Energy X 64 Solid Angle Bins Data Collection","10.17189/1517748","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 32 Energy X 8 Solid Angle X 32 Mass Bins Data Collection","10.17189/1517749","2019-05-12","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN Ancillary Bundle","10.17189/1517670","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Electrical Power System Data Return Files (DRF) Data Collection","10.17189/1517671","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Guidance Navigation and Control Data Return Files (DRF) Data Collection","10.17189/1517672","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Neutral Gas and Ion Mass Spectrometer (NGIMS) instrument Data Return Files (DRF) Data Collection","10.17189/1517673","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 32 Energy X 8 Solid Angle X 32 Mass Bins Data Collection","10.17189/1517750","2019-05-12","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 16 Energy X 64 Solid Angle Bins Data Collection","10.17189/1517751","2019-05-12","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 16 Energy X 64 Solid Angle X 16 Mass Bins Data Collection","10.17189/1517752","2019-05-12","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 16 Energy X 64 Solid Angle X 8 Mass Bins Data Collection","10.17189/1517753","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 16 Energy X 64 Solid Angle X 8 Mass Bins Data Collection","10.17189/1517754","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 64 Solid Angle X 2 Mass Bins Data Collection","10.17189/1517755","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Raw Event Data Data Collection","10.17189/1517756","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Fast Housekeeping Data Collection","10.17189/1517757","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Event Rate Data: 12 Rate Channels Summed Over a Single Spin Data Collection","10.17189/1517758","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Event Rate Data: 12 Rate Channels Summed Over Multiple Spins Data Collection","10.17189/1517759","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Event Rate Data Selected Channel Data Collection","10.17189/1517760","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Raw Time-of-Flight Data Data Collection","10.17189/1517761","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN Solar Wind Electron Analyzer (SWEA) Calibrated Data Bundle","10.17189/1517762","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","David","Mitchell","","","","","","" -"NASA-PDS","MAVEN Solar Wind Electron Analyzer (SWEA) Archive Rate 3D Electron Distributions Data Collection","10.17189/1517763","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","David","Mitchell","","","","","","" -"NASA-PDS","MAVEN Solar Wind Electron Analyzer (SWEA) Archive Rate Electron Pitch Angle Distributions Data Collection","10.17189/1517764","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","David","Mitchell","","","","","","" -"NASA-PDS","MAVEN Solar Wind Electron Analyzer (SWEA) Survey Rate 3D Electron Distributions Data Collection","10.17189/1517765","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","David","Mitchell","","","","","","" -"NASA-PDS","MAVEN Solar Wind Electron Analyzer (SWEA) Survey Rate Electron Pitch Angle Distributions Data Collection","10.17189/1517766","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","David","Mitchell","","","","","","" -"NASA-PDS","MAVEN Solar Wind Electron Analyzer (SWEA) Survey Rate Omni-Directional Electron Energy Spectra Data Collection","10.17189/1517767","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","David","Mitchell","","","","","","" -"NASA-PDS","MAVEN Solar Wind Ion Analyzer (SWIA) Calibrated Data Bundle","10.17189/1517768","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Jasper","Halekas","","","","","","" -"NASA-PDS","MAVEN Solar Wind Ion Analyzer (SWIA) Calibrated Coarse Archive 3D Data Collection","10.17189/1517769","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Jasper","Halekas","","","","","","" -"NASA-PDS","MAVEN Solar Wind Ion Analyzer (SWIA) Calibrated Coarse Survey 3D Data Collection","10.17189/1517770","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Jasper","Halekas","","","","","","" -"NASA-PDS","MAVEN Solar Wind Ion Analyzer (SWIA) Calibrated Fine Archive 3D Data Collection","10.17189/1517771","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Jasper","Halekas","","","","","","" -"NASA-PDS","MAVEN Solar Wind Ion Analyzer (SWIA) Calibrated Fine Survey 3D Data Collection","10.17189/1517772","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Jasper","Halekas","","","","","","" -"NASA-PDS","MAVEN Solar Wind Ion Analyzer (SWIA) Calibrated Onboard Survey Moment Data Collection","10.17189/1517773","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Jasper","Halekas","","","","","","" diff --git a/input/bundle_in.xml b/input/bundle_in.xml deleted file mode 100644 index bd1aab96..00000000 --- a/input/bundle_in.xml +++ /dev/null @@ -1,117 +0,0 @@ -> - -urn:nasa:pds:insight_cameras -1.0 -InSight Cameras Bundle -1.11.1.0 -Product_Bundle - -R. Deen, H. Abarca, P. Zamani, J.Maki -2019 - -InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products - - - - -Observational Intent - -2019-10-02T04:36:06.728Z -2020-01-01T14:57:01.214Z - - -Science -Raw - -Visible -Surface -Imaging - - - -Insight -Mission - -urn:nasa:pds:context:investigation:mission.insight -bundle_to_investigation - - - - -Insight Lander -Spacecraft - - -urn:nasa:pds:context:instrument_host:spacecraft.insight - -is_instrument_host -Reference to the Insight spacecraft. - - - -Insight Context Camera -Instrument - -urn:nasa:pds:context:instrument:icc.insight -is_instrument - -Reference to the InSight Context Camera instrument onboard the InSight spacecraft. - - - - -Insight Deployment Camera -Instrument - -urn:nasa:pds:context:instrument:idc.insight -is_instrument - -Reference to the InSight Deployment Camera instrument onboard the InsSight spacecraft. - - - - - -Mars -Planet - -urn:nasa:pds:context:target:planet.mars -document_to_target -Reference to the Planet - Mars target - - - - -Archive -This Bundle contains InSight camera data. - - -urn:nasa:pds:insight_cameras:browse -Primary -bundle_has_browse_collection - - -urn:nasa:pds:insight_cameras:calibration -Primary -bundle_has_calibration_collection - - -urn:nasa:pds:insight_cameras:data -Primary -bundle_has_data_collection - - - - -urn:nasa:pds:insight_cameras:miscellaneous -Primary -bundle_has_document_collection - - -urn:nasa:pds:insight_cameras:xml_schema -Primary -bundle_has_schema_collection - - diff --git a/input/bundle_in_original.xml b/input/bundle_in_original.xml deleted file mode 100644 index c2b3201d..00000000 --- a/input/bundle_in_original.xml +++ /dev/null @@ -1,120 +0,0 @@ - -> - -urn:nasa:pds:insight_cameras -1.0 -InSight Cameras Bundle -1.11.1.0 -Product_Bundle - -R., Deen; H., Abarca; P., Zamani; J.Maki -2019 - -InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products - - - - -Observational Intent - -2019-10-02T04:36:06.728Z -2020-01-01T14:57:01.214Z - - -Science -Raw - -Visible -Surface -Imaging - - - -Insight -Mission - -urn:nasa:pds:context:investigation:mission.insight -bundle_to_investigation - - - - -Insight Lander -Spacecraft - - -urn:nasa:pds:context:instrument_host:spacecraft.insight - -is_instrument_host -Reference to the Insight spacecraft. - - - -Insight Context Camera -Instrument - -urn:nasa:pds:context:instrument:icc.insight -is_instrument - -Reference to the InSight Context Camera instrument onboard the InSight spacecraft. - - - - -Insight Deployment Camera -Instrument - -urn:nasa:pds:context:instrument:idc.insight -is_instrument - -Reference to the InSight Deployment Camera instrument onboard the InsSight spacecraft. - - - - - -Mars -Planet - -urn:nasa:pds:context:target:planet.mars -document_to_target -Reference to the Planet - Mars target - - - - -Archive -This Bundle contains InSight camera data. - - -urn:nasa:pds:insight_cameras:browse -Primary -bundle_has_browse_collection - - -urn:nasa:pds:insight_cameras:calibration -Primary -bundle_has_calibration_collection - - -urn:nasa:pds:insight_cameras:data -Primary -bundle_has_data_collection - - - - -urn:nasa:pds:insight_cameras:miscellaneous -Primary -bundle_has_document_collection - - -urn:nasa:pds:insight_cameras:xml_schema -Primary -bundle_has_schema_collection - - diff --git a/input/bundle_in_with_contributors.xml b/input/bundle_in_with_contributors.xml deleted file mode 100644 index 6aa7a7de..00000000 --- a/input/bundle_in_with_contributors.xml +++ /dev/null @@ -1,124 +0,0 @@ - - -urn:nasa:pds:insight_cameras -1.0 -InSight Cameras Bundle -1.11.1.0 -Product_Bundle - -R. Deen, H. Abarca, P. Zamani, J.Maki - - - -Smith, P. H.; Lemmon, M.; Beebe, R. F. - - - -2019 - -InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products - - - - -Observational Intent - -2019-10-02T04:36:06.728Z -2020-01-01T14:57:01.214Z - - -Science -Raw - -Visible -Surface -Imaging - - - -Insight -Mission - -urn:nasa:pds:context:investigation:mission.insight -bundle_to_investigation - - - - -Insight Lander -Spacecraft - - -urn:nasa:pds:context:instrument_host:spacecraft.insight - -is_instrument_host -Reference to the Insight spacecraft. - - - -Insight Context Camera -Instrument - -urn:nasa:pds:context:instrument:icc.insight -is_instrument - -Reference to the InSight Context Camera instrument onboard the InSight spacecraft. - - - - -Insight Deployment Camera -Instrument - -urn:nasa:pds:context:instrument:idc.insight -is_instrument - -Reference to the InSight Deployment Camera instrument onboard the InsSight spacecraft. - - - - - -Mars -Planet - -urn:nasa:pds:context:target:planet.mars -document_to_target -Reference to the Planet - Mars target - - - - -Archive -This Bundle contains InSight camera data. - - -urn:nasa:pds:insight_cameras:browse -Primary -bundle_has_browse_collection - - -urn:nasa:pds:insight_cameras:calibration -Primary -bundle_has_calibration_collection - - -urn:nasa:pds:insight_cameras:data -Primary -bundle_has_data_collection - - - - -urn:nasa:pds:insight_cameras:miscellaneous -Primary -bundle_has_document_collection - - -urn:nasa:pds:insight_cameras:xml_schema -Primary -bundle_has_schema_collection - - diff --git a/input/draft_dir_one_file/bundle_in_with_contributors.xml b/input/draft_dir_one_file/bundle_in_with_contributors.xml deleted file mode 100644 index 6aa7a7de..00000000 --- a/input/draft_dir_one_file/bundle_in_with_contributors.xml +++ /dev/null @@ -1,124 +0,0 @@ - - -urn:nasa:pds:insight_cameras -1.0 -InSight Cameras Bundle -1.11.1.0 -Product_Bundle - -R. Deen, H. Abarca, P. Zamani, J.Maki - - - -Smith, P. H.; Lemmon, M.; Beebe, R. F. - - - -2019 - -InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products - - - - -Observational Intent - -2019-10-02T04:36:06.728Z -2020-01-01T14:57:01.214Z - - -Science -Raw - -Visible -Surface -Imaging - - - -Insight -Mission - -urn:nasa:pds:context:investigation:mission.insight -bundle_to_investigation - - - - -Insight Lander -Spacecraft - - -urn:nasa:pds:context:instrument_host:spacecraft.insight - -is_instrument_host -Reference to the Insight spacecraft. - - - -Insight Context Camera -Instrument - -urn:nasa:pds:context:instrument:icc.insight -is_instrument - -Reference to the InSight Context Camera instrument onboard the InSight spacecraft. - - - - -Insight Deployment Camera -Instrument - -urn:nasa:pds:context:instrument:idc.insight -is_instrument - -Reference to the InSight Deployment Camera instrument onboard the InsSight spacecraft. - - - - - -Mars -Planet - -urn:nasa:pds:context:target:planet.mars -document_to_target -Reference to the Planet - Mars target - - - - -Archive -This Bundle contains InSight camera data. - - -urn:nasa:pds:insight_cameras:browse -Primary -bundle_has_browse_collection - - -urn:nasa:pds:insight_cameras:calibration -Primary -bundle_has_calibration_collection - - -urn:nasa:pds:insight_cameras:data -Primary -bundle_has_data_collection - - - - -urn:nasa:pds:insight_cameras:miscellaneous -Primary -bundle_has_document_collection - - -urn:nasa:pds:insight_cameras:xml_schema -Primary -bundle_has_schema_collection - - diff --git a/input/draft_dir_two_files/bundle_in.xml b/input/draft_dir_two_files/bundle_in.xml deleted file mode 100644 index 5f092b46..00000000 --- a/input/draft_dir_two_files/bundle_in.xml +++ /dev/null @@ -1,117 +0,0 @@ -> - -urn:nasa:pds:insight_cameras -1.1 -InSight Cameras Bundle 1.1 -1.11.1.0 -Product_Bundle - -R. Deen, H. Abarca, P. Zamani, J.Maki -2019 - -InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products - - - - -Observational Intent - -2019-10-02T04:36:06.728Z -2020-01-01T14:57:01.214Z - - -Science -Raw - -Visible -Surface -Imaging - - - -Insight -Mission - -urn:nasa:pds:context:investigation:mission.insight -bundle_to_investigation - - - - -Insight Lander -Spacecraft - - -urn:nasa:pds:context:instrument_host:spacecraft.insight - -is_instrument_host -Reference to the Insight spacecraft. - - - -Insight Context Camera -Instrument - -urn:nasa:pds:context:instrument:icc.insight -is_instrument - -Reference to the InSight Context Camera instrument onboard the InSight spacecraft. - - - - -Insight Deployment Camera -Instrument - -urn:nasa:pds:context:instrument:idc.insight -is_instrument - -Reference to the InSight Deployment Camera instrument onboard the InsSight spacecraft. - - - - - -Mars -Planet - -urn:nasa:pds:context:target:planet.mars -document_to_target -Reference to the Planet - Mars target - - - - -Archive -This Bundle contains InSight camera data. - - -urn:nasa:pds:insight_cameras:browse -Primary -bundle_has_browse_collection - - -urn:nasa:pds:insight_cameras:calibration -Primary -bundle_has_calibration_collection - - -urn:nasa:pds:insight_cameras:data -Primary -bundle_has_data_collection - - - - -urn:nasa:pds:insight_cameras:miscellaneous -Primary -bundle_has_document_collection - - -urn:nasa:pds:insight_cameras:xml_schema -Primary -bundle_has_schema_collection - - diff --git a/input/draft_dir_two_files/bundle_in_with_contributors.xml b/input/draft_dir_two_files/bundle_in_with_contributors.xml deleted file mode 100644 index 8125e1e7..00000000 --- a/input/draft_dir_two_files/bundle_in_with_contributors.xml +++ /dev/null @@ -1,124 +0,0 @@ - - -urn:nasa:pds:insight_cameras -1.0 -InSight Cameras Bundle 1.0 -1.11.1.0 -Product_Bundle - -R. Deen, H. Abarca, P. Zamani, J.Maki - - - -Smith, P. H.; Lemmon, M.; Beebe, R. F. - - - -2019 - -InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products - - - - -Observational Intent - -2019-10-02T04:36:06.728Z -2020-01-01T14:57:01.214Z - - -Science -Raw - -Visible -Surface -Imaging - - - -Insight -Mission - -urn:nasa:pds:context:investigation:mission.insight -bundle_to_investigation - - - - -Insight Lander -Spacecraft - - -urn:nasa:pds:context:instrument_host:spacecraft.insight - -is_instrument_host -Reference to the Insight spacecraft. - - - -Insight Context Camera -Instrument - -urn:nasa:pds:context:instrument:icc.insight -is_instrument - -Reference to the InSight Context Camera instrument onboard the InSight spacecraft. - - - - -Insight Deployment Camera -Instrument - -urn:nasa:pds:context:instrument:idc.insight -is_instrument - -Reference to the InSight Deployment Camera instrument onboard the InsSight spacecraft. - - - - - -Mars -Planet - -urn:nasa:pds:context:target:planet.mars -document_to_target -Reference to the Planet - Mars target - - - - -Archive -This Bundle contains InSight camera data. - - -urn:nasa:pds:insight_cameras:browse -Primary -bundle_has_browse_collection - - -urn:nasa:pds:insight_cameras:calibration -Primary -bundle_has_calibration_collection - - -urn:nasa:pds:insight_cameras:data -Primary -bundle_has_data_collection - - - - -urn:nasa:pds:insight_cameras:miscellaneous -Primary -bundle_has_document_collection - - -urn:nasa:pds:insight_cameras:xml_schema -Primary -bundle_has_schema_collection - - diff --git a/input/draft_dir_zero_file/some.csv b/input/draft_dir_zero_file/some.csv deleted file mode 100644 index e69de29b..00000000 diff --git a/src/pds_doi_service/core/actions/test/check_test.py b/src/pds_doi_service/core/actions/test/check_test.py index 754c8a71..aebdb867 100644 --- a/src/pds_doi_service/core/actions/test/check_test.py +++ b/src/pds_doi_service/core/actions/test/check_test.py @@ -29,7 +29,7 @@ class CheckActionTestCase(unittest.TestCase): test_dir = resource_filename(__name__, "") - input_dir = abspath(join(test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + input_dir = abspath(join(test_dir, "data")) @classmethod def setUp(cls): @@ -88,9 +88,9 @@ def webclient_query_patch_nominal( # Read an output label that corresponds to the DOI we're # checking for, and that has a status of 'registered' or 'findable' if DOIServiceFactory.get_service_type() == SERVICE_TYPE_OSTI: - label = join(CheckActionTestCase.input_dir, "DOI_Release_20200727_from_register.xml") + label = join(CheckActionTestCase.input_dir, "osti_record_registered.xml") else: - label = join(CheckActionTestCase.input_dir, "DOI_Release_20210615_from_release.json") + label = join(CheckActionTestCase.input_dir, "datacite_record_findable.json") with open(label, "r") as infile: label_contents = infile.read() @@ -109,7 +109,7 @@ def webclient_query_patch_error(self, query, url=None, username=None, password=N """ # Read an output label that corresponds to the DOI we're # checking for, and that has a status of 'error' - with open(join(CheckActionTestCase.input_dir, "DOI_Release_20200727_from_error.xml"), "r") as infile: + with open(join(CheckActionTestCase.input_dir, "osti_record_error.xml"), "r") as infile: xml_contents = infile.read() return xml_contents @@ -127,7 +127,7 @@ def webclient_query_patch_no_change( """ # Read an output label that corresponds to the DOI we're # checking for, and that has a status of 'pending' - with open(join(CheckActionTestCase.input_dir, "DOI_Release_20200727_from_release.xml"), "r") as infile: + with open(join(CheckActionTestCase.input_dir, "osti_record_pending.xml"), "r") as infile: xml_contents = infile.read() return xml_contents diff --git a/input/DOI_Release_20210615_from_release.json b/src/pds_doi_service/core/actions/test/data/datacite_record_findable.json similarity index 100% rename from input/DOI_Release_20210615_from_release.json rename to src/pds_doi_service/core/actions/test/data/datacite_record_findable.json diff --git a/src/pds_doi_service/core/actions/test/data/input_dir_one_file/pds4_bundle_with_contributors.xml b/src/pds_doi_service/core/actions/test/data/input_dir_one_file/pds4_bundle_with_contributors.xml new file mode 120000 index 00000000..da003cdf --- /dev/null +++ b/src/pds_doi_service/core/actions/test/data/input_dir_one_file/pds4_bundle_with_contributors.xml @@ -0,0 +1 @@ +../pds4_bundle_with_contributors.xml \ No newline at end of file diff --git a/src/pds_doi_service/core/actions/test/data/input_dir_two_files/pds4_bundle.xml b/src/pds_doi_service/core/actions/test/data/input_dir_two_files/pds4_bundle.xml new file mode 120000 index 00000000..fe323bd0 --- /dev/null +++ b/src/pds_doi_service/core/actions/test/data/input_dir_two_files/pds4_bundle.xml @@ -0,0 +1 @@ +../pds4_bundle.xml \ No newline at end of file diff --git a/src/pds_doi_service/core/actions/test/data/input_dir_two_files/pds4_bundle_with_contributors.xml b/src/pds_doi_service/core/actions/test/data/input_dir_two_files/pds4_bundle_with_contributors.xml new file mode 120000 index 00000000..da003cdf --- /dev/null +++ b/src/pds_doi_service/core/actions/test/data/input_dir_two_files/pds4_bundle_with_contributors.xml @@ -0,0 +1 @@ +../pds4_bundle_with_contributors.xml \ No newline at end of file diff --git a/input/DOI_Release_20200727_from_error.xml b/src/pds_doi_service/core/actions/test/data/osti_record_error.xml similarity index 100% rename from input/DOI_Release_20200727_from_error.xml rename to src/pds_doi_service/core/actions/test/data/osti_record_error.xml diff --git a/input/DOI_Release_20200727_from_release.xml b/src/pds_doi_service/core/actions/test/data/osti_record_pending.xml similarity index 100% rename from input/DOI_Release_20200727_from_release.xml rename to src/pds_doi_service/core/actions/test/data/osti_record_pending.xml diff --git a/input/DOI_Release_20200727_from_register.xml b/src/pds_doi_service/core/actions/test/data/osti_record_registered.xml similarity index 100% rename from input/DOI_Release_20200727_from_register.xml rename to src/pds_doi_service/core/actions/test/data/osti_record_registered.xml diff --git a/input/DOI_Release_20200727_from_reserve.xml b/src/pds_doi_service/core/actions/test/data/osti_record_reserved.xml similarity index 100% rename from input/DOI_Release_20200727_from_reserve.xml rename to src/pds_doi_service/core/actions/test/data/osti_record_reserved.xml diff --git a/input/DOI_Release_20200727_from_review.xml b/src/pds_doi_service/core/actions/test/data/osti_record_review.xml similarity index 100% rename from input/DOI_Release_20200727_from_review.xml rename to src/pds_doi_service/core/actions/test/data/osti_record_review.xml diff --git a/src/pds_doi_service/core/actions/test/data/pds4_bundle.xml b/src/pds_doi_service/core/actions/test/data/pds4_bundle.xml new file mode 100644 index 00000000..0106a65c --- /dev/null +++ b/src/pds_doi_service/core/actions/test/data/pds4_bundle.xml @@ -0,0 +1,117 @@ + + + urn:nasa:pds:insight_cameras + 1.1 + InSight Cameras Bundle 1.1 + 1.11.1.0 + Product_Bundle + + R. Deen, H. Abarca, P. Zamani, J.Maki + 2019 + + InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products + + + + + Observational Intent + + 2019-10-02T04:36:06.728Z + 2020-01-01T14:57:01.214Z + + + Science + Raw + + Visible + Surface + Imaging + + + + Insight + Mission + + urn:nasa:pds:context:investigation:mission.insight + bundle_to_investigation + + + + + Insight Lander + Spacecraft + + + urn:nasa:pds:context:instrument_host:spacecraft.insight + + is_instrument_host + Reference to the Insight spacecraft. + + + + Insight Context Camera + Instrument + + urn:nasa:pds:context:instrument:icc.insight + is_instrument + + Reference to the InSight Context Camera instrument onboard the InSight spacecraft. + + + + + Insight Deployment Camera + Instrument + + urn:nasa:pds:context:instrument:idc.insight + is_instrument + + Reference to the InSight Deployment Camera instrument onboard the InsSight spacecraft. + + + + + + Mars + Planet + + urn:nasa:pds:context:target:planet.mars + document_to_target + Reference to the Planet - Mars target + + + + + Archive + This Bundle contains InSight camera data. + + + urn:nasa:pds:insight_cameras:browse + Primary + bundle_has_browse_collection + + + urn:nasa:pds:insight_cameras:calibration + Primary + bundle_has_calibration_collection + + + urn:nasa:pds:insight_cameras:data + Primary + bundle_has_data_collection + + + + + urn:nasa:pds:insight_cameras:miscellaneous + Primary + bundle_has_document_collection + + + urn:nasa:pds:insight_cameras:xml_schema + Primary + bundle_has_schema_collection + + diff --git a/src/pds_doi_service/core/actions/test/data/pds4_bundle_with_contributors.xml b/src/pds_doi_service/core/actions/test/data/pds4_bundle_with_contributors.xml new file mode 100644 index 00000000..10a6c3b1 --- /dev/null +++ b/src/pds_doi_service/core/actions/test/data/pds4_bundle_with_contributors.xml @@ -0,0 +1,118 @@ + + + urn:nasa:pds:insight_cameras + 1.0 + InSight Cameras Bundle + 1.11.1.0 + Product_Bundle + + R. Deen, H. Abarca, P. Zamani, J.Maki + Smith, P. H.; Lemmon, M.; Beebe, R. F. + 2019 + + InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products + + + + + Observational Intent + + 2019-10-02T04:36:06.728Z + 2020-01-01T14:57:01.214Z + + + Science + Raw + + Visible + Surface + Imaging + + + + Insight + Mission + + urn:nasa:pds:context:investigation:mission.insight + bundle_to_investigation + + + + + Insight Lander + Spacecraft + + + urn:nasa:pds:context:instrument_host:spacecraft.insight + + is_instrument_host + Reference to the Insight spacecraft. + + + + Insight Context Camera + Instrument + + urn:nasa:pds:context:instrument:icc.insight + is_instrument + + Reference to the InSight Context Camera instrument onboard the InSight spacecraft. + + + + + Insight Deployment Camera + Instrument + + urn:nasa:pds:context:instrument:idc.insight + is_instrument + + Reference to the InSight Deployment Camera instrument onboard the InsSight spacecraft. + + + + + + Mars + Planet + + urn:nasa:pds:context:target:planet.mars + document_to_target + Reference to the Planet - Mars target + + + + + Archive + This Bundle contains InSight camera data. + + + urn:nasa:pds:insight_cameras:browse + Primary + bundle_has_browse_collection + + + urn:nasa:pds:insight_cameras:calibration + Primary + bundle_has_calibration_collection + + + urn:nasa:pds:insight_cameras:data + Primary + bundle_has_data_collection + + + + + urn:nasa:pds:insight_cameras:miscellaneous + Primary + bundle_has_document_collection + + + urn:nasa:pds:insight_cameras:xml_schema + Primary + bundle_has_schema_collection + + diff --git a/input/bundle_in_with_doi_and_contributors.xml b/src/pds_doi_service/core/actions/test/data/pds4_bundle_with_doi_and_contributors.xml similarity index 100% rename from input/bundle_in_with_doi_and_contributors.xml rename to src/pds_doi_service/core/actions/test/data/pds4_bundle_with_doi_and_contributors.xml diff --git a/input/DOI_Reserved_PDS3.csv b/src/pds_doi_service/core/actions/test/data/spreadsheet_with_pds3_identifiers.csv similarity index 100% rename from input/DOI_Reserved_PDS3.csv rename to src/pds_doi_service/core/actions/test/data/spreadsheet_with_pds3_identifiers.csv diff --git a/input/DOI_Reserved_GEO_200318.csv b/src/pds_doi_service/core/actions/test/data/spreadsheet_with_pds4_identifiers.csv similarity index 100% rename from input/DOI_Reserved_GEO_200318.csv rename to src/pds_doi_service/core/actions/test/data/spreadsheet_with_pds4_identifiers.csv diff --git a/input/DOI_Reserved_GEO_200318_with_corrected_identifier.xlsx b/src/pds_doi_service/core/actions/test/data/spreadsheet_with_pds4_identifiers.xlsx similarity index 100% rename from input/DOI_Reserved_GEO_200318_with_corrected_identifier.xlsx rename to src/pds_doi_service/core/actions/test/data/spreadsheet_with_pds4_identifiers.xlsx diff --git a/src/pds_doi_service/core/actions/test/list_test.py b/src/pds_doi_service/core/actions/test/list_test.py index d437b2e5..bccf2908 100644 --- a/src/pds_doi_service/core/actions/test/list_test.py +++ b/src/pds_doi_service/core/actions/test/list_test.py @@ -34,7 +34,7 @@ class ListActionTestCase(unittest.TestCase): @classmethod def setUpClass(cls): cls.test_dir = resource_filename(__name__, "") - cls.input_dir = abspath(join(cls.test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + cls.input_dir = abspath(join(cls.test_dir, "data")) cls.db_name = join(cls.test_dir, "doi_temp.db") cls._list_action = DOICoreActionList(db_name=cls.db_name) cls._reserve_action = DOICoreActionReserve(db_name=cls.db_name) @@ -93,7 +93,7 @@ def test_list_by_status(self): """Test listing of entries, querying by workflow status""" # Submit a reserve, then query by draft status to retrieve reserve_kwargs = { - "input": join(self.input_dir, "bundle_in_with_contributors.xml"), + "input": join(self.input_dir, "pds4_bundle_with_contributors.xml"), "node": "img", "submitter": "my_user@my_node.gov", "force": True, @@ -186,7 +186,7 @@ def test_get_transaction_for_doi(self): """Test the transaction_for_doi method""" # Submit a reserve, then use the assigned doi to get the transaction record reserve_kwargs = { - "input": join(self.input_dir, "bundle_in_with_contributors.xml"), + "input": join(self.input_dir, "pds4_bundle_with_contributors.xml"), "node": "img", "submitter": "my_user@my_node.gov", "force": True, @@ -223,7 +223,7 @@ def test_get_transaction_for_identifier(self): """Test the transaction_for_identifier method""" # Submit a reserve, then use the PDS identifier to get the transaction record reserve_kwargs = { - "input": join(self.input_dir, "bundle_in_with_contributors.xml"), + "input": join(self.input_dir, "pds4_bundle_with_contributors.xml"), "node": "img", "submitter": "my_user@my_node.gov", "force": True, @@ -260,7 +260,7 @@ def test_get_output_label_for_transaction(self): """Test the output_label_for_transaction method""" # Submit a reserve, then use the PDS identifier to get the transaction record reserve_kwargs = { - "input": join(self.input_dir, "bundle_in_with_contributors.xml"), + "input": join(self.input_dir, "pds4_bundle_with_contributors.xml"), "node": "img", "submitter": "my_user@my_node.gov", "force": True, diff --git a/src/pds_doi_service/core/actions/test/release_test.py b/src/pds_doi_service/core/actions/test/release_test.py index 5f9d7637..0a607405 100644 --- a/src/pds_doi_service/core/actions/test/release_test.py +++ b/src/pds_doi_service/core/actions/test/release_test.py @@ -26,7 +26,7 @@ class ReleaseActionTestCase(unittest.TestCase): @classmethod def setUpClass(cls): cls.test_dir = resource_filename(__name__, "") - cls.input_dir = abspath(join(cls.test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + cls.input_dir = abspath(join(cls.test_dir, "data")) # Remove db_name if exist to have a fresh start otherwise exception will be # raised about using existing lidvid. @@ -119,7 +119,7 @@ def test_reserve_release_to_review(self): """Test release to review status with a reserved DOI entry""" release_args = { - "input": join(self.input_dir, "DOI_Release_20200727_from_reserve.xml"), + "input": join(self.input_dir, "osti_record_reserved.xml"), "node": "img", "submitter": "img-submitter@jpl.nasa.gov", "force": True, @@ -140,7 +140,7 @@ def test_reserve_release_to_provider(self): """Test release directly to the service provider with a reserved DOI entry""" release_args = { - "input": join(self.input_dir, "DOI_Release_20200727_from_reserve.xml"), + "input": join(self.input_dir, "osti_record_reserved.xml"), "node": "img", "submitter": "img-submitter@jpl.nasa.gov", "force": True, @@ -153,7 +153,7 @@ def test_unreserved_release_to_review(self): """Test release to review status using a record that has not been reserved (no DOI assigned)""" release_args = { - "input": join(self.input_dir, "bundle_in_with_contributors.xml"), + "input": join(self.input_dir, "pds4_bundle_with_contributors.xml"), "node": "img", "submitter": "img-submitter@jpl.nasa.gov", "force": True, @@ -178,7 +178,7 @@ def test_unreserved_release_to_provider(self): """Test release directly to the service provider using a record that has not been reserved (no DOI assigned)""" release_args = { - "input": join(self.input_dir, "bundle_in_with_contributors.xml"), + "input": join(self.input_dir, "pds4_bundle_with_contributors.xml"), "node": "img", "submitter": "img-submitter@jpl.nasa.gov", "force": True, @@ -198,7 +198,7 @@ def test_review_release_to_review(self): """ release_args = { - "input": join(self.input_dir, "DOI_Release_20200727_from_review.xml"), + "input": join(self.input_dir, "osti_record_review.xml"), "node": "img", "submitter": "img-submitter@jpl.nasa.gov", "force": True, @@ -219,7 +219,7 @@ def test_review_release_to_osti(self): """Test release directly to the service provider with a review DOI entry""" release_args = { - "input": join(self.input_dir, "DOI_Release_20200727_from_review.xml"), + "input": join(self.input_dir, "osti_record_review.xml"), "node": "img", "submitter": "img-submitter@jpl.nasa.gov", "force": True, diff --git a/src/pds_doi_service/core/actions/test/reserve_test.py b/src/pds_doi_service/core/actions/test/reserve_test.py index 60ea9191..d54b17db 100644 --- a/src/pds_doi_service/core/actions/test/reserve_test.py +++ b/src/pds_doi_service/core/actions/test/reserve_test.py @@ -27,7 +27,7 @@ class ReserveActionTestCase(unittest.TestCase): @classmethod def setUpClass(cls): cls.test_dir = resource_filename(__name__, "") - cls.input_dir = abspath(join(cls.test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + cls.input_dir = abspath(join(cls.test_dir, "data")) # Remove db_name if exist to have a fresh start otherwise exception will be # raised about using existing lidvid. @@ -125,7 +125,7 @@ def test_reserve_xlsx_and_submit(self): result to the service provider. """ reserve_args = { - "input": join(self.input_dir, "DOI_Reserved_GEO_200318_with_corrected_identifier.xlsx"), + "input": join(self.input_dir, "spreadsheet_with_pds4_identifiers.xlsx"), "node": "img", "submitter": "my_user@my_node.gov", "force": True, @@ -147,7 +147,7 @@ def test_reserve_csv_and_submit(self): service provider. """ reserve_args = { - "input": join(self.input_dir, "DOI_Reserved_GEO_200318.csv"), + "input": join(self.input_dir, "spreadsheet_with_pds4_identifiers.csv"), "node": "img", "submitter": "my_user@my_node.gov", "force": True, @@ -168,7 +168,7 @@ def test_reserve_pds4_label_and_submit(self): Test Reserve action with a local PDS4 XML file, submitting the result to the service provider. """ - input_file = join(self.input_dir, "bundle_in_with_contributors.xml") + input_file = join(self.input_dir, "pds4_bundle_with_contributors.xml") reserve_args = { "input": input_file, @@ -189,7 +189,7 @@ def test_reserve_pds4_label_and_submit(self): ) def test_reserve_local_dir_one_file(self): """Test reserve request with local dir containing one file""" - input_dir = join(self.input_dir, "draft_dir_one_file") + input_dir = join(self.input_dir, "input_dir_one_file") reserve_args = { "input": input_dir, @@ -221,7 +221,7 @@ def test_reserve_local_dir_one_file(self): ) def test_reserve_local_dir_two_files(self): """Test reserve request with local dir containing two files""" - input_dir = join(self.input_dir, "draft_dir_two_files") + input_dir = join(self.input_dir, "input_dir_two_files") reserve_args = { "input": input_dir, @@ -240,9 +240,9 @@ def test_reserve_local_dir_two_files(self): self.assertIsInstance(doi.date_record_added, datetime) self.assertTrue(all(keyword in doi.keywords for keyword in get_global_keywords())) self.assertTrue(doi.pds_identifier.startswith("urn:nasa:pds:insight_cameras::1")) - self.assertTrue(doi.title.startswith("InSight Cameras Bundle 1.")) + self.assertTrue(doi.title.startswith("InSight Cameras Bundle")) - # Make sure for the "bundle_in_with_contributors.xml" file, we + # Make sure for the "pds4_bundle_with_contributors.xml" file, we # parsed the editors if doi.pds_identifier == "urn:nasa:pds:insight_cameras::1.0": self.assertEqual(len(doi.editors), 3) diff --git a/src/pds_doi_service/core/actions/test/update_test.py b/src/pds_doi_service/core/actions/test/update_test.py index 964492db..39526ecb 100644 --- a/src/pds_doi_service/core/actions/test/update_test.py +++ b/src/pds_doi_service/core/actions/test/update_test.py @@ -32,7 +32,7 @@ class UpdateActionTestCase(unittest.TestCase): @classmethod def setUpClass(cls) -> None: cls.test_dir = resource_filename(__name__, "") - cls.input_dir = abspath(join(cls.test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + cls.input_dir = abspath(join(cls.test_dir, "data")) cls.db_name = join(cls.test_dir, "doi_temp.db") cls._update_action = DOICoreActionUpdate(db_name=cls.db_name) cls._reserve_action = DOICoreActionReserve(db_name=cls.db_name) @@ -104,7 +104,7 @@ def test_update_reserved_doi(self): # Submit a reserve request to get an entry w/ DOI to update kwargs = { - "input": join(self.input_dir, "bundle_in_with_contributors.xml"), + "input": join(self.input_dir, "pds4_bundle_with_contributors.xml"), "node": "img", "submitter": "my_user@my_node.gov", "force": True, @@ -176,7 +176,7 @@ def test_update_reserved_doi(self): def test_update_reserved_doi_with_spreadsheet(self): """Test an update of identifier fields on records via spreadsheet submission""" # Submit a reserve request to get an entry w/ DOI to update - input_csv = join(self.input_dir, "DOI_Reserved_GEO_200318.csv") + input_csv = join(self.input_dir, "spreadsheet_with_pds4_identifiers.csv") kwargs = { "input": input_csv, @@ -248,7 +248,7 @@ def test_update_released_doi(self): """Test an update of identifier fields on a previously released record""" # Submit a release request to get an entry w/ DOI to update kwargs = { - "input": join(self.input_dir, "bundle_in_with_doi_and_contributors.xml"), + "input": join(self.input_dir, "pds4_bundle_with_doi_and_contributors.xml"), "node": "img", "submitter": "my_user@my_node.gov", "force": True, @@ -328,7 +328,7 @@ def test_invalid_update_requests(self): # Attempting to update a record with no DOI assigned should result in an exception update_kwargs = { - "input": join(self.input_dir, "bundle_in_with_contributors.xml"), + "input": join(self.input_dir, "pds4_bundle_with_contributors.xml"), "node": "img", "submitter": "my_user@my_node.gov", "force": True, @@ -338,7 +338,7 @@ def test_invalid_update_requests(self): self._update_action.run(**update_kwargs) # This should go for spreadsheet submissions as well - update_kwargs["input"] = join(self.input_dir, "DOI_Reserved_PDS3.csv") + update_kwargs["input"] = join(self.input_dir, "spreadsheet_with_pds3_identifiers.csv") with self.assertRaises(CriticalDOIException): self._update_action.run(**update_kwargs) diff --git a/input/DOI_Release_20210615_from_reserve.json b/src/pds_doi_service/core/input/test/data/datacite_record_draft.json similarity index 100% rename from input/DOI_Release_20210615_from_reserve.json rename to src/pds_doi_service/core/input/test/data/datacite_record_draft.json diff --git a/input/tc-4_reserve_RADARGRAM_v2.0_utf-8-bom.json b/src/pds_doi_service/core/input/test/data/datacite_record_draft_with_utf-8-bom.json similarity index 100% rename from input/tc-4_reserve_RADARGRAM_v2.0_utf-8-bom.json rename to src/pds_doi_service/core/input/test/data/datacite_record_draft_with_utf-8-bom.json diff --git a/src/pds_doi_service/core/input/test/data/input_dir_two_files/pds4_bundle.xml b/src/pds_doi_service/core/input/test/data/input_dir_two_files/pds4_bundle.xml new file mode 120000 index 00000000..3eab21e5 --- /dev/null +++ b/src/pds_doi_service/core/input/test/data/input_dir_two_files/pds4_bundle.xml @@ -0,0 +1 @@ +../../../../actions/test/data/pds4_bundle.xml \ No newline at end of file diff --git a/src/pds_doi_service/core/input/test/data/input_dir_two_files/pds4_bundle_with_contributors.xml b/src/pds_doi_service/core/input/test/data/input_dir_two_files/pds4_bundle_with_contributors.xml new file mode 120000 index 00000000..f9f913bd --- /dev/null +++ b/src/pds_doi_service/core/input/test/data/input_dir_two_files/pds4_bundle_with_contributors.xml @@ -0,0 +1 @@ +../../../../actions/test/data/pds4_bundle_with_contributors.xml \ No newline at end of file diff --git a/input/DOI_Release_PDS3.xml b/src/pds_doi_service/core/input/test/data/osti_record_registered_with_pds3_identifier.xml similarity index 100% rename from input/DOI_Release_PDS3.xml rename to src/pds_doi_service/core/input/test/data/osti_record_registered_with_pds3_identifier.xml diff --git a/input/DOI_Release_20210216_from_reserve.json b/src/pds_doi_service/core/input/test/data/osti_record_reserved.json similarity index 100% rename from input/DOI_Release_20210216_from_reserve.json rename to src/pds_doi_service/core/input/test/data/osti_record_reserved.json diff --git a/src/pds_doi_service/core/input/test/data/osti_record_reserved.xml b/src/pds_doi_service/core/input/test/data/osti_record_reserved.xml new file mode 120000 index 00000000..3d1ffc42 --- /dev/null +++ b/src/pds_doi_service/core/input/test/data/osti_record_reserved.xml @@ -0,0 +1 @@ +../../../actions/test/data/osti_record_reserved.xml \ No newline at end of file diff --git a/input/DOI_Release_20210216_from_reserve_utf-8-bom.json b/src/pds_doi_service/core/input/test/data/osti_record_reserved_with_utf-8-bom.json similarity index 100% rename from input/DOI_Release_20210216_from_reserve_utf-8-bom.json rename to src/pds_doi_service/core/input/test/data/osti_record_reserved_with_utf-8-bom.json diff --git a/src/pds_doi_service/core/input/test/data/pds4_bundle_with_contributors.xml b/src/pds_doi_service/core/input/test/data/pds4_bundle_with_contributors.xml new file mode 120000 index 00000000..f9903640 --- /dev/null +++ b/src/pds_doi_service/core/input/test/data/pds4_bundle_with_contributors.xml @@ -0,0 +1 @@ +../../../actions/test/data/pds4_bundle_with_contributors.xml \ No newline at end of file diff --git a/src/pds_doi_service/core/input/test/data/pds4_bundle_with_doi_and_contributors.xml b/src/pds_doi_service/core/input/test/data/pds4_bundle_with_doi_and_contributors.xml new file mode 120000 index 00000000..a7f43860 --- /dev/null +++ b/src/pds_doi_service/core/input/test/data/pds4_bundle_with_doi_and_contributors.xml @@ -0,0 +1 @@ +../../../actions/test/data/pds4_bundle_with_doi_and_contributors.xml \ No newline at end of file diff --git a/input/bundle_in_with_contributors_utf-8-bom.xml b/src/pds_doi_service/core/input/test/data/pds4_bundle_with_utf-8-bom.xml similarity index 100% rename from input/bundle_in_with_contributors_utf-8-bom.xml rename to src/pds_doi_service/core/input/test/data/pds4_bundle_with_utf-8-bom.xml diff --git a/input/DOI-reserve-blank-rows.csv b/src/pds_doi_service/core/input/test/data/spreadsheet_with_blank_rows.csv similarity index 100% rename from input/DOI-reserve-blank-rows.csv rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_blank_rows.csv diff --git a/input/DOI-reserve-blank-rows.xlsx b/src/pds_doi_service/core/input/test/data/spreadsheet_with_blank_rows.xlsx similarity index 100% rename from input/DOI-reserve-blank-rows.xlsx rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_blank_rows.xlsx diff --git a/input/DOI_Reserved_GEO_200318_invalid_column_names.csv b/src/pds_doi_service/core/input/test/data/spreadsheet_with_invalid_column_names.csv similarity index 100% rename from input/DOI_Reserved_GEO_200318_invalid_column_names.csv rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_invalid_column_names.csv diff --git a/input/DOI_Reserved_GEO_200318_invalid_column_names.xlsx b/src/pds_doi_service/core/input/test/data/spreadsheet_with_invalid_column_names.xlsx similarity index 100% rename from input/DOI_Reserved_GEO_200318_invalid_column_names.xlsx rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_invalid_column_names.xlsx diff --git a/input/DOI_Reserved_GEO_200318_with_invalid_rows.csv b/src/pds_doi_service/core/input/test/data/spreadsheet_with_invalid_rows.csv similarity index 100% rename from input/DOI_Reserved_GEO_200318_with_invalid_rows.csv rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_invalid_rows.csv diff --git a/input/DOI_Reserved_GEO_200318_with_invalid_rows.xlsx b/src/pds_doi_service/core/input/test/data/spreadsheet_with_invalid_rows.xlsx similarity index 100% rename from input/DOI_Reserved_GEO_200318_with_invalid_rows.xlsx rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_invalid_rows.xlsx diff --git a/input/DOI_Reserved_GEO_200318.xlsx b/src/pds_doi_service/core/input/test/data/spreadsheet_with_lid_only.xlsx similarity index 100% rename from input/DOI_Reserved_GEO_200318.xlsx rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_lid_only.xlsx diff --git a/input/DOI_Reserved_GEO_200318_malformed_column_names.csv b/src/pds_doi_service/core/input/test/data/spreadsheet_with_malformed_column_names.csv similarity index 100% rename from input/DOI_Reserved_GEO_200318_malformed_column_names.csv rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_malformed_column_names.csv diff --git a/input/DOI_Reserved_GEO_200318_malformed_column_names.xlsx b/src/pds_doi_service/core/input/test/data/spreadsheet_with_malformed_column_names.xlsx similarity index 100% rename from input/DOI_Reserved_GEO_200318_malformed_column_names.xlsx rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_malformed_column_names.xlsx diff --git a/input/DOI-reserve-broken.csv b/src/pds_doi_service/core/input/test/data/spreadsheet_with_missing_columns.csv similarity index 100% rename from input/DOI-reserve-broken.csv rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_missing_columns.csv diff --git a/input/DOI-reserve-broken.xlsx b/src/pds_doi_service/core/input/test/data/spreadsheet_with_missing_columns.xlsx similarity index 100% rename from input/DOI-reserve-broken.xlsx rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_missing_columns.xlsx diff --git a/input/DOI-reserve-optionals.csv b/src/pds_doi_service/core/input/test/data/spreadsheet_with_optional_columns.csv similarity index 100% rename from input/DOI-reserve-optionals.csv rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_optional_columns.csv diff --git a/input/DOI-reserve-optionals.xlsx b/src/pds_doi_service/core/input/test/data/spreadsheet_with_optional_columns.xlsx similarity index 100% rename from input/DOI-reserve-optionals.xlsx rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_optional_columns.xlsx diff --git a/src/pds_doi_service/core/input/test/data/spreadsheet_with_pds3_identifiers.csv b/src/pds_doi_service/core/input/test/data/spreadsheet_with_pds3_identifiers.csv new file mode 120000 index 00000000..b7ae2cf0 --- /dev/null +++ b/src/pds_doi_service/core/input/test/data/spreadsheet_with_pds3_identifiers.csv @@ -0,0 +1 @@ +../../../actions/test/data/spreadsheet_with_pds3_identifiers.csv \ No newline at end of file diff --git a/src/pds_doi_service/core/input/test/data/spreadsheet_with_pds4_identifiers.csv b/src/pds_doi_service/core/input/test/data/spreadsheet_with_pds4_identifiers.csv new file mode 120000 index 00000000..d7502fc9 --- /dev/null +++ b/src/pds_doi_service/core/input/test/data/spreadsheet_with_pds4_identifiers.csv @@ -0,0 +1 @@ +../../../actions/test/data/spreadsheet_with_pds4_identifiers.csv \ No newline at end of file diff --git a/src/pds_doi_service/core/input/test/data/spreadsheet_with_pds4_identifiers.xlsx b/src/pds_doi_service/core/input/test/data/spreadsheet_with_pds4_identifiers.xlsx new file mode 120000 index 00000000..c76ba95d --- /dev/null +++ b/src/pds_doi_service/core/input/test/data/spreadsheet_with_pds4_identifiers.xlsx @@ -0,0 +1 @@ +../../../actions/test/data/spreadsheet_with_pds4_identifiers.xlsx \ No newline at end of file diff --git a/src/pds_doi_service/core/input/test/input_util_test.py b/src/pds_doi_service/core/input/test/input_util_test.py index 12caf672..657e3c42 100644 --- a/src/pds_doi_service/core/input/test/input_util_test.py +++ b/src/pds_doi_service/core/input/test/input_util_test.py @@ -1,6 +1,5 @@ #!/usr/bin/env python import datetime -import os import unittest from os.path import abspath from os.path import join @@ -18,14 +17,14 @@ class InputUtilTestCase(unittest.TestCase): def setUp(self): self.test_dir = resource_filename(__name__, "") - self.input_dir = abspath(join(self.test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + self.input_dir = abspath(join(self.test_dir, "data")) def test_parse_dois_from_input_file(self): """Test the DOIInputUtil.parse_dois_from_input_file() method""" doi_input_util = DOIInputUtil(valid_extensions=".xml") # Test with local file - i_filepath = join(self.input_dir, "bundle_in_with_contributors.xml") + i_filepath = join(self.input_dir, "pds4_bundle_with_contributors.xml") dois = doi_input_util.parse_dois_from_input_file(i_filepath) self.assertEqual(len(dois), 1) @@ -37,7 +36,7 @@ def test_parse_dois_from_input_file(self): self.assertEqual(len(dois), 1) # Test with local directory - i_filepath = join(self.input_dir, "draft_dir_two_files") + i_filepath = join(self.input_dir, "input_dir_two_files") dois = doi_input_util.parse_dois_from_input_file(i_filepath) self.assertEqual(len(dois), 2) @@ -53,7 +52,7 @@ def test_parse_dois_from_input_file(self): doi_input_util.parse_dois_from_input_file(i_filepath) # Test local file with invalid extension - i_filepath = join(self.input_dir, "DOI_Reserved_GEO_200318.xlsx") + i_filepath = join(self.input_dir, "spreadsheet_with_lid_only.xlsx") with self.assertRaises(InputFormatException): doi_input_util.parse_dois_from_input_file(i_filepath) @@ -68,7 +67,7 @@ def test_read_xls(self): doi_input_util = DOIInputUtil() # Test single entry spreadsheet - i_filepath = join(self.input_dir, "DOI_Reserved_GEO_200318.xlsx") + i_filepath = join(self.input_dir, "spreadsheet_with_lid_only.xlsx") dois = doi_input_util.parse_xls_file(i_filepath) self.assertEqual(len(dois), 1) @@ -84,7 +83,7 @@ def test_read_xls(self): self.assertIsInstance(doi.publication_date, datetime.datetime) # Test multi entry spreadsheet - i_filepath = join(self.input_dir, "DOI_Reserved_GEO_200318_with_corrected_identifier.xlsx") + i_filepath = join(self.input_dir, "spreadsheet_with_pds4_identifiers.xlsx") dois = doi_input_util.parse_xls_file(i_filepath) @@ -98,7 +97,7 @@ def test_read_xls(self): self.assertTrue(all([isinstance(doi.publication_date, datetime.datetime) for doi in dois])) # Test with an invalid spreadsheet (insufficient columns) - i_filepath = join(self.input_dir, "DOI-reserve-broken.xlsx") + i_filepath = join(self.input_dir, "spreadsheet_with_missing_columns.xlsx") try: doi_input_util.parse_xls_file(i_filepath) @@ -108,7 +107,7 @@ def test_read_xls(self): self.assertIn("only found 5 column(s)", str(err)) # Test with an invalid spreadsheet (wrong column names) - i_filepath = join(self.input_dir, "DOI_Reserved_GEO_200318_invalid_column_names.xlsx") + i_filepath = join(self.input_dir, "spreadsheet_with_invalid_column_names.xlsx") try: doi_input_util.parse_xls_file(i_filepath) @@ -118,14 +117,14 @@ def test_read_xls(self): self.assertIn("Please assign the correct column names", str(err)) # Test with a valid spreadsheet with malformed column names (that parser should correct) - i_filepath = join(self.input_dir, "DOI_Reserved_GEO_200318_malformed_column_names.xlsx") + i_filepath = join(self.input_dir, "spreadsheet_with_malformed_column_names.xlsx") dois = doi_input_util.parse_xls_file(i_filepath) self.assertEqual(len(dois), 1) # Test with an invalid spreadsheet (multiple rows with errors) - i_filepath = join(self.input_dir, "DOI_Reserved_GEO_200318_with_invalid_rows.xlsx") + i_filepath = join(self.input_dir, "spreadsheet_with_invalid_rows.xlsx") try: doi_input_util.parse_xls_file(i_filepath) @@ -140,7 +139,7 @@ def test_read_xls(self): self.assertIn("Incorrect publication_date format", str(err)) # Test with a spreadsheet containing optional columns - i_filepath = join(self.input_dir, "DOI-reserve-optionals.xlsx") + i_filepath = join(self.input_dir, "spreadsheet_with_optional_columns.xlsx") dois = doi_input_util.parse_xls_file(i_filepath) @@ -152,7 +151,7 @@ def test_read_xls(self): self.assertIsNotNone(doi_fields[optional_column]) # Test with a spreadsheet containing blank rows (parser should sanitize these) - i_filepath = join(self.input_dir, "DOI-reserve-blank-rows.xlsx") + i_filepath = join(self.input_dir, "spreadsheet_with_blank_rows.xlsx") # Read the spreadsheet to get a total of rows w/ blanks xl_wb = pd.ExcelFile(i_filepath, engine="openpyxl") @@ -170,7 +169,7 @@ def test_read_csv(self): """Test the DOIInputUtil.parse_csv_file() method""" doi_input_util = DOIInputUtil() - i_filepath = join(self.input_dir, "DOI_Reserved_GEO_200318.csv") + i_filepath = join(self.input_dir, "spreadsheet_with_pds4_identifiers.csv") dois = doi_input_util.parse_csv_file(i_filepath) self.assertEqual(len(dois), 3) @@ -181,7 +180,7 @@ def test_read_csv(self): self.assertTrue(all([isinstance(doi.publication_date, datetime.datetime) for doi in dois])) # Test on a CSV containing a PD3 style identifier - i_filepath = join(self.input_dir, "DOI_Reserved_PDS3.csv") + i_filepath = join(self.input_dir, "spreadsheet_with_pds3_identifiers.csv") dois = doi_input_util.parse_csv_file(i_filepath) self.assertEqual(len(dois), 1) @@ -192,7 +191,7 @@ def test_read_csv(self): self.assertEqual(doi.pds_identifier, "LRO-L-MRFLRO-2/3/5-BISTATIC-V3.0") # Test with an invalid spreadsheet (insufficient columns) - i_filepath = join(self.input_dir, "DOI-reserve-broken.csv") + i_filepath = join(self.input_dir, "spreadsheet_with_missing_columns.csv") try: doi_input_util.parse_csv_file(i_filepath) @@ -202,7 +201,7 @@ def test_read_csv(self): self.assertIn("only found 5 column(s)", str(err)) # Test with an invalid spreadsheet (wrong column names) - i_filepath = join(self.input_dir, "DOI_Reserved_GEO_200318_invalid_column_names.csv") + i_filepath = join(self.input_dir, "spreadsheet_with_invalid_column_names.csv") try: doi_input_util.parse_csv_file(i_filepath) @@ -212,14 +211,14 @@ def test_read_csv(self): self.assertIn("Please assign the correct column names", str(err)) # Test with a valid spreadsheet with malformed column names (that parser should correct) - i_filepath = join(self.input_dir, "DOI_Reserved_GEO_200318_malformed_column_names.csv") + i_filepath = join(self.input_dir, "spreadsheet_with_malformed_column_names.csv") dois = doi_input_util.parse_csv_file(i_filepath) self.assertEqual(len(dois), 1) # Test with an invalid spreadsheet (multiple rows with errors) - i_filepath = join(self.input_dir, "DOI_Reserved_GEO_200318_with_invalid_rows.csv") + i_filepath = join(self.input_dir, "spreadsheet_with_invalid_rows.csv") try: doi_input_util.parse_csv_file(i_filepath) @@ -234,7 +233,7 @@ def test_read_csv(self): self.assertIn("Incorrect publication_date format", str(err)) # Test with a spreadsheet containing optional columns - i_filepath = join(self.input_dir, "DOI-reserve-optionals.csv") + i_filepath = join(self.input_dir, "spreadsheet_with_optional_columns.csv") dois = doi_input_util.parse_csv_file(i_filepath) @@ -246,7 +245,7 @@ def test_read_csv(self): self.assertIsNotNone(doi_fields[optional_column]) # Test with a spreadsheet containing blank rows (parser should sanitize these) - i_filepath = join(self.input_dir, "DOI-reserve-blank-rows.csv") + i_filepath = join(self.input_dir, "spreadsheet_with_blank_rows.csv") # Read the spreadsheet to get a total of rows w/ blanks csv_sheet = pd.read_csv(i_filepath, na_filter=False) @@ -264,7 +263,7 @@ def test_read_xml(self): doi_input_util = DOIInputUtil() # Test with a PDS4 label - i_filepath = join(self.input_dir, "bundle_in_with_contributors.xml") + i_filepath = join(self.input_dir, "pds4_bundle_with_contributors.xml") dois = doi_input_util.parse_xml_file(i_filepath) self.assertEqual(len(dois), 1) @@ -274,7 +273,7 @@ def test_read_xml(self): self.assertIsInstance(doi, Doi) # Test with an OSTI output label - i_filepath = join(self.input_dir, "DOI_Release_20200727_from_reserve.xml") + i_filepath = join(self.input_dir, "osti_record_reserved.xml") dois = doi_input_util.parse_xml_file(i_filepath) self.assertEqual(len(dois), 1) @@ -284,7 +283,7 @@ def test_read_xml(self): self.assertIsInstance(doi, Doi) # Test with an OSTI label containing a PDS3 identifier - i_filepath = join(self.input_dir, "DOI_Release_PDS3.xml") + i_filepath = join(self.input_dir, "osti_record_registered_with_pds3_identifier.xml") dois = doi_input_util.parse_xml_file(i_filepath) self.assertEqual(len(dois), 1) @@ -297,7 +296,7 @@ def test_read_xml(self): self.assertEqual(doi.pds_identifier, "LRO-L-MRFLRO-2/3/5-BISTATIC-V3.0") # Test with a PDS4 label that contains a UTF-8 byte order marker - i_filepath = join(self.input_dir, "bundle_in_with_contributors_utf-8-bom.xml") + i_filepath = join(self.input_dir, "pds4_bundle_with_utf-8-bom.xml") # Run a quick sanity check to ensure the input file starts with the BOM with open(i_filepath, "r") as infile: @@ -320,9 +319,9 @@ def test_read_json(self): # Test with the appropriate JSON label for the current service if DOIServiceFactory.get_service_type() == SERVICE_TYPE_OSTI: - i_filepath = join(self.input_dir, "DOI_Release_20210216_from_reserve.json") + i_filepath = join(self.input_dir, "osti_record_reserved.json") else: - i_filepath = join(self.input_dir, "DOI_Release_20210615_from_reserve.json") + i_filepath = join(self.input_dir, "datacite_record_draft.json") dois = doi_input_util.parse_json_file(i_filepath) @@ -334,9 +333,9 @@ def test_read_json(self): # Test with a JSON label that contains a UTF-8 byte order marker if DOIServiceFactory.get_service_type() == SERVICE_TYPE_OSTI: - i_filepath = join(self.input_dir, "DOI_Release_20210216_from_reserve_utf-8-bom.json") + i_filepath = join(self.input_dir, "osti_record_reserved_with_utf-8-bom.json") else: - i_filepath = join(self.input_dir, "tc-4_reserve_RADARGRAM_v2.0_utf-8-bom.json") + i_filepath = join(self.input_dir, "datacite_record_draft_with_utf-8-bom.json") # Run a quick sanity check to ensure the input file starts with the BOM with open(i_filepath, "r") as infile: diff --git a/src/pds_doi_service/core/input/test/pds4_util_test.py b/src/pds_doi_service/core/input/test/pds4_util_test.py index 7af48ed4..81d19664 100644 --- a/src/pds_doi_service/core/input/test/pds4_util_test.py +++ b/src/pds_doi_service/core/input/test/pds4_util_test.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -import os import unittest from datetime import datetime from os.path import abspath @@ -16,7 +15,7 @@ class Pds4UtilTestCase(unittest.TestCase): def setUp(self): self.test_dir = resource_filename(__name__, "") - self.input_dir = abspath(join(self.test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + self.input_dir = abspath(join(self.test_dir, "data")) self.expected_authors = [ {"first_name": "R.", "last_name": "Deen", "affiliation": [], "name_type": "Personal"}, @@ -53,7 +52,7 @@ def test_parse_dois_from_pds4_label(self): # Test with a PDS4 label containing all the fields we support parsing # DOI metadata for - i_filepath = join(self.input_dir, "bundle_in_with_doi_and_contributors.xml") + i_filepath = join(self.input_dir, "pds4_bundle_with_doi_and_contributors.xml") with open(i_filepath, "r") as infile: xml_contents = infile.read().encode().decode("utf-8-sig") diff --git a/src/pds_doi_service/core/outputs/test/data/datacite_record_draft.json b/src/pds_doi_service/core/outputs/test/data/datacite_record_draft.json new file mode 120000 index 00000000..28cec153 --- /dev/null +++ b/src/pds_doi_service/core/outputs/test/data/datacite_record_draft.json @@ -0,0 +1 @@ +../../../input/test/data/datacite_record_draft.json \ No newline at end of file diff --git a/src/pds_doi_service/core/outputs/test/data/datacite_record_findable.json b/src/pds_doi_service/core/outputs/test/data/datacite_record_findable.json new file mode 120000 index 00000000..eb24b27f --- /dev/null +++ b/src/pds_doi_service/core/outputs/test/data/datacite_record_findable.json @@ -0,0 +1 @@ +../../../actions/test/data/datacite_record_findable.json \ No newline at end of file diff --git a/input/DOI_Reserved_multi_entry.json b/src/pds_doi_service/core/outputs/test/data/datacite_record_multi_entry.json similarity index 100% rename from input/DOI_Reserved_multi_entry.json rename to src/pds_doi_service/core/outputs/test/data/datacite_record_multi_entry.json diff --git a/input/DOI_Release_20210216_from_error.json b/src/pds_doi_service/core/outputs/test/data/osti_record_error.json similarity index 100% rename from input/DOI_Release_20210216_from_error.json rename to src/pds_doi_service/core/outputs/test/data/osti_record_error.json diff --git a/src/pds_doi_service/core/outputs/test/data/osti_record_error.xml b/src/pds_doi_service/core/outputs/test/data/osti_record_error.xml new file mode 120000 index 00000000..a56156f4 --- /dev/null +++ b/src/pds_doi_service/core/outputs/test/data/osti_record_error.xml @@ -0,0 +1 @@ +../../../actions/test/data/osti_record_error.xml \ No newline at end of file diff --git a/input/DOI_Release_20210216_from_release.json b/src/pds_doi_service/core/outputs/test/data/osti_record_pending.json similarity index 100% rename from input/DOI_Release_20210216_from_release.json rename to src/pds_doi_service/core/outputs/test/data/osti_record_pending.json diff --git a/src/pds_doi_service/core/outputs/test/data/osti_record_pending.xml b/src/pds_doi_service/core/outputs/test/data/osti_record_pending.xml new file mode 120000 index 00000000..8fc8fbc3 --- /dev/null +++ b/src/pds_doi_service/core/outputs/test/data/osti_record_pending.xml @@ -0,0 +1 @@ +../../../actions/test/data/osti_record_pending.xml \ No newline at end of file diff --git a/src/pds_doi_service/core/outputs/test/datacite_test.py b/src/pds_doi_service/core/outputs/test/datacite_test.py index 0c30c426..bab8395e 100644 --- a/src/pds_doi_service/core/outputs/test/datacite_test.py +++ b/src/pds_doi_service/core/outputs/test/datacite_test.py @@ -1,6 +1,5 @@ #!/usr/bin/env python import json -import os import unittest from datetime import datetime from os.path import abspath @@ -32,12 +31,12 @@ class DOIDataCiteRecordTestCase(unittest.TestCase): @classmethod def setUpClass(cls): cls.test_dir = resource_filename(__name__, "") - cls.input_dir = abspath(join(cls.test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + cls.input_dir = abspath(join(cls.test_dir, "data")) def test_create_datacite_label_json(self): """Test creation of a DataCite JSON label from a Doi object""" # Parse sample input to obtain a Doi object - input_json_file = join(self.input_dir, "DOI_Release_20210615_from_reserve.json") + input_json_file = join(self.input_dir, "datacite_record_draft.json") with open(input_json_file, "r") as infile: input_json = infile.read() @@ -79,7 +78,7 @@ def test_create_datacite_label_json(self): def test_update_datacite_label_json(self): """Test creation of a DataCite label for a DOI record where the identifier has been updated""" - input_json_file = join(self.input_dir, "DOI_Release_20210615_from_reserve.json") + input_json_file = join(self.input_dir, "datacite_record_draft.json") with open(input_json_file, "r") as infile: input_json = infile.read() @@ -116,7 +115,7 @@ def requests_valid_request_patch(method, url, **kwargs): response = Response() response.status_code = 200 - with open(join(DOIDataCiteWebClientTestCase.input_dir, "DOI_Release_20210615_from_release.json")) as infile: + with open(join(DOIDataCiteWebClientTestCase.input_dir, "datacite_record_findable.json")) as infile: response._content = infile.read().encode() return response @@ -151,7 +150,7 @@ class DOIDataCiteWebClientTestCase(unittest.TestCase): @classmethod def setUpClass(cls): cls.test_dir = resource_filename(__name__, "") - cls.input_dir = abspath(join(cls.test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + cls.input_dir = abspath(join(cls.test_dir, "data")) @patch.object(requests, "request", requests_valid_request_patch) def test_submit_content(self): @@ -270,7 +269,7 @@ class DOIDataCiteWebParserTestCase(unittest.TestCase): @classmethod def setUpClass(cls): cls.test_dir = resource_filename(__name__, "") - cls.input_dir = abspath(join(cls.test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + cls.input_dir = abspath(join(cls.test_dir, "data")) cls.expected_authors = [ {"name": "R. Deen", "name_identifiers": [], "name_type": "Personal", "affiliation": ["NASA PDS"]}, @@ -335,7 +334,7 @@ def _compare_doi_to_expected(self, doi): def test_parse_datacite_response_json(self): """Test parsing of an DataCite label in JSON format""" # Test with a nominal file containing most of the optional fields - input_json_file = join(self.input_dir, "DOI_Release_20210615_from_reserve.json") + input_json_file = join(self.input_dir, "datacite_record_draft.json") with open(input_json_file, "r") as infile: input_json = infile.read() @@ -350,7 +349,7 @@ def test_parse_datacite_response_json(self): def test_get_record_for_identifier(self): """Test isolation of specific record based on PDS identifier""" - input_json_file = join(self.input_dir, "DOI_Reserved_multi_entry.json") + input_json_file = join(self.input_dir, "datacite_record_multi_entry.json") # Test extraction of a single record from a multi-entry label, parse the # DOI from the result, and ensure we get the record back we expected @@ -376,7 +375,7 @@ def test_get_record_for_identifier(self): def test_get_record_for_doi(self): """Test isolation of a specific record based on DOI""" - input_json_file = join(self.input_dir, "DOI_Reserved_multi_entry.json") + input_json_file = join(self.input_dir, "datacite_record_multi_entry.json") # Test extraction of a single record from a multi-entry label, parse the DOI # from the result, and ensure we got the record back we expected @@ -404,14 +403,14 @@ class DOIDataCiteValidatorTestCase(unittest.TestCase): @classmethod def setUpClass(cls): cls.test_dir = resource_filename(__name__, "") - cls.input_dir = abspath(join(cls.test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + cls.input_dir = abspath(join(cls.test_dir, "data")) def test_json_label_validation(self): """Test validation against a DataCite label created from a valid Doi object""" validator = DOIDataCiteValidator() # Parse sample input to obtain a Doi object - input_json_file = join(self.input_dir, "DOI_Release_20210615_from_reserve.json") + input_json_file = join(self.input_dir, "datacite_record_draft.json") # Next, create a valid output DataCite label from the parsed Doi with open(input_json_file, "r") as infile: diff --git a/src/pds_doi_service/core/outputs/test/osti_test.py b/src/pds_doi_service/core/outputs/test/osti_test.py index 1cf730c1..ec2e082a 100644 --- a/src/pds_doi_service/core/outputs/test/osti_test.py +++ b/src/pds_doi_service/core/outputs/test/osti_test.py @@ -1,6 +1,5 @@ #!/usr/bin/env python import json -import os import unittest from datetime import datetime from os.path import abspath @@ -22,15 +21,12 @@ class DOIOstiRecordTestCase(unittest.TestCase): @classmethod def setUpClass(cls): cls.test_dir = resource_filename(__name__, "") - # FIXME: moving this code from PACKAGE-DIR to PACKAGE-DIR/src (and, when we add - # namepsace packages, to PACKAGE-DIR/src/pds) shouldn't necessitate re-jiggering - # all the parent directories: - cls.input_dir = abspath(join(cls.test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + cls.input_dir = abspath(join(cls.test_dir, "data")) def test_create_osti_label_xml(self): """Test creation of an OSTI XML label from a Doi object""" # Parse sample input to obtain a Doi object - input_xml_file = join(self.input_dir, "DOI_Release_20200727_from_release.xml") + input_xml_file = join(self.input_dir, "osti_record_pending.xml") with open(input_xml_file, "r") as infile: input_xml = infile.read() @@ -55,7 +51,7 @@ def test_create_osti_label_xml(self): def test_create_osti_label_json(self): """Test creation of an OSTI JSON label from Doi objects""" # Parse sample input to obtain a Doi object - input_json_file = join(self.input_dir, "DOI_Release_20210216_from_release.json") + input_json_file = join(self.input_dir, "osti_record_pending.json") with open(input_json_file, "r") as infile: input_json = infile.read() @@ -83,10 +79,7 @@ class DOIOstiWebParserTestCase(unittest.TestCase): @classmethod def setUpClass(cls): cls.test_dir = resource_filename(__name__, "") - # FIXME: moving this code from PACKAGE-DIR to PACKAGE-DIR/src (and, when we add - # namepsace packages, to PACKAGE-DIR/src/pds) shouldn't necessitate re-jiggering - # all the parent directories: - cls.input_dir = abspath(join(cls.test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + cls.input_dir = abspath(join(cls.test_dir, "data")) cls.expected_authors = [ {"first_name": "R.", "last_name": "Deen"}, @@ -132,7 +125,7 @@ def _compare_doi_to_expected(self, doi): self.assertIsInstance(doi.date_record_added, datetime) self.assertEqual( doi.description, - "InSight Cameras Experiment Data Record (EDR) " "and Reduced Data Record (RDR) Data Products", + "InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products", ) self.assertEqual(doi.doi, "10.17189/29569") self.assertListEqual(doi.editors, self.expected_editors) @@ -153,7 +146,7 @@ def _compare_doi_to_expected(self, doi): def test_parse_osti_response_xml(self): """Test parsing of an OSTI label in XML format""" # Test with a nominal file containing most of the optional fields - input_xml_file = join(self.input_dir, "DOI_Release_20200727_from_release.xml") + input_xml_file = join(self.input_dir, "osti_record_pending.xml") with open(input_xml_file, "r") as infile: input_xml = infile.read() @@ -167,7 +160,7 @@ def test_parse_osti_response_xml(self): self._compare_doi_to_expected(doi) # Test with an erroneous file to ensure errors are parsed as we expect - input_xml_file = join(self.input_dir, "DOI_Release_20200727_from_error.xml") + input_xml_file = join(self.input_dir, "osti_record_error.xml") with open(input_xml_file, "r") as infile: input_xml = infile.read() @@ -179,7 +172,7 @@ def test_parse_osti_response_xml(self): def test_parse_osti_response_json(self): """Test parsing of an OSTI label in JSON format""" # Test with a nominal file containing most of the optional fields - input_json_file = join(self.input_dir, "DOI_Release_20210216_from_release.json") + input_json_file = join(self.input_dir, "osti_record_pending.json") with open(input_json_file, "r") as infile: input_json = infile.read() @@ -193,7 +186,7 @@ def test_parse_osti_response_json(self): self._compare_doi_to_expected(doi) # Test with an erroneous file to ensure errors are parsed as we expect - input_json_file = join(self.input_dir, "DOI_Release_20210216_from_error.json") + input_json_file = join(self.input_dir, "osti_record_error.json") with open(input_json_file, "r") as infile: input_json = infile.read()