diff --git a/Gemfile b/Gemfile index d092ef9d..4a690a32 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ ruby File.read('.ruby-version').strip gem 'awesome_print', '>=1.8.0' gem 'base64' gem 'berkeley_library-docker', '~> 0.2.0' -gem 'berkeley_library-location', '~> 4.1.0' +gem 'berkeley_library-location', '~> 4.2.0' gem 'berkeley_library-logging', '~> 0.2', '>= 0.2.7' gem 'berkeley_library-marc', '~> 0.3.1' gem 'berkeley_library-tind', '~> 0.8.0' diff --git a/Gemfile.lock b/Gemfile.lock index dcfbc325..c310cd5b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,7 +81,7 @@ GEM berkeley_library-util (~> 0.1, >= 0.1.2) nokogiri (~> 1.13, >= 1.13.6) berkeley_library-docker (0.2.0) - berkeley_library-location (4.1.0) + berkeley_library-location (4.2.0) berkeley_library-logging (~> 0.2) berkeley_library-util (~> 0.1, >= 0.1.9) jsonpath (~> 0.5.8) @@ -198,7 +198,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - json (2.6.2) + json (2.7.2) jsonpath (0.5.8) multi_json jwt (1.5.6) @@ -233,7 +233,7 @@ GEM mime-types-data (3.2025.0722) mini_mime (1.1.5) minitest (5.25.5) - multi_json (1.15.0) + multi_json (1.19.1) mutex_m (0.3.0) net-imap (0.5.9) date @@ -252,8 +252,6 @@ GEM racc (~> 1.4) nokogiri (1.18.9-arm64-darwin) racc (~> 1.4) - nokogiri (1.18.9-x86_64-darwin) - racc (~> 1.4) nokogiri (1.18.9-x86_64-linux-gnu) racc (~> 1.4) oj (3.16.11) @@ -335,7 +333,7 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.4.1) + rexml (3.4.4) roo (2.9.0) nokogiri (~> 1) rubyzip (>= 1.3.0, < 3.0.0) @@ -396,9 +394,9 @@ GEM ruby-prof (1.3.2) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - rubyXL (3.4.33) + rubyXL (3.4.34) nokogiri (>= 1.10.8) - rubyzip (>= 1.3.0) + rubyzip (~> 2.4) rubyzip (2.4.1) sassc (2.4.0) ffi (~> 1.9) @@ -463,19 +461,15 @@ GEM zeitwerk (2.7.3) PLATFORMS - aarch64-linux - arm64-darwin-21 + aarch64-linux-gnu arm64-darwin-23 - arm64-darwin-24 - x86_64-darwin-19 - x86_64-darwin-21 x86_64-linux DEPENDENCIES awesome_print (>= 1.8.0) base64 berkeley_library-docker (~> 0.2.0) - berkeley_library-location (~> 4.1.0) + berkeley_library-location (~> 4.2.0) berkeley_library-logging (~> 0.2, >= 0.2.7) berkeley_library-marc (~> 0.3.1) berkeley_library-tind (~> 0.8.0) @@ -533,7 +527,7 @@ DEPENDENCIES webmock RUBY VERSION - ruby 3.3.8p144 + ruby 3.3.10p183 BUNDLED WITH - 2.5.22 + 2.5.3 diff --git a/app/controllers/location_requests_controller.rb b/app/controllers/location_requests_controller.rb index 5cf5c439..9014b68a 100644 --- a/app/controllers/location_requests_controller.rb +++ b/app/controllers/location_requests_controller.rb @@ -4,7 +4,7 @@ class LocationRequestsController < ApplicationController before_action :require_framework_admin!, only: %i[immediate index] REQUIRED_PARAMS = %i[email input_file].freeze - OPTIONAL_PARAMS = %i[rlf uc hathi immediate].freeze + OPTIONAL_PARAMS = %i[slf uc hathi immediate].freeze ALL_PARAMS = (REQUIRED_PARAMS + OPTIONAL_PARAMS) # GET /location_requests diff --git a/app/models/location_request.rb b/app/models/location_request.rb index 81e98927..ad2adecc 100644 --- a/app/models/location_request.rb +++ b/app/models/location_request.rb @@ -117,7 +117,7 @@ def ensure_admin_if_immediate(request, user:) # Synthetic accessors def world_cat? - rlf? || uc? + slf? || uc? end def incomplete? @@ -207,7 +207,7 @@ def search_wc_symbols return unless world_cat? [].tap do |symbols| - symbols.concat(BerkeleyLibrary::Location::WorldCat::Symbols::RLF) if rlf? + symbols.concat(BerkeleyLibrary::Location::WorldCat::Symbols::SLF) if slf? symbols.concat(BerkeleyLibrary::Location::WorldCat::Symbols::UC) if uc? end end @@ -249,7 +249,7 @@ def with_uploaded_input_file def options_selected return if world_cat? || hathi? - errors.add(:base, 'At least one of RLF, Other UC, or HathiTrust must be selected') + errors.add(:base, 'At least one of SLF, Other UC, or HathiTrust must be selected') end def new_result(oclc_number, wc_sym_str, wc_error, ht_record_url, ht_error) @@ -269,7 +269,7 @@ def write_output_file! end def write_results_to(ss) - writer = XLSXWriter.new(ss, rlf:, uc:, hathi_trust: hathi) + writer = XLSXWriter.new(ss, slf:, uc:, hathi_trust: hathi) result_data = location_records.pluck(*RESULT_ARGS) result_data.each { |row| writer << new_result(*row) } end diff --git a/app/views/fees/_nonberk_instructions.html.erb b/app/views/fees/_nonberk_instructions.html.erb index 1a322868..96ee3b7d 100644 --- a/app/views/fees/_nonberk_instructions.html.erb +++ b/app/views/fees/_nonberk_instructions.html.erb @@ -13,7 +13,7 @@ - UC Los Angeles, including SRLF + UC Los Angeles, including SLF-S yrl-circ@library.ucla.edu diff --git a/app/views/location_requests/_form.html.erb b/app/views/location_requests/_form.html.erb index 385f7614..879d8fe8 100644 --- a/app/views/location_requests/_form.html.erb +++ b/app/views/location_requests/_form.html.erb @@ -53,13 +53,13 @@ Include