From dec2a44f009031f2eb226a668cbaafbbef2a700a Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Tue, 10 May 2022 13:50:38 +0000
Subject: [PATCH] Bug 30678: (follow-up) Change call in opac scripts

Test plan:
See first patch. Add orgcode OCoLC.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 opac/opac-ISBDdetail.pl | 4 ++--
 opac/opac-MARCdetail.pl | 4 ++--
 opac/opac-detail.pl     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/opac/opac-ISBDdetail.pl b/opac/opac-ISBDdetail.pl
index 7707d45244..b3b29deea7 100755
--- a/opac/opac-ISBDdetail.pl
+++ b/opac/opac-ISBDdetail.pl
@@ -65,6 +65,7 @@ use Koha::ItemTypes;
 use Koha::Patrons;
 use Koha::RecordProcessor;
 use Koha::Biblios;
+use Koha::Util::MARC;
 
 my $query = CGI->new();
 my $biblionumber = $query->param('biblionumber');
@@ -201,8 +202,7 @@ my $issn = $marcissns->[0] || '';
 if (my $search_for_title = C4::Context->preference('OPACSearchForTitleIn')){
     $dat->{title} =~ s/\/+$//; # remove trailing slash
     $dat->{title} =~ s/\s+$//; # remove trailing space
-    my $oclc_no = $record->subfield('035','a') // q{};
-    $oclc_no =~ s/\([^)]*\)//;
+    my $oclc_no =  Koha::Util::MARC::oclc_number( $record );
     $search_for_title = parametrized_url(
         $search_for_title,
         {
diff --git a/opac/opac-MARCdetail.pl b/opac/opac-MARCdetail.pl
index d24ba79161..cd79072a86 100755
--- a/opac/opac-MARCdetail.pl
+++ b/opac/opac-MARCdetail.pl
@@ -70,6 +70,7 @@ use Koha::ItemTypes;
 use Koha::Patrons;
 use Koha::RecordProcessor;
 use Koha::DateUtils qw( output_pref );
+use Koha::Util::MARC;
 
 my $query = CGI->new();
 
@@ -352,8 +353,7 @@ my $issn = $marcissns->[0] || '';
 if (my $search_for_title = C4::Context->preference('OPACSearchForTitleIn')){
     $dat->{title} =~ s/\/+$//; # remove trailing slash
     $dat->{title} =~ s/\s+$//; # remove trailing space
-    my $oclc_no = $record->subfield('035','a') // q{};
-    $oclc_no =~ s/\([^)]*\)//;
+    my $oclc_no = Koha::Util::MARC::oclc_number( $record );
     $search_for_title = parametrized_url(
         $search_for_title,
         {
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index bf6d5b313e..8aed853e99 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -85,6 +85,7 @@ use Koha::Recalls;
 use Koha::Reviews;
 use Koha::SearchEngine::Search;
 use Koha::SearchEngine::QueryBuilder;
+use Koha::Util::MARC;
 
 use JSON qw( decode_json );
 
@@ -1186,8 +1187,7 @@ my $issn = $marcissns->[0] || '';
 if (my $search_for_title = C4::Context->preference('OPACSearchForTitleIn')){
     $dat->{title} =~ s/\/+$//; # remove trailing slash
     $dat->{title} =~ s/\s+$//; # remove trailing space
-    my $oclc_no = $record->subfield('035','a') // q{};
-    $oclc_no =~ s/\([^)]*\)//;
+    my $oclc_no = Koha::Util::MARC::oclc_number( $record );
     $search_for_title = parametrized_url(
         $search_for_title,
         {
-- 
2.39.5