Bug 19040: [QA Follow-up] Adjust embed_items parameter in showdiffmarc

[koha.git] / tools / showdiffmarc.pl

diff --git a/tools/showdiffmarc.pl b/tools/showdiffmarc.pl
index 33881ba..0c585a4 100755 (executable)
--- a/tools/showdiffmarc.pl
+++ b/tools/showdiffmarc.pl
@@ -22,8 +22,7 @@
 use Modern::Perl;
 
 # standard or CPAN modules used
-use CGI qw(:standard);
-use DBI;
+use CGI qw(:standard -utf8);
 
 # Koha modules used
 use C4::Context;
@@ -31,9 +30,8 @@ use C4::Output;
 use C4::Auth;
 use C4::Biblio;
 use C4::ImportBatch;
-use XML::LibXSLT;
-use XML::LibXML;
 
+use Koha::Biblios;
 
 # Input params
 my $input        = new CGI;
@@ -41,16 +39,13 @@ my $biblionumber = $input->param('id');
 my $importid     = $input->param('importid');
 my $batchid      = $input->param('batchid');
 
-
 if ( not $biblionumber or not $importid ) {
     print $input->redirect("/cgi-bin/koha/errors/404.pl");
     exit;
 }
 
 # Init vars
-my ($recordBiblionumber, $recordImportid, $biblioTitle, $importTitle, $formatted1, $formatted2,
-    $errorFormatted1, $errorFormatted2);
-
+my ($recordBiblionumber, $recordImportid, $biblioTitle, $importTitle, $formatted1, $formatted2, $errorFormatted1, $errorFormatted2);
 
 # Prepare template
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -64,19 +59,20 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-
-$recordBiblionumber =GetMarcBiblio($biblionumber);
+$recordBiblionumber = GetMarcBiblio({
+    biblionumber => $biblionumber,
+    embed_items  => 1,
+});
 if( $recordBiblionumber ) {
     $formatted1 = $recordBiblionumber->as_formatted;
-    my $data = GetBiblioData($biblionumber);
-    $biblioTitle = $data->{title};
+    my $biblio = Koha::Biblios->find( $biblionumber );
+    $biblioTitle = $biblio->title;
 } else {
     $errorFormatted1 = 1;
 }
 
-my ($marc,$encoding) = GetImportRecordMarc($importid);
-if( $marc ) {
-    $recordImportid = MARC::Record->new_from_usmarc($marc) ;
+if( $importid ) {
+    $recordImportid = C4::ImportBatch::GetRecordFromImportBiblio( $importid, 'embed_items' );
     $formatted2 = $recordImportid->as_formatted;
     my $biblio = GetImportBiblios($importid);
     $importTitle = $biblio->[0]->{'title'};
@@ -84,9 +80,8 @@ if( $marc ) {
     $errorFormatted2 = 1;
 }
 
-
 $template->param(
-    SCRIPT_NAME      => $ENV{'SCRIPT_NAME'},
+    SCRIPT_NAME      => '/cgi-bin/koha/tools/showdiffmarc.pl',
     BIBLIONUMBER     => $biblionumber,
     IMPORTID         => $importid,
     BIBLIOTITLE      => $biblioTitle,