From 20d9888260ad2d76cd6f2d43ed2ac38aefb39202 Mon Sep 17 00:00:00 2001 From: Chris Sharp Date: Fri, 8 Jan 2021 13:24:02 -0500 Subject: [PATCH] Revert "LP1881607 Angular catalog e-resource links display" This reverts commit db72e04fb13eba74fc8304bab0db6b5a050615e5. --- .../src/eg2/src/app/share/catalog/bib-record.service.ts | 7 ------- Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm | 15 +-------------- .../src/perlmods/lib/OpenILS/Application/Cat/Authority.pm | 8 +++++++- 3 files changed, 8 insertions(+), 22 deletions(-) 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 ce352c7868..7510fe0d0b 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,11 +17,6 @@ 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 @@ -37,7 +32,6 @@ export class BibRecordSummary { bibCallNumber: string; net: NetService; displayHighlights: {[name: string]: string | string[]} = {}; - eResourceUrls: EResourceUrl[] = []; constructor(record: IdlObject, orgId: number, orgDepth?: number) { this.id = Number(record.id()); @@ -112,7 +106,6 @@ export class BibRecordService { summary.attributes = bibSummary.attributes; summary.holdCount = bibSummary.hold_count; summary.holdingsSummary = bibSummary.copy_counts; - summary.eResourceUrls = bibSummary.urls; return summary; })); } diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm index e062363d75..9bf9285617 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm @@ -1,7 +1,5 @@ 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; @@ -25,7 +23,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 @@ -2431,16 +2429,5 @@ 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 746f528150..82d04f56e9 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/Authority.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/Authority.pm @@ -11,13 +11,19 @@ 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; - return $U->marc_xml_to_doc($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; } + __PACKAGE__->register_method( method => 'import_authority_record', api_name => 'open-ils.cat.authority.record.import', -- 2.11.0