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

Feat/dot extra info #1415

Open
wants to merge 4 commits into
base: dev/php8
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 14 additions & 1 deletion app/lib/Attributes/Values/InformationServiceAttributeValue.php
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,20 @@ public function getExtraInfo($ps_info_key=null) {
if(!$ps_info_key) {
return (is_array($this->opa_extra_info) ? $this->opa_extra_info : array());
} else {
return isset($this->opa_extra_info[$ps_info_key]) ? $this->opa_extra_info[$ps_info_key] : null;
$keys = explode(".", $ps_info_key);

$current = $this->opa_extra_info;
foreach ($keys as $i=>$key) {
if(!isset($current[$key])) {
return null;
}
$current = $current[$key];
}

if(is_string($current)) return $current;
if(is_array($current)) return implode(", ", $current);
return serialize($current);

}
}
# ------------------------------------------------------------------
Expand Down
101 changes: 101 additions & 0 deletions app/lib/Plugins/InformationService/AAT.php
Original file line number Diff line number Diff line change
Expand Up @@ -199,4 +199,105 @@ public function getDisplayValueFromLookupText( $ps_text ) {
return $ps_text;
}
# ------------------------------------------------

public function getExtendedInformation($pa_settings, $ps_url) {

$display="";

$vs_data = caQueryExternalWebservice($ps_url);
$va_data = json_decode($vs_data,true);

$va_identified_by = $this->getIndentifiedBy($pa_settings, $ps_url);

/* header */
$display = "<table class='aat_alternate'><tr><th></th>";
foreach($va_identified_by['identified_by']['alternatives'] as $vs_alternative) {
$display .= "<th>".$vs_alternative."</th>";
}
$display .= "</tr>";

/* content */
foreach ($va_identified_by['identified_by']['languages'] as $va_language) {
$language_short = reset(explode("-", $va_language));

$display .= "<tr><td class='".$language_short."' title='".$va_language."'><span>".$language_short."</span></td>";

foreach($va_identified_by['identified_by']['alternatives'] as $va_alternative) {
$label = $va_identified_by['identified_by'][$va_language][$va_alternative] ?? '';
$display .= "<td>".$label."</td>";
}
$display .= "</tr>";
}

$display .= "</table>";

return array('display' => $display);

}
# ------------------------------------------------


/* append data to the field */
public function getExtraInfo($settings, $url){


$vs_data = caQueryExternalWebservice($url);
$va_data = json_decode($vs_data,true);

$va_identified_by = $this->getIndentifiedBy($settings, $url);

return $va_identified_by;

}


public function getIndentifiedBy($settings, $url){

if(is_null($url))return false;

$url_metadata = $url.'.json';
$vs_data = caQueryExternalWebservice($url_metadata);
$va_data = json_decode($vs_data,true);
$va_data_restructured = array();

$va_alternative_keys=array();
$va_alternative_languages=array();

/* collect all alternate labels */
foreach ($va_data["identified_by"] as $key => $value) {
if($value['type']=='Identifier') continue;

$lang = $value['language'][0]['_label'];
$va_alternative_languages[]=$lang;
$identified_label = $value['content'];
$va_data_restructured['identified_by'][$lang][$value['type']] = $identified_label;

foreach ($value['alternative'] as $ka => $va) {
$lang = $va['language'][0]['_label'];
$va_alternative_keys[]=$va['type'];
$va_alternative_languages[]=$lang;
$alternative_label = $va['content'];

$va_data_restructured['identified_by'][$lang]['alternatives'][]=$va['type'];
$va_data_restructured['identified_by'][$lang][$va['type']] = $alternative_label;
}

foreach ($value["classified_as"] as $kc => $vc) {
$id = end(explode("/",$vc['id']));
$va_data_restructured['identified_by'][$lang][$id] = $alternative_label;
$va_data_restructured['identified_by'][$lang]['alternatives'][] = $id;
$va_alternative_keys[] = $id;
#$va_data_restructured['identified_by']['alternatives']=array_unique($va_data['identified_by']['alternatives']);
}

}
$va_data_restructured['identified_by']['alternatives'] = array_values(array_unique($va_alternative_keys));
$va_data_restructured['identified_by']['languages'] = array_values(array_unique($va_alternative_languages));

return $va_data_restructured;


}


}
8 changes: 6 additions & 2 deletions app/lib/Search/SearchResult.php
Original file line number Diff line number Diff line change
Expand Up @@ -2439,7 +2439,9 @@ private function _getAttributeValue($pa_value_list, $pt_instance, $pa_options) {
$vs_val_proc = $o_value->getUri();
break;
default:
$vs_val_proc = $o_value->getExtraInfo($va_path_components['subfield_name']);
$arr = array_slice($va_path_components['components'],2);
$dot = implode('.',$arr);
$vs_val_proc = $o_value->getExtraInfo($dot);
break;
}

Expand Down Expand Up @@ -2471,7 +2473,9 @@ private function _getAttributeValue($pa_value_list, $pt_instance, $pa_options) {
$vs_val_proc = $o_value->getDisplayValue(array_merge($pa_options, array('output' => $pa_options['output'])));
break;
default:
$vs_val_proc = $o_value->getExtraInfo($vs_final_path_key);
$arr = array_slice($va_path_components['components'],3);
$dot = implode('.',$arr);
$vs_val_proc = $o_value->getExtraInfo($dot);
break;
}

Expand Down