From 68663c726f2e462844d40acccf50b69a31eddfc1 Mon Sep 17 00:00:00 2001 From: qtamu Date: Mon, 26 Aug 2024 09:05:54 -0500 Subject: [PATCH 01/14] added new metadata fields for local types and Dublin Core --- .../config/registries/dublin-core-types.xml | 62 +++++++++++++++++++ dspace/config/registries/local-types.xml | 36 +++++++++++ 2 files changed, 98 insertions(+) diff --git a/dspace/config/registries/dublin-core-types.xml b/dspace/config/registries/dublin-core-types.xml index 1e46e85325c..25b076fe053 100644 --- a/dspace/config/registries/dublin-core-types.xml +++ b/dspace/config/registries/dublin-core-types.xml @@ -86,6 +86,68 @@ A person, organization, or service responsible for the content of the resource. Catch-all for unspecified contributors. + + + dc + contributor + member + ?? + + + + + + dc + creator + UIN + ?? + + + + + + dc + creator + pi + ?? + + + + + + dc + creator + copi + ?? + + + + + + dc + description + role + ?? + + + + + + dc + identifier + UIN + ?? + + + + + + dc + description + findingAid + ?? + + diff --git a/dspace/config/registries/local-types.xml b/dspace/config/registries/local-types.xml index 564fd235a57..a83eac58d2b 100644 --- a/dspace/config/registries/local-types.xml +++ b/dspace/config/registries/local-types.xml @@ -69,4 +69,40 @@ Email of the Project Data Access Contact + + + + local + awardNumber + + ?? + + + + + + local + projectStatus + + ?? + + + + + + local + contact + email + ?? + + + + + + local + contact + phone + ?? + + From 24fa765c97bfd4321dee6d20a01a780871a4cd9a Mon Sep 17 00:00:00 2001 From: qtamu Date: Wed, 28 Aug 2024 14:21:46 -0500 Subject: [PATCH 02/14] added the scope notes to the newly added metadata fields --- .../config/registries/dublin-core-types.xml | 28 +++++++++---------- dspace/config/registries/local-types.xml | 22 +++++++-------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dspace/config/registries/dublin-core-types.xml b/dspace/config/registries/dublin-core-types.xml index 25b076fe053..e819c614b43 100644 --- a/dspace/config/registries/dublin-core-types.xml +++ b/dspace/config/registries/dublin-core-types.xml @@ -86,21 +86,21 @@ A person, organization, or service responsible for the content of the resource. Catch-all for unspecified contributors. - + dc contributor member - ?? + Use for name of TAMU department or institute that is home to the research project - + dc creator UIN - ?? + TAMU identifier of PI of a research project @@ -109,45 +109,45 @@ dc creator pi - ?? + Name of Principal Investigator on research project - + dc creator copi - ?? + Name of Co-Principal Investigator on research project - + dc description role - ?? + Describes the role of the PI on the research project - + dc identifier UIN - ?? + TAMU identifier of a PDAC - + dc description findingAid - ?? + A single-level description of extent, scope, and content of the research data associated with a research project. - + diff --git a/dspace/config/registries/local-types.xml b/dspace/config/registries/local-types.xml index a83eac58d2b..8718a4ac834 100644 --- a/dspace/config/registries/local-types.xml +++ b/dspace/config/registries/local-types.xml @@ -75,34 +75,34 @@ local awardNumber - ?? + Number identifying the individual grant that the sponsor awarded for the research project - + - + local projectStatus - ?? + Status of research project in Maestro - + - + local contact email - ?? + Email address of a PDAC - + - + local contact phone - ?? + Telephone number of a PDAC - + From fa0729d08f0c9019b6c8672735ab8a4e7ef6866c Mon Sep 17 00:00:00 2001 From: qtamu Date: Wed, 28 Aug 2024 14:50:25 -0500 Subject: [PATCH 03/14] corrected formatting issue --- dspace/config/registries/local-types.xml | 36 ++++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dspace/config/registries/local-types.xml b/dspace/config/registries/local-types.xml index 8718a4ac834..b061485d0f0 100644 --- a/dspace/config/registries/local-types.xml +++ b/dspace/config/registries/local-types.xml @@ -80,29 +80,29 @@ - - local - projectStatus - - Status of research project in Maestro - + + local + projectStatus + + Status of research project in Maestro + - - local - contact - email - Email address of a PDAC - + + local + contact + email + Email address of a PDAC + - - local - contact - phone - Telephone number of a PDAC - + + local + contact + phone + Telephone number of a PDAC + From c5fc543d50019d8764771841e63e6d26487df520 Mon Sep 17 00:00:00 2001 From: qtamu Date: Wed, 28 Aug 2024 15:00:40 -0500 Subject: [PATCH 04/14] a tag was out of file format --- dspace/config/registries/local-types.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dspace/config/registries/local-types.xml b/dspace/config/registries/local-types.xml index b061485d0f0..4e97911bc26 100644 --- a/dspace/config/registries/local-types.xml +++ b/dspace/config/registries/local-types.xml @@ -72,7 +72,7 @@ - local + local awardNumber Number identifying the individual grant that the sponsor awarded for the research project From 5af4cf56d890d7611ca93b3b6b9922e7be4a59a2 Mon Sep 17 00:00:00 2001 From: Jason Savell Date: Wed, 28 Aug 2024 15:16:43 -0500 Subject: [PATCH 05/14] update formatting for new fields --- dspace/config/registries/dublin-core-types.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dspace/config/registries/dublin-core-types.xml b/dspace/config/registries/dublin-core-types.xml index e819c614b43..f7f959e7f2e 100644 --- a/dspace/config/registries/dublin-core-types.xml +++ b/dspace/config/registries/dublin-core-types.xml @@ -88,7 +88,7 @@ - dc + dc contributor member Use for name of TAMU department or institute that is home to the research project @@ -97,7 +97,7 @@ - dc + dc creator UIN TAMU identifier of PI of a research project @@ -106,7 +106,7 @@ - dc + dc creator pi Name of Principal Investigator on research project @@ -115,7 +115,7 @@ - dc + dc creator copi Name of Co-Principal Investigator on research project @@ -124,7 +124,7 @@ - dc + dc description role Describes the role of the PI on the research project @@ -133,7 +133,7 @@ - dc + dc identifier UIN TAMU identifier of a PDAC @@ -142,7 +142,7 @@ - dc + dc description findingAid A single-level description of extent, scope, and content of the research data associated with a research project. From f02fa7f0b3f7ec637cf42bbe57a88f208203faab Mon Sep 17 00:00:00 2001 From: Jason Savell Date: Wed, 28 Aug 2024 15:19:19 -0500 Subject: [PATCH 06/14] update formatting for new fields in local-types --- dspace/config/registries/local-types.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dspace/config/registries/local-types.xml b/dspace/config/registries/local-types.xml index 4e97911bc26..7771da382b0 100644 --- a/dspace/config/registries/local-types.xml +++ b/dspace/config/registries/local-types.xml @@ -72,7 +72,7 @@ - local + local awardNumber Number identifying the individual grant that the sponsor awarded for the research project From 370a357c887fdcebd94f04d26005bd6e3038265f Mon Sep 17 00:00:00 2001 From: qtamu Date: Thu, 29 Aug 2024 14:18:19 -0500 Subject: [PATCH 07/14] add metadata fields that are to be hidden in a local cfg rdc file --- dspace/config/local.cfg.RDC | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 dspace/config/local.cfg.RDC diff --git a/dspace/config/local.cfg.RDC b/dspace/config/local.cfg.RDC new file mode 100644 index 00000000000..2afac8a7e6f --- /dev/null +++ b/dspace/config/local.cfg.RDC @@ -0,0 +1,21 @@ +##### Hide Item Metadata Fields ##### +##### TAMU Customization - Hidden metadata fields ##### +# Fields named here are hidden in the following places UNLESS the +# logged-in user is an Administrator: +# 1. REST API (and therefore UI) +# 2. RDF (every where as there is currently no possibility to authenticate) +# 3. OAI (every where as there is currently no possibility to authenticate) +# Attention: You need to rebuild the OAI SOLR index after every change of +# this property. Run [dspace-install]/bin/dspace oai import -c to do so. +# +# To designate a field as hidden, add a property here in the form: +# metadata.hide.SCHEMA.ELEMENT.QUALIFIER = true +# +# This default configuration hides the dc.description.provenance field, +# since that usually contains email addresses which ought to be kept +# private and is mainly of interest to administrators: +metadata.hide.dc.creator.UIN = true +metadata.hide.dc.identifier.UIN = true +metadata.hide.dc.description.findingAid = true + +# END TAMU Customization - hidden metadata fields \ No newline at end of file From 29989b50c1e7bb547cf7ebb4c2ec9d554a776fe6 Mon Sep 17 00:00:00 2001 From: qtamu Date: Tue, 3 Sep 2024 10:14:14 -0500 Subject: [PATCH 08/14] Add Research Project entitiy --- dspace/config/entities/relationship-types.xml | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dspace/config/entities/relationship-types.xml b/dspace/config/entities/relationship-types.xml index a188f527348..d6dbb5e542b 100644 --- a/dspace/config/entities/relationship-types.xml +++ b/dspace/config/entities/relationship-types.xml @@ -148,5 +148,49 @@ true + + Dataset + ResearchProject + isProjectThatProducedDataset + isDatasetProducedByProject + + 0 + 1 + + + 0 + + true + + + ResearchProject + PDAC + isPDACForProject + isProjectAssignedtoPDAC + + 0 + 1 + + + 0 + + true + + + + ResearchProject + PDAC + isPDACForReasearchProject + isReasearchProjectAssignedToPDAC + + 0 + 1 + + + 0 + + true + + From a59383de6d740e50662a7118b4597a327985d756 Mon Sep 17 00:00:00 2001 From: qtamu Date: Wed, 4 Sep 2024 14:39:11 -0500 Subject: [PATCH 09/14] updated relationships for research project --- dspace/config/entities/relationship-types.xml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/dspace/config/entities/relationship-types.xml b/dspace/config/entities/relationship-types.xml index d6dbb5e542b..153ccf4eea8 100644 --- a/dspace/config/entities/relationship-types.xml +++ b/dspace/config/entities/relationship-types.xml @@ -176,21 +176,5 @@ true - - - ResearchProject - PDAC - isPDACForReasearchProject - isReasearchProjectAssignedToPDAC - - 0 - 1 - - - 0 - - true - - From 7ddfe0cd6e10f0ebfecc2e8eee53ae2ac4442e8a Mon Sep 17 00:00:00 2001 From: Jason Savell Date: Thu, 5 Sep 2024 09:55:56 -0500 Subject: [PATCH 10/14] add virtual metadata for ResearchProject entity --- dspace/config/spring/api/virtual-metadata.xml | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dspace/config/spring/api/virtual-metadata.xml b/dspace/config/spring/api/virtual-metadata.xml index 640b66fa040..918c95a5647 100644 --- a/dspace/config/spring/api/virtual-metadata.xml +++ b/dspace/config/spring/api/virtual-metadata.xml @@ -25,6 +25,8 @@ + + @@ -40,6 +42,7 @@ + @@ -82,6 +85,33 @@ + + + + + + + + local.pdac.name + + + + , + + + + + + + + dc.identifier.uri + + + + + + + From 809e8614cf50c7b0b135c2597a9c1fa2a71ea8a5 Mon Sep 17 00:00:00 2001 From: Jason Savell Date: Thu, 5 Sep 2024 10:23:44 -0500 Subject: [PATCH 11/14] add PDAC custody tracking to Research Projects --- .../org/dspace/content/RelationshipServiceImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dspace/modules/additions/src/main/java/org/dspace/content/RelationshipServiceImpl.java b/dspace/modules/additions/src/main/java/org/dspace/content/RelationshipServiceImpl.java index fae76133afb..f564aef5440 100644 --- a/dspace/modules/additions/src/main/java/org/dspace/content/RelationshipServiceImpl.java +++ b/dspace/modules/additions/src/main/java/org/dspace/content/RelationshipServiceImpl.java @@ -9,6 +9,7 @@ import java.sql.SQLException; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -129,7 +130,6 @@ public Relationship create(Context context, Relationship relationship) throws SQ Relationship relationshipToReturn = relationshipDAO.create(context, relationship); updatePlaceInRelationship(context, relationshipToReturn, null, null, true, true); update(context, relationshipToReturn); - //TAMU Customization - Track PDAC chain of custody for RDS updatePdacChainOfCustody(PdacActionType.ADD, relationship, context); //End TAMU Customization - Track PDAC chain of custody for RDS @@ -1135,15 +1135,16 @@ public int countByItemRelationshipTypeAndRelatedList(Context context, UUID focus // TAMU Customization - Track changes to PDAC custody via metadata protected void updatePdacChainOfCustody(PdacActionType pdacActionType, Relationship relationship, Context context) { - final String validLeftType = "isPDACForDataset"; - final String validRightType = "isDatasetAssignedToPDAC"; + final List validLeftTypes = Arrays.asList("isPDACForDataset", "isPDACForProject"); + final List validRightTypes = Arrays.asList("isDatasetAssignedToPDAC","isProjectAssignedtoPDAC"); final String mdSchema = MetadataSchemaEnum.DC.getName(); final String mdElement = "description"; final String mdQualifier = "chainOfCustody"; // verify that this is a pdac relationship - if (relationship.getRelationshipType().getLeftwardType().equals(validLeftType) - && relationship.getRelationshipType().getRightwardType().equals(validRightType)) { + if (validLeftTypes.contains(relationship.getRelationshipType().getLeftwardType()) + && validRightTypes.contains(relationship.getRelationshipType().getRightwardType())) { + final String mdLanguage = "en"; final String timeOfAction = java.time.format.DateTimeFormatter.ISO_DATE_TIME .format(java.time.LocalDateTime.now()); From d84d1dbae74d9b8fc355f411067e9bdef9ef66a0 Mon Sep 17 00:00:00 2001 From: qtamu Date: Tue, 10 Sep 2024 15:53:12 -0500 Subject: [PATCH 12/14] add missing part fo scope fo the findingAid metadata field. --- dspace/config/registries/dublin-core-types.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dspace/config/registries/dublin-core-types.xml b/dspace/config/registries/dublin-core-types.xml index f7f959e7f2e..b28f67836bb 100644 --- a/dspace/config/registries/dublin-core-types.xml +++ b/dspace/config/registries/dublin-core-types.xml @@ -145,7 +145,10 @@ dc description findingAid - A single-level description of extent, scope, and content of the research data associated with a research project. + A single-level description of extent, scope, and content of the research data associated with a research project. For more details on archival practices, refer to the following resources: + - Extent + - Scope and Content + From d172290bc68328fd8fdc18ebe10f0f659860322b Mon Sep 17 00:00:00 2001 From: qtamu Date: Wed, 11 Sep 2024 09:11:20 -0500 Subject: [PATCH 13/14] updated scope of findingAid --- dspace/config/registries/dublin-core-types.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dspace/config/registries/dublin-core-types.xml b/dspace/config/registries/dublin-core-types.xml index b28f67836bb..68a6abac12c 100644 --- a/dspace/config/registries/dublin-core-types.xml +++ b/dspace/config/registries/dublin-core-types.xml @@ -145,9 +145,7 @@ dc description findingAid - A single-level description of extent, scope, and content of the research data associated with a research project. For more details on archival practices, refer to the following resources: - - Extent - - Scope and Content + A single-level description of extent, scope, and content of the research data associated with a research project. For more details on archival practices, refer to the following resources: [extent](https://saa-ts-dacs.github.io/dacs/06_part_I/03_chapter_02/05_extent.html "Extent"), [Scope-and-Content](https://saa-ts-dacs.github.io/dacs/06_part_I/04_chapter_03/01_scope_and_content.html "Scope and Content") From 5557b41e818f5253a8fd496975761258086dc229 Mon Sep 17 00:00:00 2001 From: qtamu Date: Wed, 11 Sep 2024 10:53:52 -0500 Subject: [PATCH 14/14] Added full finding aid scope note --- dspace/config/registries/dublin-core-types.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dspace/config/registries/dublin-core-types.xml b/dspace/config/registries/dublin-core-types.xml index 68a6abac12c..79a1943a577 100644 --- a/dspace/config/registries/dublin-core-types.xml +++ b/dspace/config/registries/dublin-core-types.xml @@ -145,8 +145,7 @@ dc description findingAid - A single-level description of extent, scope, and content of the research data associated with a research project. For more details on archival practices, refer to the following resources: [extent](https://saa-ts-dacs.github.io/dacs/06_part_I/03_chapter_02/05_extent.html "Extent"), [Scope-and-Content](https://saa-ts-dacs.github.io/dacs/06_part_I/04_chapter_03/01_scope_and_content.html "Scope and Content") - + A single-level description of extent, scope, and content of the research data associated with a research project. For more details on archival practices, refer to the following resources: Extent https://saa-ts-dacs.github.io/dacs/06_part_I/03_chapter_02/05_extent.html, and Scope-and-Content https://saa-ts-dacs.github.io/dacs/06_part_I/04_chapter_03/01_scope_and_content.html