Merge pull request #2193 from PTFS-Europe/25.01.00_restore_ebsco_sear…

…chers 25.01.00 restore ebsco searchers
Aspen-Discovery · Jan 14, 2025 · db1c211 · db1c211
2 parents 92439a1 + 4bff3bf
commit db1c211
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/code/web/release_notes/25.01.00.MD b/code/web/release_notes/25.01.00.MD
@@ -144,6 +144,7 @@
 - Add an editorconfig file for template files to standardize using tabs across all files. (*MDN*)
 - Library card page (under 'My Account') no longer shows Koha user's opac notes if user's library 'Show OPAC Notes' is disabled.(*PA*)
 - Fix typo in Authentication/DatabaseAuthentication.php (DIS-159) (*LG*)
+- Fix EBSCO EDS and host searcher so that search results can be displayed and no error message shows. (*CZ*)
 
 ## This release includes code contributions from
 ### ByWater Solutions

diff --git a/code/web/sys/SearchObject/BaseSearcher.php b/code/web/sys/SearchObject/BaseSearcher.php
@@ -2356,7 +2356,7 @@ public function displayQuery(/** @noinspection PhpUnusedParameterInspection */ $
 	 * @param bool $preventQueryModification Should we make sure the query doesn't change
 	 * @return  object   Search results (format may vary from class to class).
 	 */
-	abstract public function processSearch(bool $returnIndexErrors = false, bool $recommendations = false, bool $preventQueryModification = false) : AspenError|array|null;
+	abstract public function processSearch(bool $returnIndexErrors = false, bool $recommendations = false, bool $preventQueryModification = false) : AspenError|stdClass|SimpleXMLElement|array|null;
 
 	/**
 	 * Get error message from index response, if any.  This will only work if

diff --git a/code/web/sys/SearchObject/EbscoEdsSearcher.php b/code/web/sys/SearchObject/EbscoEdsSearcher.php
@@ -569,7 +569,7 @@ function getSearchesFile() {
 		return false;
 	}
 
-	public function processSearch($returnIndexErrors = false, $recommendations = false, $preventQueryModification = false) : AspenError|array|null {
+	public function processSearch($returnIndexErrors = false, $recommendations = false, $preventQueryModification = false) : AspenError|stdClass|array|null {
 		$isAuthenticated = $this->authenticate();
 		if (empty($isAuthenticated)) {
 			return null;

diff --git a/code/web/sys/SearchObject/EbscohostSearcher.php b/code/web/sys/SearchObject/EbscohostSearcher.php
@@ -632,7 +632,7 @@ function getSearchesFile() {
 		return false;
 	}
 
-	public function processSearch($returnIndexErrors = false, $recommendations = false, $preventQueryModification = false) : AspenError|array|null {
+	public function processSearch($returnIndexErrors = false, $recommendations = false, $preventQueryModification = false) : AspenError|SimpleXMLElement|array|null {
 		$settings = $this->getSettings();
 		if ($settings == null) {
 			return new AspenError("EBSCOhost searching is not configured for this library.");