More proxy prefix settings to fix up.

mlibrary · Oct 27, 2023 · c21bb85 · c21bb85
1 parent 3a0b6ea
commit c21bb85
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 19 deletions.
diff --git a/config/fields.yml b/config/fields.yml
@@ -3972,7 +3972,7 @@
   headings: [ 'Action', 'Description' ]
   link_text: Go to item
   openurl_root: https://mgetit.lib.umich.edu/resolve
-  proxy_prefix: https://proxy.lib.umich.edu/login?url=
+  proxy_prefix: https://proxy.lib.umich.edu/login?qurl=
 
 - id: retracted
   metadata:

diff --git a/local-gems/spectrum-config/lib/spectrum/config/filter.rb b/local-gems/spectrum-config/lib/spectrum/config/filter.rb
@@ -60,7 +60,7 @@ def add_prefix(prefix, value)
         return value unless value
         return value if value.include?('proxy.lib.umich.edu')
         return value if value.include?('libproxy.umflint.edu')
-        prefix + value
+        prefix + URI::encode_www_form_component(value)
       end
 
       def <=>(other)

diff --git a/local-gems/spectrum-config/lib/spectrum/config/primo_resource_access_field.rb b/local-gems/spectrum-config/lib/spectrum/config/primo_resource_access_field.rb
@@ -48,7 +48,7 @@ def value(data, request = nil)
         extra_headings = []
 
         url = if data.link_to_resource?
-          "#{proxy_prefix}#{data.link_to_resource}"
+          proxy_prefix + URI::encode_www_form_component(data.link_to_resource)
         else
           "#{openurl_root}?#{data.openurl}"
         end

diff --git a/local-gems/spectrum-config/lib/spectrum/config/primo_times_cited_field.rb b/local-gems/spectrum-config/lib/spectrum/config/primo_times_cited_field.rb
@@ -25,7 +25,7 @@ def value(data, request = nil)
             hsh['text']  = "#{field['name']}: #{count}"
             if (href = [data.src[field['href']]].flatten.first)
               hsh['href'] = if request.respond_to?(:proxy_prefix)
-                request.proxy_prefix + href
+                request.proxy_prefix + URI::encode_www_form_component(href)
               else
                 href
               end

diff --git a/local-gems/spectrum-config/lib/spectrum/config/times_cited2_field.rb b/local-gems/spectrum-config/lib/spectrum/config/times_cited2_field.rb
@@ -23,7 +23,7 @@ def value(data, request = nil)
             hsh['text']  = "#{field['name']}: #{count}"
             if (href = [data.src[field['href']]].flatten.first)
               hsh['href'] = if request.respond_to?(:proxy_prefix)
-                request.proxy_prefix + href
+                request.proxy_prefix + URI::encode_www_form_component(href)
               else
                 href
               end

diff --git a/local-gems/spectrum-config/lib/spectrum/config/times_cited_field.rb b/local-gems/spectrum-config/lib/spectrum/config/times_cited_field.rb
@@ -22,7 +22,7 @@ def value(data, request = nil)
         fields.map do |field|
           if (count = [data.src[field['count']]].flatten.first)
             if (href = [data.src[field['href']]].flatten.first)
-              href = request.proxy_prefix + href if request
+              href = request.proxy_prefix + URI::encode_www_form_component(href) if request
               "#{encoder.encode(field['name'])}: <a href='#{encoder.encode(href)}'>#{encoder.encode(count)}</a>"
             else
               "#{encoder.encode(field['name'])}: #{encoder.encode(count)}"

diff --git a/local-gems/spectrum-json/lib/spectrum/request/email.rb b/local-gems/spectrum-json/lib/spectrum/request/email.rb
@@ -4,8 +4,8 @@ module Spectrum
   module Request
     class Email
       FLINT = "Flint"
-      FLINT_PROXY_PREFIX = "http://libproxy.umflint.edu:2048/login?url="
-      DEFAULT_PROXY_PREFIX = "https://proxy.lib.umich.edu/login?url="
+      FLINT_PROXY_PREFIX = "http://libproxy.umflint.edu:2048/login?qurl="
+      DEFAULT_PROXY_PREFIX = "https://proxy.lib.umich.edu/login?qurl="
       INSTITUTION_KEY = "dlpsInstitutionId"
 
       def proxy_prefix

diff --git a/local-gems/spectrum-json/lib/spectrum/request/file.rb b/local-gems/spectrum-json/lib/spectrum/request/file.rb
@@ -4,8 +4,8 @@ module Spectrum
   module Request
     class File
       FLINT = 'Flint'
-      FLINT_PROXY_PREFIX = 'http://libproxy.umflint.edu:2048/login?url='
-      DEFAULT_PROXY_PREFIX = 'https://proxy.lib.umich.edu/login?url='
+      FLINT_PROXY_PREFIX = 'http://libproxy.umflint.edu:2048/login?qurl='
+      DEFAULT_PROXY_PREFIX = 'https://proxy.lib.umich.edu/login?qurl='
       INSTITUTION_KEY = 'dlpsInstitutionId'
 
       def proxy_prefix

diff --git a/local-gems/spectrum-json/lib/spectrum/request/null.rb b/local-gems/spectrum-json/lib/spectrum/request/null.rb
@@ -4,7 +4,7 @@ module Spectrum
   module Request
     class Null
       def proxy_prefix
-        'https://proxy.lib.umich.edu/login?url='
+        'https://proxy.lib.umich.edu/login?qurl='
       end
 
       def messages

diff --git a/local-gems/spectrum-json/lib/spectrum/request/profile.rb b/local-gems/spectrum-json/lib/spectrum/request/profile.rb
@@ -4,10 +4,10 @@ module Spectrum
   module Request
     class Profile
       FLINT = "Flint"
-      FLINT_PROXY = "https://login.libproxy.umflint.edu/login?url="
+      FLINT_PROXY = "https://login.libproxy.umflint.edu/login?qurl="
       DEARBORN = "Dearborn"
       DEARBORN_PROXY = "https://library.umd.umich.edu/verify/fwd.php?"
-      ANN_ARBOR_PROXY = "https://proxy.lib.umich.edu/login?url="
+      ANN_ARBOR_PROXY = "https://proxy.lib.umich.edu/login?qurl="
       DEFAULT_DOMAIN = "@umich.edu"
       LOGGED_IN = "Logged in"
       NOT_LOGGED_IN = "Not logged in"

diff --git a/local-gems/spectrum-json/lib/spectrum/request/record.rb b/local-gems/spectrum-json/lib/spectrum/request/record.rb
@@ -5,8 +5,8 @@ module Request
     class Record
 
       FLINT = 'Flint'
-      FLINT_PROXY_PREFIX = 'http://libproxy.umflint.edu:2048/login?url='
-      DEFAULT_PROXY_PREFIX = 'https://proxy.lib.umich.edu/login?url='
+      FLINT_PROXY_PREFIX = 'http://libproxy.umflint.edu:2048/login?qurl='
+      DEFAULT_PROXY_PREFIX = 'https://proxy.lib.umich.edu/login?qurl='
       INSTITUTION_KEY = 'dlpsInstitutionId'
 
       def proxy_prefix

diff --git a/local-gems/spectrum-json/lib/spectrum/request/requesty.rb b/local-gems/spectrum-json/lib/spectrum/request/requesty.rb
@@ -8,8 +8,8 @@ module Requesty
       extend ActiveSupport::Concern
 
       FLINT                = 'Flint'
-      FLINT_PROXY_PREFIX   = 'http://libproxy.umflint.edu:2048/login?url='
-      DEFAULT_PROXY_PREFIX = 'https://proxy.lib.umich.edu/login?url='
+      FLINT_PROXY_PREFIX   = 'http://libproxy.umflint.edu:2048/login?qurl='
+      DEFAULT_PROXY_PREFIX = 'https://proxy.lib.umich.edu/login?qurl='
       INSTITUTION_KEY      = 'dlpsInstitutionId'
 
       included do

diff --git a/local-gems/spectrum-json/lib/spectrum/request/text.rb b/local-gems/spectrum-json/lib/spectrum/request/text.rb
@@ -4,8 +4,8 @@ module Spectrum
   module Request
     class Text
       FLINT = "Flint"
-      FLINT_PROXY_PREFIX = "http://libproxy.umflint.edu:2048/login?url="
-      DEFAULT_PROXY_PREFIX = "https://proxy.lib.umich.edu/login?url="
+      FLINT_PROXY_PREFIX = "http://libproxy.umflint.edu:2048/login?qurl="
+      DEFAULT_PROXY_PREFIX = "https://proxy.lib.umich.edu/login?qurl="
       INSTITUTION_KEY = "dlpsInstitutionId"
 
       def proxy_prefix