From c5049179731c7cdf07db05a96fdb83fec5cf01cf Mon Sep 17 00:00:00 2001 From: milanmajchrak <90026355+milanmajchrak@users.noreply.github.com> Date: Wed, 8 Nov 2023 15:01:12 +0100 Subject: [PATCH] Uk setup (#456) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * upstream dspace traditionalpageone, traditionalpagetwo * test datacite submission (mandatory fields only) * support for dois and preregister pids --------- Co-authored-by: Ondra Kosarko Co-authored-by: Ondřej Košarko --- .../identifier/doi/DataCiteConnector.java | 3 +- dspace/config/crosswalks/DIM2DataCite.xsl | 49 +-- dspace/config/item-submission.xml | 17 +- .../config/spring/api/identifier-service.xml | 6 +- dspace/config/spring/api/item-filters.xml | 13 + dspace/config/submission-forms.xml | 297 +++++++++++++----- 6 files changed, 266 insertions(+), 119 deletions(-) diff --git a/dspace-api/src/main/java/org/dspace/identifier/doi/DataCiteConnector.java b/dspace-api/src/main/java/org/dspace/identifier/doi/DataCiteConnector.java index 57136d6143bb..e20bf085afa9 100644 --- a/dspace-api/src/main/java/org/dspace/identifier/doi/DataCiteConnector.java +++ b/dspace-api/src/main/java/org/dspace/identifier/doi/DataCiteConnector.java @@ -438,10 +438,11 @@ public void reserveDOI(Context context, DSpaceObject dso, String doi) return; } // 400 -> invalid XML + case (422): case (400): { log.warn("DataCite was unable to understand the XML we send."); log.warn("DataCite Metadata API returned a http status code " - + "400: " + resp.getContent()); + + resp.getStatusCode() + ": " + resp.getContent()); Format format = Format.getCompactFormat(); format.setEncoding("UTF-8"); XMLOutputter xout = new XMLOutputter(format); diff --git a/dspace/config/crosswalks/DIM2DataCite.xsl b/dspace/config/crosswalks/DIM2DataCite.xsl index e92c371d6a77..867216484aa0 100644 --- a/dspace/config/crosswalks/DIM2DataCite.xsl +++ b/dspace/config/crosswalks/DIM2DataCite.xsl @@ -11,7 +11,7 @@ --> @@ -46,9 +46,9 @@ properties are in the metadata of the item to export. The classe named above respects this. --> - + xsi:schemaLocation="http://datacite.org/schema/kernel-4 https://schema.datacite.org/meta/kernel-4.4/metadata.xsd"> + + @@ -214,13 +221,6 @@ --> - - - + - - Audiovisual - Text - Text - Text - Dataset - InteractiveResource - Image - Image - Model - Other - Model - Text - Text - Sound - Sound - Sound - Software - Text - Text - Audiovisual - Text - Other - Other - + - + diff --git a/dspace/config/item-submission.xml b/dspace/config/item-submission.xml index d0dc9285109a..50a36e7970e6 100644 --- a/dspace/config/item-submission.xml +++ b/dspace/config/item-submission.xml @@ -20,6 +20,7 @@ + - + @@ -276,6 +282,15 @@ + + + + + + + + + @@ -55,9 +56,8 @@ ref="org.dspace.services.ConfigurationService" /> - + - --> @@ -102,7 +103,6 @@ - --> diff --git a/dspace/config/spring/api/item-filters.xml b/dspace/config/spring/api/item-filters.xml index 24c463fb531e..e528603fb9eb 100644 --- a/dspace/config/spring/api/item-filters.xml +++ b/dspace/config/spring/api/item-filters.xml @@ -218,6 +218,19 @@ + diff --git a/dspace/config/submission-forms.xml b/dspace/config/submission-forms.xml index 5ffe5229791a..c1f255b78edc 100644 --- a/dspace/config/submission-forms.xml +++ b/dspace/config/submission-forms.xml @@ -48,36 +48,80 @@ - -
- + + + - local - contact - person + dc + contributor + author true - - - complex - This is contact person + + onebox + Personal name format should be: family, given. + - local - sponsor - true - - - complex - This is funding + dc + title + + false + + onebox + A name or title by which a resource is known. + You must enter a title for this item. + + + + + + dc + publisher + + false + + onebox + The name of the entity that holds, archives, publishes prints, distributes, releases, + issues, or produces the resource. + + + + dc + date + issued + false + + date + The year when the data was or will be made publicly available. + You must enter a publication year for this item. + + + + + + + dc + type + + false + + complex + + You must enter a resource type for this item. + + +
+ + +
dc @@ -85,15 +129,9 @@ author true - clarin-name + onebox Enter the author's name (Family name, Given names). - @@ -166,7 +204,6 @@ ispartofseries true - Technical Report series Enter the series and number assigned to this item by your community. @@ -215,56 +252,6 @@ - - - local - hasCMDI - true - - list - Are you going to upload cmdi file? - - - policy=deny,action=read,grantee-type=user,grantee-id=* - - - - - - local - hidden - - true - - - list - Should item be harvestable thru OAI-PMH but behave like private? - - - policy=deny,action=read,grantee-type=user,grantee-id=* - - - - - - local - bitstream - redirectToURL - false - - onebox - - The actual maximum upload size of the file is 4GB. To upload the file bigger than maximum - upload size type the URL of that big file. Admin must know URL to that bitstream file. - Then click on the 'Save' button and the file will start to upload. The file will be loaded - from the '/temp' folder of the server. Example: /tomcat/temp/bitstream.png - - - - policy=deny,action=read,grantee-type=user,grantee-id=* - - -
+ + Audiovisual + Audiovisual + + + Book + Book + + + Book Chapter + BookChapter + + + Collection + Collection + + + Computational Notebook + ComputationalNotebook + + + Conference Paper + ConferencePaper + + + Conference Proceeding + ConferenceProceeding + + + Data Paper + DataPaper + + + Dataset + Dataset + + + Dissertation + Dissertation + + + Event + Event + + + Image + Image + + + Interactive Resource + InteractiveResource + + + Journal + Journal + + + Journal Article + JournalArticle + + + Model + Model + + + Output Management Plan + OutputManagementPlan + + + Peer Review + PeerReview + + + Physical Object + PhysicalObject + + + Preprint + Preprint + + + Report + Report + + + Service + Service + + + Software + Software + + + Sound + Sound + + + Standard + Standard + + + Text + Text + + + Workflow + Workflow + + + Other + Other + + @@ -2126,5 +2259,13 @@ + + + + + +