Browse Source

fix issues that occured on deployment to test server mostly current path related

d9
ppound 3 years ago
parent
commit
84d67b1095
  1. 2
      modules/roblib_search_eds/js/eds_results_article.js
  2. 2
      modules/roblib_search_eds/js/eds_results_book.js
  3. 4
      modules/roblib_search_eds/src/Lib/EBSCOResponse.php
  4. 2
      modules/solr_site/js/solr_site_results.js

2
modules/roblib_search_eds/js/eds_results_article.js

@ -1,7 +1,7 @@
Drupal.behaviors.roblib_search_eds_articles = { Drupal.behaviors.roblib_search_eds_articles = {
attach: function (context, settings) { attach: function (context, settings) {
if (context == document) { if (context == document) {
$query = $current_path.replace('roblib_search/', ''); $query = drupalSettings.path.currentPath.replace('roblib_search/', '');
$url = settings.eds_article_search_url + $query; $url = settings.eds_article_search_url + $query;
profile = settings.eds_article_profile; profile = settings.eds_article_profile;
proxy_url = "https://proxy.library.upei.ca/login?url="; proxy_url = "https://proxy.library.upei.ca/login?url=";

2
modules/roblib_search_eds/js/eds_results_book.js

@ -1,7 +1,7 @@
Drupal.behaviors.roblib_search_eds = { Drupal.behaviors.roblib_search_eds = {
attach: function (context, settings) { attach: function (context, settings) {
if (context == document) { if (context == document) {
$query = $current_path.replace('roblib_search/', ''); $query = drupalSettings.path.currentPath.replace('roblib_search/', '');
$url = settings.eds_book_search_url + $query; $url = settings.eds_book_search_url + $query;
profile = settings.eds_book_profile; profile = settings.eds_book_profile;
proxy_url = "https://proxy.library.upei.ca/login?url="; proxy_url = "https://proxy.library.upei.ca/login?url=";

4
modules/roblib_search_eds/src/Lib/EBSCOResponse.php

@ -1016,7 +1016,7 @@ class EBSCOResponse
$data = preg_replace('/<\/searchLink>>/', '</searchLink>', $data); $data = preg_replace('/<\/searchLink>>/', '</searchLink>', $data);
// Parse searchLinks. // Parse searchLinks.
if (!empty($group)) { /* if (!empty($group)) {
$group = strtolower($group); $group = strtolower($group);
if (in_array($group, $allowed_searchlink_groups)) { if (in_array($group, $allowed_searchlink_groups)) {
$type = $xml_to_search_types[$group]; $type = $xml_to_search_types[$group];
@ -1026,7 +1026,7 @@ class EBSCOResponse
$data = preg_replace($link_xml, $link_html, $data); $data = preg_replace($link_xml, $link_html, $data);
$data = str_replace('</searchLink>', '</a>', $data); $data = str_replace('</searchLink>', '</a>', $data);
} }
} }*/
// Parse link // Parse link
if (!empty($group) && in_array($group, $allowed_link_groups)) { if (!empty($group) && in_array($group, $allowed_link_groups)) {

2
modules/solr_site/js/solr_site_results.js

@ -1,7 +1,7 @@
Drupal.behaviors.roblib_search_solr_site_results = { Drupal.behaviors.roblib_search_solr_site_results = {
attach: function (context, settings) { attach: function (context, settings) {
if (context == document) { if (context == document) {
query = $current_path.replace('roblib_search/', ''); query = drupalSettings.path.currentPath.replace('roblib_search/', '');
solrUrl = settings.solr_site_search_url + query; solrUrl = settings.solr_site_search_url + query;
baseUrl = settings.solr_site_base_url + query; baseUrl = settings.solr_site_base_url + query;
jQuery.getJSON(baseUrl, function (data) { jQuery.getJSON(baseUrl, function (data) {

Loading…
Cancel
Save