Skip to content
Snippets Groups Projects
Commit 5fb285d7 authored by Frank Morgner's avatar Frank Morgner
Browse files

refs #9191 bugfixing Ebsco module

* remove false modifier at regex
* catch void variables to prevent notices
parent b1dce1c7
Branches
Tags archive/issue/5404
No related merge requests found
...@@ -111,7 +111,7 @@ class EbscoResults implements \VuFind\Recommend\RecommendInterface, ...@@ -111,7 +111,7 @@ class EbscoResults implements \VuFind\Recommend\RecommendInterface,
{ {
// Parse out parameters: // Parse out parameters:
$params = explode(':', $settings); $params = explode(':', $settings);
if (!isset($params[0]) || (0 < preg_match('/\s/g', $params[0]))) { if (!isset($params[0]) || (0 < preg_match('/\s/', $params[0]))) {
throw new Exception( throw new Exception(
'Isil as namespace for service has not been set yet or is false.' 'Isil as namespace for service has not been set yet or is false.'
); );
...@@ -219,24 +219,23 @@ class EbscoResults implements \VuFind\Recommend\RecommendInterface, ...@@ -219,24 +219,23 @@ class EbscoResults implements \VuFind\Recommend\RecommendInterface,
* Sort databases by hits * Sort databases by hits
* *
* @param array $results Unprocessed array of curl requrest. * @param array $results Unprocessed array of curl requrest.
* @param string $sortOrder Order of sort. Default: "SORT_DESC" * @param string $sortOrder Order of sort. Default: SORT_DESC
* *
* @return array $results * @return array $results
* @access protected * @access protected
*/ */
protected function sortByHits($results, $sortOrder = SORT_DESC) protected function sortByHits($results, $sortOrder = SORT_DESC)
{ {
if (!is_array($results) && count($results['results']) == 0) { if (isset($results['results']) && count($results['results']) > 0) {
return $results['results'] = []; $databases = $results['results'];
foreach ($databases as $key => $row) {
$hits[$key] = $row['hits'];
}
array_multisort($hits, $sortOrder, $databases);
$results['results'] = $databases;
} else {
$results['results'] = [];
} }
$databases = $results['results'];
foreach ($databases as $key => $row) {
$hits[$key] = $row['hits'];
}
array_multisort($hits, $sortOrder, $databases);
$results['results'] = $databases;
return $results; return $results;
} }
......
<? <?
$data = $this->recommend->getResult(); $data = $this->recommend->getResult();
if (is_array($data) && count($data['results']) > 0): ?> if (is_array($data['results']) && count($data['results']) > 0): ?>
<ul id="side-panel-ebsco" class="accordion" data-accordion=""> <ul id="side-panel-ebsco" class="accordion" data-accordion="">
<li class="accordion-navigation active"> <li class="accordion-navigation active">
<a class="title" href="#side-collapse-ebsco" aria-expanded="true"> <a class="title" href="#side-collapse-ebsco" aria-expanded="true">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment