Bug 29697: Fix t/db_dependent/Exporter/Record.t

Not sure about the warn, we shouldn't need it as we are raising an
exception. But better (for now) than introducing regressions.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/C4/Record.pm b/C4/Record.pm
index 3de35a2..69a60f3 100644 (file)
--- a/C4/Record.pm
+++ b/C4/Record.pm
@@ -460,7 +460,10 @@ sub marcrecord2csv {
     # Getting the record
     my $biblio = Koha::Biblios->find($biblionumber);
     return unless $biblio;
-    my $record = $biblio->metadata->record({ embed_items => 1, itemnumbers => $itemnumbers });
+    my $record = eval {
+        $biblio->metadata->record(
+            { embed_items => 1, itemnumbers => $itemnumbers } );
+    };
     return unless $record;
     # Getting the framework
     my $frameworkcode = $biblio->frameworkcode;

diff --git a/Koha/Biblio/Metadata.pm b/Koha/Biblio/Metadata.pm
index ad45179..78361ab 100644 (file)
--- a/Koha/Biblio/Metadata.pm
+++ b/Koha/Biblio/Metadata.pm
@@ -111,6 +111,7 @@ sub record {
         my $marcxml_error = $@;
         chomp $marcxml_error;
         unless ($record) {
+            warn $marcxml_error;
             Koha::Exceptions::Metadata::Invalid->throw(
                 id             => $self->id,
                 biblionumber   => $self->biblionumber,

diff --git a/Koha/Exporter/Record.pm b/Koha/Exporter/Record.pm
index 1716e9c..e678c36 100644 (file)
--- a/Koha/Exporter/Record.pm
+++ b/Koha/Exporter/Record.pm
@@ -127,10 +127,14 @@ sub _get_biblio_for_export {
     return if $@ or not defined $record;
 
     if ($export_items) {
-        C4::Biblio::EmbedItemsInMarcBiblio({
-            marc_record  => $record,
-            biblionumber => $biblionumber,
-            item_numbers => $itemnumbers });
+        Koha::Biblio::Metadata->record(
+            {
+                record       => $record,
+                embed_items  => 1,
+                biblionumber => $biblionumber,
+                item_numbers => $itemnumbers,
+            }
+        );
         if ($only_export_items_for_branches && @$only_export_items_for_branches) {
             my %export_items_for_branches = map { $_ => 1 } @$only_export_items_for_branches;
             my ( $homebranchfield, $homebranchsubfield ) = GetMarcFromKohaField( 'items.homebranch' );