From 8e7b2ef8583983f268a0854cb49f76e349d610f7 Mon Sep 17 00:00:00 2001 From: Tatiana Smirnova Date: Wed, 6 Nov 2024 00:11:06 +0100 Subject: [PATCH 1/2] fix: NOP-39 ARCE OAI: fix issue with duplicate "domainTopic" entries (#1172) --- app/models/concerns/mods_arce_solr_document.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/models/concerns/mods_arce_solr_document.rb b/app/models/concerns/mods_arce_solr_document.rb index ad2742e45..e31d4a5ee 100644 --- a/app/models/concerns/mods_arce_solr_document.rb +++ b/app/models/concerns/mods_arce_solr_document.rb @@ -170,12 +170,15 @@ def to_mods_arce if topic_geographic.any? { |topic_geographic_key| self[topic_geographic_key].present? } xml['mods'].subject do self[:named_subject_tesim]&.each { |value| xml['mods'].name { xml['mods'].namePart value.to_s } } - filtered_topic_array = self[:subject_topic_tesim]&.reject { |item| self[:subject_cultural_object_tesim]&.include?(item) } + + mods_with_topic = [:subject_cultural_object_tesim, :subject_domain_topic_tesim].map { |name| self[name] || [] }.flatten + filtered_topic_array = self[:subject_topic_tesim]&.reject { |item| mods_with_topic.include?(item) } filtered_topic_array&.each { |value| xml['mods'].topic value.to_s } + self[:subject_temporal_tesim]&.each { |value| xml['mods'].temporal value.to_s } self[:subject_cultural_object_tesim]&.each { |value| xml['mods'].topic({ type: 'culturalObject' }, value.to_s) } self[:subject_domain_topic_tesim]&.each { |value| xml['mods'].topic({ type: 'domainTopic' }, value.to_s) } - self[:subject_geographic_tesim]&.each { |value| xml['mods']. geographic value.to_s } + self[:subject_geographic_tesim]&.each { |value| xml['mods'].geographic value.to_s } if self[:geographic_coordinates_ssim] # 95 xml['mods'].cartographics do # From 15c265627731e4a9dcc3f6490c8d001cb197b5fb Mon Sep 17 00:00:00 2001 From: Tatiana Smirnova Date: Wed, 13 Nov 2024 22:13:18 +0100 Subject: [PATCH 2/2] feat: NOP-48 Update copy on static page "Copyright and Collections" (#1177) --- app/views/static/ursus_copyright.html.erb | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/app/views/static/ursus_copyright.html.erb b/app/views/static/ursus_copyright.html.erb index 7c91f2603..79aa48635 100644 --- a/app/views/static/ursus_copyright.html.erb +++ b/app/views/static/ursus_copyright.html.erb @@ -8,7 +8,7 @@ <%= t('static_pages.copyright_and_collections.permission_to_publish').upcase %>
- The UCLA Digital Library does not handle requests for reproductions or permissions to publish. All requests for reproductions or permissions to publish should be directed to the item's holding repository. In most cases, the owning repository is the UCLA Library Special Collections unit. Users can find information on requesting reproductions, as well as the "Request to Publish Form" on the "Special Collections Reproductions" page, or you can email askLSC@library.ucla.edu. + The UCLA Digital Library does not handle requests for reproductions or permissions to publish. All requests for reproductions or permissions to publish should be directed to the item's holding repository. In most cases, the owning repository is the UCLA Library Special Collections unit. Users can find information on requesting reproductions, as well as the "Request to Publish Form" on the "Special Collections Reproductions" page, or you can email askLSC@library.ucla.edu.
@@ -16,19 +16,24 @@
<%= t('static_pages.copyright_and_collections.copyright_statement').upcase %>
-
+
+

Materials in this collection may be protected by domestic and/or international copyright and property laws. Distribution or reproduction of copyrighted materials beyond that allowed by fair use requires the written permission of the copyright owners. To the extent that restrictions other than copyright apply, permission for distribution or reproduction from the applicable rights holder is also required. Responsibility for obtaining permission, and for any use, rests exclusively with the user. -

+

+

+ Please also see "UCLA Library Copyright Policies" for more information. +

+
<%= t('static_pages.copyright_and_collections.opt_out_procedure').upcase %>
-
- Your content helps us fulfill the UCLA Library mission of preserving and providing access to important cultural, political, and public health records. We urge you to let us preserve and make it available and accessible.

+
+ Your content helps us fulfill the UCLA Library mission of preserving and providing access to important cultural, political, and public health records. We urge you to let us preserve and make it available and accessible.

- If your material has been included in our digital collections, you can request that we limit its public access. We ask that you consider this option very carefully. Should you decide that your content should be removed from our pages, we will continue to preserve it. For more information, contact: copyright@library.ucla.edu. -
+ If your material has been included in our digital collections, you can request that we limit its public access. We ask that you consider this option very carefully. Should you decide that your content should be removed from our pages, we will continue to preserve it. For more information, contact: copyright@library.ucla.edu. +