Merge branch '25.01.00' into 25.02.00

Aspen-Discovery · Jan 14, 2025 · 388b45b · 388b45b
2 parents 5e2be0f + 68ec744
commit 388b45b
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 22 deletions.
diff --git a/code/web/RecordDrivers/CloudLibraryRecordDriver.php b/code/web/RecordDrivers/CloudLibraryRecordDriver.php
@@ -169,7 +169,7 @@ public function getMoreDetailsOptions() {
 		return $this->filterAndSortMoreDetailsOptions($moreDetailsOptions);
 	}
 
-	protected $_actions = null;
+	protected ?array $_actions = null;
 
 	public function getRecordActions($relatedRecord, $variationId, $isAvailable, $isHoldable, $volumeData = null) : array {
 		if ($this->_actions === null) {

diff --git a/code/web/RecordDrivers/MarcRecordDriver.php b/code/web/RecordDrivers/MarcRecordDriver.php
@@ -1040,7 +1040,7 @@ function getRecordUrl() {
 		return "/" . $this->getModule() . "/$recordId";
 	}
 
-	protected array $_actions = [];
+	protected ?array $_actions = [];
 
 	public function getRecordActions($relatedRecord, $variationId, $isAvailable, $isHoldable, $volumeData = null) : array {
 		require_once ROOT_DIR . '/RecordDrivers/RecordActionGenerator.php';

diff --git a/code/web/release_notes/25.01.00.MD b/code/web/release_notes/25.01.00.MD
@@ -34,8 +34,8 @@
 ### Boundless/Axis360 Updates
 - Update Boundless/Axis360 get records availability API URL and adjusted response processing (DIS-162) (*YL*)
 
-### Hoopla Updates
-- Optimize Hoopla daily indexing behavior and set "Index By Day" as a default setting. (DIS-180) (*YL*)
+### CloudLibrary Updates
+- Correct loading actions for CloudLibrary records. (*MDN*)
 
 ### Docker Updates
 - Check if ils tables have been initialized to avoid database conflicts. (*LM*)
@@ -50,6 +50,9 @@
 - Allow patron to select sublocation, if available, when updating a hold's pickup location. (DIS-48) (*KK*)
 - On the Holds page if a pickup sublocation set for a hold, display the sublocation. (DIS-48) (*KK*)
 
+### Hoopla Updates
+- Optimize Hoopla daily indexing behavior and set "Index By Day" as a default setting. (DIS-180) (*YL*)
+
 ### Indexing Updates
 - When indexing the 100, 700 and 800 fields to load information about authors and contributors include subfield c to distinguish between authors where titles and additional information is important. (DIS-161) (*MDN*)
 - When checking for Yoto players, check to be sure yoto is found with word boundaries on either side to avoid matching Kyoto. (DIS-154) (*MDN*)
@@ -71,6 +74,8 @@
     - if the results from the LibKey API indicate an article has been retracted, they are marked as such. (*CZ*)
     - for retracted articles, a link to a LibKey page giving information on the retraction is displayed. (*CZ*)
     - for retracted articles, the 'Access Online' button is not displayed. (*CZ*)
+    - fixed an issue where the LibKey integration would prevent EBSCO host records from appearing due to a control flow issue. (*CZ*)
+    - fixed an issue where the LibKey integration would overwrite retraction notices for EBSCO EDS records. (*CZ*)
 
 ### Local ILL Updates
 - Properly handle volume level holds with Local ILL. (DIS-34) (*MDN*)

diff --git a/code/web/sys/SearchObject/EbscoEdsSearcher.php b/code/web/sys/SearchObject/EbscoEdsSearcher.php
@@ -312,21 +312,23 @@ public function getResultRecordHTML() {
 				$interface->assign('resultIndex', $x + 1 + (($this->page - 1) * $this->limit));
 				if (Library::getActiveLibrary()->libKeySettingId != -1 && !empty($this->lastSearchResults->Data->Records[$x]->RecordInfo->BibRecord->BibEntity->Identifiers)) {
 					foreach ($this->lastSearchResults->Data->Records[$x]->RecordInfo->BibRecord->BibEntity->Identifiers as $ui) {
-						if ($ui->Type == "doi") {
-							$libKeyResult =  $this->getLibKeyResult($ui->Value);
-							if (isset($libKeyResult['data']['retractionNoticeUrl'])) {
-								$interface->assign('libKeyUrl', $libKeyResult['data']['retractionNoticeUrl']);
-								$interface->assign('retracted', true);
-								break;
-							}
+						if ($ui->Type != "doi") {
+							continue;
+						}
+						$libKeyResult =  $this->getLibKeyResult($ui->Value);
+						if (!$libKeyResult || !isset($libKeyResult['data'])) {
+							continue;
+						}
+						if (isset($libKeyResult['data']['retractionNoticeUrl'])) {
+							$interface->assign('libKeyUrl', $libKeyResult['data']['retractionNoticeUrl']);
+							$interface->assign('retracted', true);
+						} else {
 							$interface->assign('libKeyUrl', $libKeyResult["data"]["bestIntegratorLink"]["bestLink"]);
-							$interface->assign('libKeyCoverImageUrl', $libKeyResult['included'][0]['coverImageUrl']);
 							$interface->assign('retracted', false);
-							break;
+							$interface->assign('libKeyCoverImageUrl', $libKeyResult['included'][0]['coverImageUrl']);
 						}
 					}
 				}
-
 				require_once ROOT_DIR . '/RecordDrivers/EbscoRecordDriver.php';
 				$record = new EbscoRecordDriver($current);
 				if ($record->isValid()) {

diff --git a/code/web/sys/SearchObject/EbscohostSearcher.php b/code/web/sys/SearchObject/EbscohostSearcher.php
@@ -256,15 +256,16 @@ public function getResultRecordHTML() {
 				$interface->assign('resultIndex', $x + 1 + (($this->page - 1) * $this->limit));
 				if (Library::getActiveLibrary()->libKeySettingId != -1 && !empty($current->header->controlInfo->artinfo->ui)) {
 					$libKeyResult =  $this->getLibKeyResult($current->header->controlInfo->artinfo->ui);
-					if (isset($libKeyResult['data']['retractionNoticeUrl'])) {
-						$interface->assign('libKeyUrl', $libKeyResult['data']['retractionNoticeUrl']);
-						$interface->assign('retracted', true);
-						break;
+					if ($libKeyResult && isset($libKeyResult['data'])) {
+						if (isset($libKeyResult['data']['retractionNoticeUrl'])) {
+							$interface->assign('libKeyUrl', $libKeyResult['data']['retractionNoticeUrl']);
+							$interface->assign('retracted', true);
+						} else {
+							$interface->assign('libKeyUrl', $libKeyResult["data"]["bestIntegratorLink"]["bestLink"]);
+							$interface->assign('libKeyCoverImageUrl', $libKeyResult['included'][0]['coverImageUrl']);
+							$interface->assign('retracted', false);
+						}
 					}
-					$interface->assign('libKeyUrl', $libKeyResult["data"]["bestIntegratorLink"]["bestLink"]);
-					$interface->assign('libKeyCoverImageUrl', $libKeyResult['included'][0]['coverImageUrl']);
-					$interface->assign('retracted', false);
-					break;
 				}
 				require_once ROOT_DIR . '/RecordDrivers/EbscohostRecordDriver.php';
 				$record = new EbscohostRecordDriver($current);