@@ -, +, @@ +$("#export #format").append(""); than 490 in flavours of MARC other than UNIMARC) have been removed --- C4/Record.pm | 27 ++++++++++++++++++++++++++- catalogue/export.pl | 4 ++++ opac/opac-export.pl | 4 ++++ 3 files changed, 34 insertions(+), 1 deletions(-) --- a/C4/Record.pm +++ a/C4/Record.pm @@ -77,7 +77,32 @@ Returns an ISO-2709 scalar sub marc2marc { my ($marc,$to_flavour,$from_flavour,$encoding) = @_; - my $error = "Feature not yet implemented\n"; + my $error; + if ($to_flavour =~ m/marcstd/) { + my $marc_record_obj; + if ($marc =~ /^MARC::Record/) { # it's already a MARC::Record object + $marc_record_obj = $marc; + } else { # it's not a MARC::Record object, make it one + eval { $marc_record_obj = MARC::Record->new_from_usmarc($marc) }; # handle exceptions + +# conversion to MARC::Record object failed, populate $error + if ($@) { $error .="\nCreation of MARC::Record object failed: ".$MARC::File::ERROR }; + } + unless ($error) { + my @privatefields; + foreach my $field ($marc_record_obj->fields()) { + if ($field->tag() =~ m/9/ && ($field->tag() != '490' || C4::Context->preference("marcflavour") eq 'UNIMARC')) { + push @privatefields, $field; + } elsif (! ($field->is_control_field())) { + $field->delete_subfield(code => '9') if ($field->subfield('9')); + } + } + $marc_record_obj->delete_field(@privatefields); + $marc = $marc_record_obj->as_usmarc(); + } + } else { + $error = "Feature not yet implemented\n"; + } return ($error,$marc); } --- a/catalogue/export.pl +++ a/catalogue/export.pl @@ -51,6 +51,10 @@ if ($op eq "export") { C4::Charset::SetUTF8Flag($marc, 1); $marc = $marc->as_usmarc(); } + elsif ($format =~ /marcstd/) { + C4::Charset::SetUTF8Flag($marc,1); + ($error,$marc) = marc2marc($marc, 'marcstd', C4::Context->preference('marcflavour')); + } print $query->header( -type => 'application/octet-stream', -attachment=>"bib-$biblionumber.$format"); --- a/opac/opac-export.pl +++ a/opac/opac-export.pl @@ -66,6 +66,10 @@ elsif ($format =~ /utf8/) { C4::Charset::SetUTF8Flag($marc,1); $marc = $marc->as_usmarc(); } +elsif ($format =~ /marcstd/) { + C4::Charset::SetUTF8Flag($marc,1); + ($error,$marc) = marc2marc($marc, 'marcstd', C4::Context->preference('marcflavour')); +} else { $error= "Format $format is not supported."; } --