From: Bill Erickson Date: Mon, 1 Jun 2020 16:32:21 +0000 (-0400) Subject: LP1881607 Angular catalog e-resource links display X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fuser%2Fberick%2Flp1881607-ang-cat-eresource-links;p=working%2FEvergreen.git LP1881607 Angular catalog e-resource links display Display electronic resource links (MARC 856's) in the Angular staff catalog. The extraction logic, which matches the TPAC, has been put into its own API. To test in concernto, navigate to: /eg2/staff/catalog/record/208 Signed-off-by: Bill Erickson --- diff --git a/Open-ILS/src/eg2/src/app/share/catalog/bib-record.service.ts b/Open-ILS/src/eg2/src/app/share/catalog/bib-record.service.ts index 83d66c0654..5aa739f0e4 100644 --- a/Open-ILS/src/eg2/src/app/share/catalog/bib-record.service.ts +++ b/Open-ILS/src/eg2/src/app/share/catalog/bib-record.service.ts @@ -17,6 +17,11 @@ export const NAMESPACE_MAPS = { export const HOLDINGS_XPATH = '/holdings:holdings/holdings:counts/holdings:count'; +interface EResourceUrl { + href: string; + note: string; + label: string; +} export class BibRecordSummary { id: number; // == record.id() for convenience @@ -32,6 +37,7 @@ export class BibRecordSummary { bibCallNumber: string; net: NetService; displayHighlights: {[name: string]: string | string[]} = {}; + eResourceUrls: EResourceUrl[] = null; constructor(record: IdlObject, orgId: number, orgDepth: number) { this.id = Number(record.id()); @@ -81,6 +87,25 @@ export class BibRecordSummary { }); } + // True if this record has any E-Resource URLs. + // this.eResourceUrls starts null so we can detect whether a + // retrieval attempt has been made. + hasEResourceUrls(): boolean { + return this.eResourceUrls && this.eResourceUrls.length > 0; + } + + getEResourceUrls(): Promise { + if (this.hasEResourceUrls()) { + return Promise.resolve(this.eResourceUrls); + } + + return this.net.request( + 'open-ils.search', + 'open-ils.search.biblio.record.resource_urls.retrieve', + this.id + ).toPromise().then(urlInfo => this.eResourceUrls = urlInfo.urls); + } + // Get -> Set -> Return bib hold count getHoldCount(): Promise { diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/record.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/record/record.component.ts index b900ea8734..f94ae5c0bf 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/record/record.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/record.component.ts @@ -148,6 +148,7 @@ export class RecordComponent implements OnInit { this.summary = this.staffCat.currentDetailRecordSummary = summary; this.bib.fleshBibUsers([summary.record]); + this.summary.getEResourceUrls(); }); } diff --git a/Open-ILS/src/eg2/src/app/staff/share/bib-summary/bib-summary.component.html b/Open-ILS/src/eg2/src/app/staff/share/bib-summary/bib-summary.component.html index 3fd955888f..84a0226fc5 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/bib-summary/bib-summary.component.html +++ b/Open-ILS/src/eg2/src/app/staff/share/bib-summary/bib-summary.component.html @@ -91,6 +91,19 @@
{{summary.record.edit_date() | date:'short'}}
+ +
  • +
    +
    + Electronic Resource: +
    +
    + {{url.label}} +
    +
    {{url.note}}
    +
    +
    • +     diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm index f44e6ef049..16b1eb09ba 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm @@ -1,5 +1,7 @@ package OpenILS::Application::AppUtils; use strict; use warnings; +use MARC::Record; +use MARC::File::XML (BinaryEncoding => 'utf8', RecordFormat => 'USMARC'); use OpenILS::Application; use base qw/OpenILS::Application/; use OpenSRF::Utils::Cache; @@ -23,7 +25,7 @@ use Digest::MD5 qw(md5_hex); # Pile of utilty methods used accross applications. # --------------------------------------------------------------------------- my $cache_client = "OpenSRF::Utils::Cache"; - +my $MARC_NAMESPACE = 'http://www.loc.gov/MARC21/slim'; # --------------------------------------------------------------------------- # on sucess, returns the created session, on failure throws ERROR exception @@ -2413,5 +2415,16 @@ sub verify_migrated_user_password { } +# generate a MARC XML document from a MARC XML string +sub marc_xml_to_doc { + my ($class, $xml) = @_; + my $marc_doc = XML::LibXML->new->parse_string($xml); + $marc_doc->documentElement->setNamespace($MARC_NAMESPACE, 'marc', 1); + $marc_doc->documentElement->setNamespace($MARC_NAMESPACE); + return $marc_doc; +} + + + 1; diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/Authority.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/Authority.pm index 82d04f56e9..746f528150 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/Authority.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/Authority.pm @@ -11,19 +11,13 @@ use OpenILS::Utils::Fieldmapper; use OpenILS::Const qw/:const/; use OpenILS::Event; my $U = 'OpenILS::Application::AppUtils'; -my $MARC_NAMESPACE = 'http://www.loc.gov/MARC21/slim'; - # generate a MARC XML document from a MARC XML string sub marc_xml_to_doc { my $xml = shift; - my $marc_doc = XML::LibXML->new->parse_string($xml); - $marc_doc->documentElement->setNamespace($MARC_NAMESPACE, 'marc', 1); - $marc_doc->documentElement->setNamespace($MARC_NAMESPACE); - return $marc_doc; + return $U->marc_xml_to_doc($xml); } - __PACKAGE__->register_method( method => 'import_authority_record', api_name => 'open-ils.cat.authority.record.import', diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm index 159ecd78b9..04c767340f 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm @@ -2743,6 +2743,73 @@ sub mk_copy_query { return $query; } +__PACKAGE__->register_method( + method => 'record_urls', + api_name => 'open-ils.search.biblio.record.resource_urls.retrieve', + argc => 1, + stream => 1, + signature => { + desc => q/Returns bib record 856 URL content./, + params => [ + {desc => 'Record ID or Array of Record IDs', type => 'number or array'} + ], + return => { + desc => 'Stream of URL objects, one collection object per record', + type => 'object' + } + } +); + +sub record_urls { + my ($self, $client, $record_ids) = @_; + + $record_ids = [$record_ids] unless ref $record_ids eq 'ARRAY'; + + my $e = new_editor(); + + for my $record_id (@$record_ids) { + my $bib = $e->retrieve_biblio_record_entry($record_id) + or return $e->event; + + my $marc_doc = $U->marc_xml_to_doc($bib->marc); + + # Logic copied from TPAC misc_utils.tts + my @urls; + + for my $node ($marc_doc->findnodes( + '//*[@tag="856" and @ind1="4" and (@ind2="0" or @ind2="1")]')) { + + # asset.uri's + next if $node->findnodes('./*[@code="9" or @code="w" or @code="n"]'); + + my $url = {}; + my ($label) = $node->findnodes('./*[@code="y"]'); + my ($notes) = $node->findnodes('./*[@code="z" or @code="3"]'); + + my $first = 1; + for my $href_node ($node->findnodes('./*[@code="u"]')) { + next unless $href_node; + + # it's possible for multiple $u's to exist within 1 856 tag. + # in that case, honor the label/notes data for the first $u, but + # leave any subsequent $u's as unadorned href's. + # use href/link/note keys to be consistent with args.uri's + + my $href = $href_node->textContent; + push(@urls, { + href => $href, + label => ($first && $label) ? $label->textContent : $href, + note => ($first && $notes) ? $notes->textContent : '' + }); + $first = 0; + } + } + + $client->respond({id => $record_id, urls => \@urls}); + } + + return undef; +} 1;