From ed96bbdf2a464ae85221c39b37f9b2d16eb0fb36 Mon Sep 17 00:00:00 2001 From: lubitchv Date: Wed, 8 Jun 2022 09:50:56 -0400 Subject: [PATCH 1/3] exporter full version --- .../edu/harvard/iq/dataverse/export/OAI_DDIExporter.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/export/OAI_DDIExporter.java b/src/main/java/edu/harvard/iq/dataverse/export/OAI_DDIExporter.java index 30934cfc891..eaf8488278b 100644 --- a/src/main/java/edu/harvard/iq/dataverse/export/OAI_DDIExporter.java +++ b/src/main/java/edu/harvard/iq/dataverse/export/OAI_DDIExporter.java @@ -11,10 +11,7 @@ import javax.xml.stream.XMLStreamException; /** - * This exporter is for the OAI ("short") flavor of the DDI - that is, without - * the variable/data information. The ddi export utility does not need the - * version entity to produce that. - * + * This exporter is for the OAI * @author skraffmi */ @AutoService(Exporter.class) @@ -34,7 +31,7 @@ public String getDisplayName() { @Override public void exportDataset(DatasetVersion version, JsonObject json, OutputStream outputStream) throws ExportException { try { - DdiExportUtil.datasetJson2ddi(json, outputStream); + DdiExportUtil.datasetJson2ddi(json, version, outputStream); } catch (XMLStreamException xse) { throw new ExportException ("Caught XMLStreamException performing DDI export"); } From 9d7e954c3d786c5626479e1f0bfa1692dec48e45 Mon Sep 17 00:00:00 2001 From: lubitchv Date: Wed, 8 Jun 2022 10:20:53 -0400 Subject: [PATCH 2/3] release notes --- doc/release-notes/8778-harvester-ddi-exporter.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 doc/release-notes/8778-harvester-ddi-exporter.md diff --git a/doc/release-notes/8778-harvester-ddi-exporter.md b/doc/release-notes/8778-harvester-ddi-exporter.md new file mode 100644 index 00000000000..329ea10d3d0 --- /dev/null +++ b/doc/release-notes/8778-harvester-ddi-exporter.md @@ -0,0 +1,2 @@ +Harvesting XML OAI exporter was changed to include full XML, i.e dataDscr and fileDscr sections were added. +In order to use the new exporter on already existing installation, old export_oai_ddi.cached files should be deleted. From 2ba93e4f788dc735ec8c95a7d907fa48386213aa Mon Sep 17 00:00:00 2001 From: Victoria Lubitch Date: Tue, 11 Oct 2022 10:27:59 -0400 Subject: [PATCH 3/3] DDI exporter is made harvestable --- doc/release-notes/8778-harvester-ddi-exporter.md | 4 ++-- .../java/edu/harvard/iq/dataverse/export/DDIExporter.java | 6 +----- .../edu/harvard/iq/dataverse/export/OAI_DDIExporter.java | 7 +++++-- src/main/java/propertyFiles/Bundle.properties | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/doc/release-notes/8778-harvester-ddi-exporter.md b/doc/release-notes/8778-harvester-ddi-exporter.md index 329ea10d3d0..e19216f18af 100644 --- a/doc/release-notes/8778-harvester-ddi-exporter.md +++ b/doc/release-notes/8778-harvester-ddi-exporter.md @@ -1,2 +1,2 @@ -Harvesting XML OAI exporter was changed to include full XML, i.e dataDscr and fileDscr sections were added. -In order to use the new exporter on already existing installation, old export_oai_ddi.cached files should be deleted. +DDI exporter was made harvestable with dataDscr and fileDscr included. +DDI label was replaced with DDI_full label. diff --git a/src/main/java/edu/harvard/iq/dataverse/export/DDIExporter.java b/src/main/java/edu/harvard/iq/dataverse/export/DDIExporter.java index bb325226fad..01c8226715f 100644 --- a/src/main/java/edu/harvard/iq/dataverse/export/DDIExporter.java +++ b/src/main/java/edu/harvard/iq/dataverse/export/DDIExporter.java @@ -57,11 +57,7 @@ public Boolean isXMLFormat() { @Override public Boolean isHarvestable() { - // No, we don't want this format to be harvested! - // For datasets with tabular data the portions of the DDIs - // become huge and expensive to parse; even as they don't contain any - // metadata useful to remote harvesters. -- L.A. 4.5 - return false; + return true; } @Override diff --git a/src/main/java/edu/harvard/iq/dataverse/export/OAI_DDIExporter.java b/src/main/java/edu/harvard/iq/dataverse/export/OAI_DDIExporter.java index eaf8488278b..30934cfc891 100644 --- a/src/main/java/edu/harvard/iq/dataverse/export/OAI_DDIExporter.java +++ b/src/main/java/edu/harvard/iq/dataverse/export/OAI_DDIExporter.java @@ -11,7 +11,10 @@ import javax.xml.stream.XMLStreamException; /** - * This exporter is for the OAI + * This exporter is for the OAI ("short") flavor of the DDI - that is, without + * the variable/data information. The ddi export utility does not need the + * version entity to produce that. + * * @author skraffmi */ @AutoService(Exporter.class) @@ -31,7 +34,7 @@ public String getDisplayName() { @Override public void exportDataset(DatasetVersion version, JsonObject json, OutputStream outputStream) throws ExportException { try { - DdiExportUtil.datasetJson2ddi(json, version, outputStream); + DdiExportUtil.datasetJson2ddi(json, outputStream); } catch (XMLStreamException xse) { throw new ExportException ("Caught XMLStreamException performing DDI export"); } diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties index c1fd7214394..a7f0d8e3cf1 100644 --- a/src/main/java/propertyFiles/Bundle.properties +++ b/src/main/java/propertyFiles/Bundle.properties @@ -1365,7 +1365,7 @@ dataset.editBtn.itemLabel.deleteDataset=Delete Dataset dataset.editBtn.itemLabel.deleteDraft=Delete Draft Version dataset.editBtn.itemLabel.deaccession=Deaccession Dataset dataset.exportBtn=Export Metadata -dataset.exportBtn.itemLabel.ddi=DDI +dataset.exportBtn.itemLabel.ddi=DDI_full dataset.exportBtn.itemLabel.dublinCore=Dublin Core dataset.exportBtn.itemLabel.schemaDotOrg=Schema.org JSON-LD dataset.exportBtn.itemLabel.datacite=DataCite