Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

25.01.00 restore ebsco searchers #2193

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/web/release_notes/25.01.00.MD
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/web/sys/SearchObject/BaseSearcher.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/web/sys/SearchObject/EbscoEdsSearcher.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion code/web/sys/SearchObject/EbscohostSearcher.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
Expand Down
Loading