Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

6650 export import mismatch #6669

Merged
merged 13 commits into from
Mar 24, 2020
Merged

6650 export import mismatch #6669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b49617b
Merge pull request #42 from IQSS/develop
lubitchv Jan 24, 2020
02c3e38
Merge pull request #44 from IQSS/develop
lubitchv Jan 29, 2020
0b59f5e
export
lubitchv Feb 4, 2020
7d7a258
Merge pull request #45 from IQSS/develop
lubitchv Feb 18, 2020
a53c857
import export
lubitchv Feb 18, 2020
a7aaabb
Merge branch 'export-import-mismatch' of https://github.com/lubitchv/…
lubitchv Feb 18, 2020
9b98584
export import ddi
lubitchv Feb 21, 2020
03d48a8
remove commented lines
lubitchv Feb 21, 2020
8446bfb
fix export import ddi
lubitchv Mar 3, 2020
770194d
adding release note
djbrooke Mar 10, 2020
65ac90e
Merge pull request #46 from IQSS/develop
lubitchv Mar 11, 2020
a646eb2
Merge pull request #48 from IQSS/develop
lubitchv Mar 23, 2020
4e62dbb
Merge pull request #49 from IQSS/develop
lubitchv Mar 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions doc/release-notes/6650-export-import-mismatch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Run ReExportall to update JSON Exports

http://guides.dataverse.org/en/4.19/admin/metadataexport.html?highlight=export#batch-exports-through-the-api
2 changes: 1 addition & 1 deletion src/main/java/edu/harvard/iq/dataverse/DatasetFieldConstant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public class DatasetFieldConstant implements java.io.Serializable {
public final static String topicClassVocab="topicClassVocab";
public final static String topicClassVocabURI="topicClassVocabURI";
public final static String descriptionText="dsDescriptionValue";
public final static String descriptionDate="descriptionDate";
public final static String descriptionDate="dsDescriptionDate";
public final static String timePeriodCovered="timePeriodCovered"; // SEK added 6/13/2016
public final static String timePeriodCoveredStart="timePeriodCoveredStart";
public final static String timePeriodCoveredEnd="timePeriodCoveredEnd";
Expand Down
262 changes: 188 additions & 74 deletions src/main/java/edu/harvard/iq/dataverse/api/imports/ImportDDIServiceBean.java
View file
Open in desktop

Large diffs are not rendered by default.

243 changes: 176 additions & 67 deletions src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtil.java
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,9 +446,9 @@ public void testCreatePublishDestroyDataset() {
*/
boolean nameRequiredForContactToAppear = true;
if (nameRequiredForContactToAppear) {
assertEquals("Finch, Fiona", XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.stdyDscr.stdyInfo.contact"));
assertEquals("Finch, Fiona", XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.stdyDscr.citation.distStmt.contact"));
} else {
assertEquals("finch@mailinator.com", XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.stdyDscr.stdyInfo.contact.@email"));
assertEquals("finch@mailinator.com", XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.stdyDscr.citation.distStmt.contact.@email"));
}
assertEquals(datasetPersistentId, XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.docDscr.citation.titlStmt.IDNo"));

Expand Down Expand Up @@ -659,10 +659,10 @@ public void testExcludeEmail() {
exportDatasetAsDdi.then().assertThat()
.statusCode(OK.getStatusCode());

assertEquals("Dataverse, Admin", XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.stdyDscr.stdyInfo.contact"));
assertEquals("Dataverse, Admin", XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.stdyDscr.citation.distStmt.contact"));
// no "sammi@sample.com" to be found https://github.com/IQSS/dataverse/issues/3443
assertEquals("[]", XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.stdyDscr.stdyInfo.contact.@email"));
assertEquals("Sample Datasets, inc.", XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.stdyDscr.stdyInfo.contact.@affiliation"));
assertEquals("[]", XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.stdyDscr.citation.distStmt.contact.@email"));
assertEquals("Sample Datasets, inc.", XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.stdyDscr.citation.distStmt.contact.@affiliation"));
assertEquals(datasetPersistentId, XmlPath.from(exportDatasetAsDdi.body().asString()).getString("codeBook.docDscr.citation.titlStmt.IDNo"));

List<JsonObject> datasetContactsFromNativeGet = with(getDatasetJsonAfterPublishing.body().asString()).param("datasetContact", "datasetContact")
Expand Down
12 changes: 12 additions & 0 deletions src/test/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,18 @@ public void testJson2DdiNoFiles() throws Exception {
assertEquals(datasetAsDdi, result);
}

@Test
public void testExportDDI() throws Exception {
File datasetVersionJson = new File("src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-create-new-all-ddi-fields.json");
String datasetVersionAsJson = new String(Files.readAllBytes(Paths.get(datasetVersionJson.getAbsolutePath())));
File ddiFile = new File("src/test/java/edu/harvard/iq/dataverse/export/ddi/exportfull.xml");
String datasetAsDdi = XmlPrinter.prettyPrintXml(new String(Files.readAllBytes(Paths.get(ddiFile.getAbsolutePath()))));
logger.info(datasetAsDdi);
String result = DdiExportUtil.datasetDtoAsJson2ddi(datasetVersionAsJson);
logger.info(result);
assertEquals(datasetAsDdi, result);
}

@Test
public void testJson2ddiHasFiles() throws Exception {
/**
Expand Down
Loading