Skip to content

AvailabilityPlus für VuFind 10 + PHP 8 #147

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.

Sign up for GitHub

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

Open
sebastian-meyer wants to merge 2 commits into
base: develop-10
Choose a base branch
from
Open

AvailabilityPlus für VuFind 10 + PHP 8 #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1921323
Update for PHP8
sebastian-meyer Jul 24, 2025
fffac92
Fix bug
sebastian-meyer Jul 24, 2025
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
6 changes: 3 additions & 3 deletions module/AvailabilityPlus/languages/de.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
;AvailabilityPlus
department = "Standort/Signatur:"
FreeAccess = "Freier Volltextzugang (Direktlink)"
Go to parent work (local holding) = "Zum übergeordneten Werk (Bestand)"
Go to parent work = "Zum übergeordneten Werk (Bestand)"
GBVILL = "Fernleihbestellbarkeit prüfen"
PubPharmProxy = "Volltextzugang (via PubPharm Proxy)"
reserve = "vormerken"
Expand Down Expand Up @@ -54,5 +54,5 @@ reason = "Grund"
created by = "Erstellt durch"
date = "Datum"
link to more details = "Link zu weiteren Details"
Checked rule(s) = "Geprüfte Regel(n)"
no TestCases defined = "Keine Testfälle definiert"
Checked rules = "Geprüfte Regel(n)"
no TestCases defined = "Keine Testfälle definiert"
6 changes: 3 additions & 3 deletions module/AvailabilityPlus/languages/en.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
;AvailabilityPlus
department = "Location/Call Number:"
FreeAccess = "Free Full Text Access (direct link)"
Go to parent work (local holding) = "Check Parent Work (local holding)"
Go to parent work = "Check Parent Work (local holding)"
GBVILL = "Check Interlibrary Loan Availability"
PubPharmProxy = "Full Text Access (via PubPharm Proxy)"
reserve = "recall"
Expand Down Expand Up @@ -54,5 +54,5 @@ reason = "Reason"
created by = "Created by"
date = "Date"
link to more details = "Link to more details"
Checked rule(s) = "Checke rule(s)"
no TestCases defined = "No Test Cases defined"
Checked rules = "Checked rule(s)"
no TestCases defined = "No Test Cases defined"
103 changes: 51 additions & 52 deletions module/AvailabilityPlus/src/AvailabilityPlus/AjaxHandler/GetItemStatuses.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public function handleRequest(Params $params)
$results = $this->performAvailabilityCheck($check);
foreach($results as $result) {
if(!empty($result)) {
if(!empty($result['html'])) $check_mode = $this->current_mode;
if(isset($result['html']) && !empty($result['html'])) $check_mode = $this->current_mode;
if($this->debug) {
$result['html'] = $this->applyTemplate('ajax/debug.phtml', [ 'debug' => $result ]);
}
Expand Down Expand Up @@ -153,15 +153,16 @@ public function handleRequest(Params $params)
}

if($this->debug) {
$debug_info = [];
$debug_info['check'] = 'Debug Info';
$debug_info['mediatype'] = $mediatype;
$debug_info['AvailabilityPlusConfig'] = 'availabilityplus.ini';
$debug_info['SolrMarcYml'] = 'solrmarc.yml';
$debug_info['SolrMarcYmlAvailabilityPlus'] = $this->config->toArray['General']['availabilityplus_yaml'];
$debug_info['checkRoute_in_AvailabilityPlusConfig'] = $this->checkRoute;
$debug_info['checks'] = $this->checks;
$responses[0][0]['html'] = $this->applyTemplate('ajax/debug.phtml', [ 'debug' => $debug_info ]).$responses[0][0]['html'];
$debug_info = [
'check' => 'Debug Info',
'mediatype' => $mediatype,
'AvailabilityPlusConfig' => 'availabilityplus.ini',
'SolrMarcYml' => 'solrmarc.yml',
'SolrMarcYmlAvailabilityPlus' => $this->config->toArray()['General']['availabilityplus_yaml'] ?? '',
'checkRoute_in_AvailabilityPlusConfig' => $this->checkRoute,
'checks' => $this->checks
];
$responses[0][0]['html'] = $this->applyTemplate('ajax/debug.phtml', [ 'debug' => $debug_info ]).($responses[0][0]['html'] ?? '');
}

return $this->formatResponse(['statuses' => $responses]);
Expand All @@ -171,14 +172,14 @@ private function setChecks($mediatype = '') {
$list = $this->list;
$mediatype = str_replace(array(' ', '+'),array('',''), $mediatype);
$checks = 'RecordView';
if($list) $checks = 'ResultList';
if(!empty($this->config->toArray()[$this->source.$checks.'-'.$mediatype])) {
if(!empty($list)) $checks = 'ResultList';
if(isset($this->config->toArray()[$this->source.$checks.'-'.$mediatype])) {
$this->checks = $this->config->toArray()[$this->source.$checks.'-'.$mediatype];
$this->checkRoute = $this->source.$checks.'-'.$mediatype;
} else if(!empty($this->config->toArray()[$checks.'-'.$mediatype])) {
} else if(isset($this->config->toArray()[$checks.'-'.$mediatype])) {
$this->checks = $this->config->toArray()[$checks.'-'.$mediatype];
$this->checkRoute = $checks.'-'.$mediatype;
} else if(!empty($this->config->toArray()[$this->source.$checks])) {
} else if(isset($this->config->toArray()[$this->source.$checks])) {
$this->checks = $this->config->toArray()[$this->source.$checks];
$this->checkRoute =$this->source.$checks;
} else {
Expand Down Expand Up @@ -233,10 +234,10 @@ private function checkSolrMarcData($solrMarcKeys, $check) {
$break = false;
foreach ($solrMarcKeys as $solrMarcKey) {
$data = $this->driver->getMarcData($solrMarcKey);
$level = $this->getLevel($data[0], $check, $solrMarcKey);
$label = $this->getLabel($data[0], $check);
$level = $this->getLevel($data[0] ?? [], $check, $solrMarcKey);
$label = $this->getLabel($data[0] ?? [], $check);
$template = $this->getTemplate($data);
if(!empty($data) && $this->checkConditions($data)) {
$template = $this->getTemplate($data);
foreach ($data as $date) {
if (!empty($date['url']['data'][0])) {
foreach ($date['url']['data'] as $url) {
Expand Down Expand Up @@ -267,7 +268,7 @@ private function checkSolrMarcData($solrMarcKeys, $check) {
}
}
} else {
$response = $this->generateResponse($check, $solrMarcKey, $level, $label, $template, $data, $url, false, $check_type);
$response = $this->generateResponse($check, $solrMarcKey, $level, $label, $template, $data, '', false, $check_type);
$responses[] = $response;
}
if($break) break;
Expand All @@ -281,17 +282,19 @@ private function checkConditions($data){
$numberofconditions = 0;

foreach($data as $date) {
if(!empty($date['requirednumberofconditions']['data'][0])) {
if(isset($date['requirednumberofconditions']['data'][0])) {
$requirednumberofconditions = $date['requirednumberofconditions']['data'][0];
}
}

foreach($data as $date) {
if(!empty($date['condition_true']['data'][0])) {
if($date['condition_true']['data'][0] != 'true') $check = false;
if(isset($date['condition_true']['data'][0]) && $date['condition_true']['data'][0] != 'true') {
$check = false;
$numberofconditions += 1;
} elseif(!empty($date['condition_false']['data'][0])) {
if($date['condition_false']['data'][0] != 'false') $check = false;
} elseif(isset($date['condition_false']['data'][0]) && $date['condition_false']['data'][0] != 'false') {
$check = false;
$numberofconditions += 1;
} elseif(isset($date['condition_true']['data'][0]) || isset($date['condition_false']['data'][0])) {
$numberofconditions += 1;
}
}
Expand All @@ -303,13 +306,11 @@ private function checkConditions($data){

private function getLevel($date, $level, $solrMarcKey) {
if($level != $solrMarcKey) $level = $level.' '.$solrMarcKey;
if(!empty($date['level']['data'][0])) $level = $date['level']['data'][0];
return $level;
return $date['level']['data'][0] ?? $level;
}

private function getLabel($date, $label) {
if(!empty($date['label']['data'][0])) $label = $date['label']['data'][0];
return $label;
return $date['label']['data'][0] ?? $label;
}

private function generateResponse($check, $solrMarcKey, $level, $label, $template, $data, $url, $status_bool, $check_type){
Expand Down Expand Up @@ -351,9 +352,7 @@ private function generateResponse($check, $solrMarcKey, $level, $label, $templat
* @return string
*/
private function getTemplate($data) {
$template = $this->default_template;
if(!empty($data['view-method'])) $template = $data['view-method'];
return $template;
return $data['view-method'] ?? $this->default_template;
}

/**
Expand All @@ -379,9 +378,11 @@ private function checkParentWorkILNSolr() {
$template = 'ajax/link-parent.phtml';
$responses = [];
$parentData = $this->driver->getMarcData('ArticleParentId');
$parentId = '';
$url = '';
$response = $this->generateResponse($check, 'ArticleParentId', '', '', $template, '', '', false, $check_type);
foreach ($parentData as $parentDate) {
if (!empty(($parentDate['id']['data'][0]))) {
if (isset($parentDate['id']['data'][0]) && !empty($parentDate['id']['data'][0])) {
$parentId = $parentDate['id']['data'][0];
break;
}
Expand All @@ -398,7 +399,7 @@ private function checkParentWorkILNSolr() {
$ilnMatch = $this->driver->getMarcData('ILN');
}

if (!empty($ilnMatch[0]['iln']['data'][0])) {
if (isset($ilnMatch[0]['iln']['data'][0]) && !empty($ilnMatch[0]['iln']['data'][0])) {
$url = '/vufind/Record/' . $parentId;
}
} catch (\Exception $e) {
Expand All @@ -407,12 +408,12 @@ private function checkParentWorkILNSolr() {
}
if (!empty($url)) {
$level = 'ParentWorkILNSolr';
$label = 'Go to parent work (local holding)';
$label = 'Go to parent work';
$response = $this->generateResponse($check, 'ArticleParentId', $level, $label, $template, $parentData, $url, true, $check_type);
$response['html'] = $this->renderer->render($template , $response);
}
$response['ilnMarcSpecs'] = $ilnMarcSpecs;
$response['ilnMatch'] = $ilnMatch;
$response['ilnMarcSpecs'] = $ilnMarcSpecs ?? [];
$response['ilnMatch'] = $ilnMatch ?? [];
$responses[] = $response;
return $responses;
}
Expand All @@ -435,8 +436,8 @@ private function getResolverResponse($resolver) {
if(!empty($resolver_url) && !empty($marc_data)) {
try {
$resolver_data = $resolverHandler->fetchLinks($params);
$response = $this->generateResponse($resolver, $resolver, $resolver, $resolver, $template, $resolver_data['parsed_data'], $resolver_url, true, $check_type);
$response['resolverConfig'] = $this->resolverConfig[$resolver];
$response = $this->generateResponse($resolver, $resolver, $resolver, $resolver, $template, $resolver_data['parsed_data'] ?? [], $resolver_url, true, $check_type);
$response['resolverConfig'] = $this->resolverConfig[$resolver] ?? [];
$response['html'] = $this->applyTemplate($template, $response);
if(empty($response['html'])) {
$response['status']['level'] = 'unsuccessful_check';
Expand All @@ -446,7 +447,7 @@ private function getResolverResponse($resolver) {
$response['resolver_rule_file'] = $resolverHandler->getRulesFile();
} catch (\Exception $e) {
$template = 'ajax/default.phtml';
$response = $this->generateResponse($resolver, $resolver, 'resolver_error', 'resolver_error', $template, $resolver_data['parsed_data'], $resolver_url, false, 'Resolver-EXCEPTION');
$response = $this->generateResponse($resolver, $resolver, 'resolver_error', 'resolver_error', $template, $resolver_data['parsed_data'] ?? [], $resolver_url, false, 'Resolver-EXCEPTION');
$response['status']['label'] = 'EXCEPTION occured during processing';
$response['url'] = '';
$response['html'] = $this->applyTemplate($template, $response);
Expand Down Expand Up @@ -485,7 +486,7 @@ private function checkMultiVolumeWork() {
$url = "/vufind/Record/".$this->id;
}
}
$response = $this->generateResponse($check, '', $level, $label, $template, $parentData, $url, true, $check_type);
$response = $this->generateResponse($check, '', $level, $label, $template, [], $url ?? '', true, $check_type);
$response['html'] = $this->renderer->render($template, $response);
$responses[] = $response;
}
Expand All @@ -495,24 +496,22 @@ private function checkMultiVolumeWork() {
private function prepareResolverParams($resolverData) {
$used_params = [];
$params = '';
if(!empty($resolverData)) {
if(is_array($resolverData)) {
foreach ($resolverData as $resolverDate) {
if (is_array($resolverDate)) {
foreach ($resolverDate as $key => $value) {
if (!in_array($key, $used_params)) {
if (empty($params)) {
$params .= '?' . $key . '=' . urlencode($value['data'][0]);
} else {
$params .= '&' . $key . '=' . urlencode($value['data'][0]);
}
$used_params[] = $key;
if(!empty($resolverData) && is_array($resolverData)) {
foreach ($resolverData as $resolverDate) {
if (is_array($resolverDate)) {
foreach ($resolverDate as $key => $value) {
if (!in_array($key, $used_params)) {
if (empty($params)) {
$params .= '?' . $key . '=' . urlencode($value['data'][0] ?? '');
} else {
$params .= '&' . $key . '=' . urlencode($value['data'][0] ?? '');
}
$used_params[] = $key;
}
}
}
}
}
return $params;
}
}
}
2 changes: 1 addition & 1 deletion module/AvailabilityPlus/src/AvailabilityPlus/Resolver/Driver/AvailabilityPlusResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public function getRulesFile() {
protected function applyCustomChanges() {

$specsReader = new SearchSpecsReader();
$rules = $specsReader->get($this->rules);
$rules = $specsReader->get($this->rules) ?? [];
foreach($this->parsed_data as $key => $item) {
$rules_applied = [];
foreach($rules as $rule_key => $rule) {
Expand Down
Loading