Bug 7345: Enable exporting records sans private fields
Add an option for marcstd to the opac-export.pl and catalogue/export.pl scripts. This new format removes all 9XX, X9X, XX9 fields and subfield $9 (with the exception of 490 in flavours of MARC other than UNIMARC). The work is done in C4::Record::marc2marc. This patch adds the new export option 'marcstd' for exporting MARC records without 9xx, x9x and xx9 fields and subfields to the staff detail page. Testing plan: 1. Export a record in "MARC (Unicode/UTF-8)" format as a control 2. In the OPAC, run the following jQuery to add the marcstd option to the UI: > $("#export #format").append("<option value='marcstd'>MARC (no 9xx)</option>"); 3. Export the same record in "MARC (no 9xx)" format 4. Compare the two, noticing that any subfield $9 or fields including 9 (other than 490 in flavours of MARC other than UNIMARC) have been removed Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Works as advertised now. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> This patch squashes both the original patch and Katrin's follow-up adding marcstd as an export option on the staff client. Feb 13, 2012 (marcel): Amended this patch to resolved two definitions of $error in catalogue/export script.
This commit is contained in:
parent
1161079e1f
commit
6378436089
4 changed files with 37 additions and 3 deletions
27
C4/Record.pm
27
C4/Record.pm
|
@ -77,7 +77,32 @@ Returns an ISO-2709 scalar
|
||||||
|
|
||||||
sub marc2marc {
|
sub marc2marc {
|
||||||
my ($marc,$to_flavour,$from_flavour,$encoding) = @_;
|
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($_) for @privatefields;
|
||||||
|
$marc = $marc_record_obj->as_usmarc();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$error = "Feature not yet implemented\n";
|
||||||
|
}
|
||||||
return ($error,$marc);
|
return ($error,$marc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
|
||||||
|
|
||||||
my $op=$query->param("op");
|
my $op=$query->param("op");
|
||||||
my $format=$query->param("format");
|
my $format=$query->param("format");
|
||||||
|
my $error = '';
|
||||||
if ($op eq "export") {
|
if ($op eq "export") {
|
||||||
my $biblionumber = $query->param("bib");
|
my $biblionumber = $query->param("bib");
|
||||||
if ($biblionumber){
|
if ($biblionumber){
|
||||||
|
@ -39,7 +40,6 @@ if ($op eq "export") {
|
||||||
$marc = marc2modsxml($marc);
|
$marc = marc2modsxml($marc);
|
||||||
}
|
}
|
||||||
elsif ($format =~ /dc/) {
|
elsif ($format =~ /dc/) {
|
||||||
my $error;
|
|
||||||
($error,$marc) = marc2dcxml($marc,1);
|
($error,$marc) = marc2dcxml($marc,1);
|
||||||
$format = "dublin-core.xml";
|
$format = "dublin-core.xml";
|
||||||
}
|
}
|
||||||
|
@ -51,6 +51,10 @@ if ($op eq "export") {
|
||||||
C4::Charset::SetUTF8Flag($marc, 1);
|
C4::Charset::SetUTF8Flag($marc, 1);
|
||||||
$marc = $marc->as_usmarc();
|
$marc = $marc->as_usmarc();
|
||||||
}
|
}
|
||||||
|
elsif ($format =~ /marcstd/) {
|
||||||
|
C4::Charset::SetUTF8Flag($marc,1);
|
||||||
|
($error, $marc) = marc2marc($marc, 'marcstd', C4::Context->preference('marcflavour'));
|
||||||
|
}
|
||||||
print $query->header(
|
print $query->header(
|
||||||
-type => 'application/octet-stream',
|
-type => 'application/octet-stream',
|
||||||
-attachment=>"bib-$biblionumber.$format");
|
-attachment=>"bib-$biblionumber.$format");
|
||||||
|
|
|
@ -123,7 +123,8 @@ function confirm_items_deletion() {
|
||||||
{ text: _("Dublin Core (XML)"), url: "/cgi-bin/koha/catalogue/export.pl?format=dc&op=export&bib=[% biblionumber %]" },
|
{ text: _("Dublin Core (XML)"), url: "/cgi-bin/koha/catalogue/export.pl?format=dc&op=export&bib=[% biblionumber %]" },
|
||||||
{ text: _("MARCXML"), url: "/cgi-bin/koha/catalogue/export.pl?format=marcxml&op=export&bib=[% biblionumber %]" },
|
{ text: _("MARCXML"), url: "/cgi-bin/koha/catalogue/export.pl?format=marcxml&op=export&bib=[% biblionumber %]" },
|
||||||
{ text: _("MARC (non-Unicode/MARC-8)"), url: "/cgi-bin/koha/catalogue/export.pl?format=marc8&op=export&bib=[% biblionumber %]" },
|
{ text: _("MARC (non-Unicode/MARC-8)"), url: "/cgi-bin/koha/catalogue/export.pl?format=marc8&op=export&bib=[% biblionumber %]" },
|
||||||
{ text: _("MARC (Unicode/UTF-8)"), url: "/cgi-bin/koha/catalogue/export.pl?format=utf8&op=export&bib=[% biblionumber %]" }
|
{ text: _("MARC (Unicode/UTF-8)"), url: "/cgi-bin/koha/catalogue/export.pl?format=utf8&op=export&bib=[% biblionumber %]" },
|
||||||
|
{ text: _("MARC (Unicode/UTF-8, Standard)"), url: "/cgi-bin/koha/catalogue/export.pl?format=marcstd&op=export&bib=[% biblionumber %]" }
|
||||||
];
|
];
|
||||||
|
|
||||||
new YAHOO.widget.Button({
|
new YAHOO.widget.Button({
|
||||||
|
|
|
@ -66,6 +66,10 @@ elsif ($format =~ /utf8/) {
|
||||||
C4::Charset::SetUTF8Flag($marc,1);
|
C4::Charset::SetUTF8Flag($marc,1);
|
||||||
$marc = $marc->as_usmarc();
|
$marc = $marc->as_usmarc();
|
||||||
}
|
}
|
||||||
|
elsif ($format =~ /marcstd/) {
|
||||||
|
C4::Charset::SetUTF8Flag($marc,1);
|
||||||
|
($error,$marc) = marc2marc($marc, 'marcstd', C4::Context->preference('marcflavour'));
|
||||||
|
}
|
||||||
else {
|
else {
|
||||||
$error= "Format $format is not supported.";
|
$error= "Format $format is not supported.";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue