From 84d67b109563d7e419593e3f412d0be72ade06d0 Mon Sep 17 00:00:00 2001
From: ppound <paul.pound@gmail.com>
Date: Thu, 24 Feb 2022 13:22:27 -0400
Subject: [PATCH] fix issues that occured on deployment to test server mostly
 current path related

---
 modules/roblib_search_eds/js/eds_results_article.js | 2 +-
 modules/roblib_search_eds/js/eds_results_book.js    | 2 +-
 modules/roblib_search_eds/src/Lib/EBSCOResponse.php | 4 ++--
 modules/solr_site/js/solr_site_results.js           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/roblib_search_eds/js/eds_results_article.js b/modules/roblib_search_eds/js/eds_results_article.js
index adb09a8..c40a81a 100644
--- a/modules/roblib_search_eds/js/eds_results_article.js
+++ b/modules/roblib_search_eds/js/eds_results_article.js
@@ -1,7 +1,7 @@
 Drupal.behaviors.roblib_search_eds_articles = {
     attach: function (context, settings) {
         if (context == document) {
-            $query = $current_path.replace('roblib_search/', '');
+            $query = drupalSettings.path.currentPath.replace('roblib_search/', '');
             $url = settings.eds_article_search_url + $query;
             profile = settings.eds_article_profile;
             proxy_url = "https://proxy.library.upei.ca/login?url=";
diff --git a/modules/roblib_search_eds/js/eds_results_book.js b/modules/roblib_search_eds/js/eds_results_book.js
index 38710f2..a4d01a4 100644
--- a/modules/roblib_search_eds/js/eds_results_book.js
+++ b/modules/roblib_search_eds/js/eds_results_book.js
@@ -1,7 +1,7 @@
 Drupal.behaviors.roblib_search_eds = {
     attach: function (context, settings) {
         if (context == document) {
-            $query = $current_path.replace('roblib_search/', '');
+            $query = drupalSettings.path.currentPath.replace('roblib_search/', '');
             $url = settings.eds_book_search_url + $query;
             profile = settings.eds_book_profile;
             proxy_url = "https://proxy.library.upei.ca/login?url=";
diff --git a/modules/roblib_search_eds/src/Lib/EBSCOResponse.php b/modules/roblib_search_eds/src/Lib/EBSCOResponse.php
index 93d08e8..0d8ca33 100644
--- a/modules/roblib_search_eds/src/Lib/EBSCOResponse.php
+++ b/modules/roblib_search_eds/src/Lib/EBSCOResponse.php
@@ -1016,7 +1016,7 @@ class EBSCOResponse
             $data = preg_replace('/<\/searchLink>>/', '</searchLink>', $data);
 
             // Parse searchLinks.
-            if (!empty($group)) {
+           /* if (!empty($group)) {
                 $group = strtolower($group);
                 if (in_array($group, $allowed_searchlink_groups)) {
                     $type = $xml_to_search_types[$group];
@@ -1026,7 +1026,7 @@ class EBSCOResponse
                     $data = preg_replace($link_xml, $link_html, $data);
                     $data = str_replace('</searchLink>', '</a>', $data);
                 }
-            }
+            }*/
             
             // Parse link
             if (!empty($group) && in_array($group, $allowed_link_groups)) {
diff --git a/modules/solr_site/js/solr_site_results.js b/modules/solr_site/js/solr_site_results.js
index 06720b5..9e2f9a5 100644
--- a/modules/solr_site/js/solr_site_results.js
+++ b/modules/solr_site/js/solr_site_results.js
@@ -1,7 +1,7 @@
 Drupal.behaviors.roblib_search_solr_site_results = {
     attach: function (context, settings) {
         if (context == document) {
-            query = $current_path.replace('roblib_search/', '');
+            query = drupalSettings.path.currentPath.replace('roblib_search/', '');
             solrUrl = settings.solr_site_search_url + query;
             baseUrl = settings.solr_site_base_url + query;
              jQuery.getJSON(baseUrl, function (data) {