Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
1aa61ea
In order to resolve #8838 in Add CSTR to Harvard Dataverse Related
Aug 11, 2022
8948faa
Hi reviewer,
Aug 22, 2022
2f664d0
We have modified the AdminIT.java file as per example #8775 provided by
Aug 29, 2022
87d7a81
Merge branch 'develop' into develop
cheneyfeng3 Sep 13, 2022
0bd6842
Update OpenAireExportUtilTest.java
cheneyfeng3 Sep 14, 2022
561d8b7
Update SchemaDotOrgExporterTest.java
cheneyfeng3 Sep 14, 2022
39fdcab
Update ready-state.sql
cheneyfeng3 Sep 14, 2022
ffde80e
Update citation.tsv
cheneyfeng3 Sep 14, 2022
7afa293
Update dataset-create-new-all-ddi-fields.json
cheneyfeng3 Sep 15, 2022
627adf7
Update exportfull.xml
cheneyfeng3 Sep 15, 2022
09c30a9
Update dataset-all-defaults.txt
cheneyfeng3 Sep 15, 2022
af57e5d
Update ddi_dataset.xml
cheneyfeng3 Sep 15, 2022
6b6ab87
Update dataset-create-new-all-default-fields.json
cheneyfeng3 Sep 15, 2022
f624746
Update ddi_dataset.xml
cheneyfeng3 Sep 15, 2022
f1b1e36
Create maven-publish.yml
cheneyfeng3 Sep 15, 2022
8e7509d
Delete maven-publish.yml
cheneyfeng3 Sep 15, 2022
c231fb0
Update OpenAireExportUtilTest.java
cheneyfeng3 Sep 19, 2022
1d47db4
Update citation.properties
cheneyfeng3 Sep 19, 2022
8093406
Update dataset-all-defaults.txt
cheneyfeng3 Sep 19, 2022
744030b
Update SchemaDotOrgExporterTest.java
cheneyfeng3 Sep 19, 2022
43c0681
Update OpenAireExportUtil.java
cheneyfeng3 Sep 21, 2022
c715bb8
Update OpenAireExportUtil.java
cheneyfeng3 Sep 21, 2022
4b985c3
Merge branch 'IQSS:develop' into develop
cheneyfeng3 Sep 23, 2022
5c79de8
Update AdminIT.java
cheneyfeng3 Sep 23, 2022
4bfca4a
Update AdminIT.java
cheneyfeng3 Sep 26, 2022
bf9f039
Merge pull request #1 from IQSS/develop
cheneyfeng3 Sep 29, 2022
614c33d
encoding change.
cheneyfeng3 Oct 14, 2022
de6be21
update encoding change.
Oct 14, 2022
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
33 changes: 17 additions & 16 deletions scripts/api/data/metadatablocks/citation.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -96,22 +96,23 @@
subject Other D12 13
publicationIDType ark 0
publicationIDType arXiv 1
publicationIDType bibcode 2
publicationIDType doi 3
publicationIDType ean13 4
publicationIDType eissn 5
publicationIDType handle 6
publicationIDType isbn 7
publicationIDType issn 8
publicationIDType istc 9
publicationIDType lissn 10
publicationIDType lsid 11
publicationIDType pmid 12
publicationIDType purl 13
publicationIDType upc 14
publicationIDType url 15
publicationIDType urn 16
publicationIDType DASH-NRS 17
publicationIDType bibcode 2
publicationIDType cstr 3
publicationIDType doi 4
publicationIDType ean13 5
publicationIDType eissn 6
publicationIDType handle 7
publicationIDType isbn 8
publicationIDType issn 9
publicationIDType istc 10
publicationIDType lissn 11
publicationIDType lsid 12
publicationIDType pmid 13
publicationIDType purl 14
publicationIDType upc 15
publicationIDType url 16
publicationIDType urn 17
publicationIDType DASH-NRS 18
contributorType Data Collector 0
contributorType Data Curator 1
contributorType Data Manager 2
Expand Down
1 change: 1 addition & 0 deletions src/main/java/propertyFiles/citation.properties
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ controlledvocabulary.subject.social_sciences=Social Sciences
controlledvocabulary.subject.other=Other
controlledvocabulary.publicationIDType.ark=ark
controlledvocabulary.publicationIDType.arxiv=arXiv
controlledvocabulary.publicationIDType.cstr=CSTR
controlledvocabulary.publicationIDType.bibcode=bibcode
controlledvocabulary.publicationIDType.doi=doi
controlledvocabulary.publicationIDType.ean13=ean13
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/edu/harvard/iq/dataverse/api/AdminIT.java
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@ public void testLoadMetadataBlock_NoErrorPath() {
assertEquals(1, data.size());
List<Map<String, String>> addedElements = data.get("added");
//Note -test depends on the number of elements in the production citation block, so any changes to the # of elements there can break this test
assertEquals(322, addedElements.size());
assertEquals(323, addedElements.size());

Map<String, Integer> statistics = new HashMap<>();
for (Map<String, String> unit : addedElements) {
Expand All @@ -778,7 +778,7 @@ public void testLoadMetadataBlock_NoErrorPath() {
assertEquals(3, statistics.size());
assertEquals(1, (int) statistics.get("MetadataBlock"));
assertEquals(78, (int) statistics.get("DatasetField"));
assertEquals(243, (int) statistics.get("Controlled Vocabulary"));
assertEquals(244, (int) statistics.get("Controlled Vocabulary"));
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -406,9 +406,10 @@ private static void mockDatasetFieldSvc() {
new ControlledVocabularyValue(1l, "ark", publicationIdTypes),
new ControlledVocabularyValue(2l, "arXiv", publicationIdTypes),
new ControlledVocabularyValue(3l, "bibcode", publicationIdTypes),
new ControlledVocabularyValue(4l, "doi", publicationIdTypes),
new ControlledVocabularyValue(5l, "ean13", publicationIdTypes),
new ControlledVocabularyValue(6l, "handle", publicationIdTypes)
new ControlledVocabularyValue(4l, "cstr", publicationIdTypes),
new ControlledVocabularyValue(5l, "doi", publicationIdTypes),
new ControlledVocabularyValue(6l, "ean13", publicationIdTypes),
new ControlledVocabularyValue(7l, "handle", publicationIdTypes)
// Etc. There are more.
));
publicationChildTypes.add(datasetFieldTypeSvc.add(publicationIdTypes));
Expand Down