Merge remote-tracking branch 'origin/new/bug_8130'

[koha.git] / C4 / Record.pm

diff --git a/C4/Record.pm b/C4/Record.pm
index cecb6ed..a07fcfc 100644 (file)
--- a/C4/Record.pm
+++ b/C4/Record.pm
@@ -39,7 +39,7 @@ use Text::CSV::Encoded; #marc2csv
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
-$VERSION = 3.00;
+$VERSION = 3.07.00.049;
 
 @ISA = qw(Exporter);
 
@@ -52,6 +52,7 @@ $VERSION = 3.00;
   &marcxml2marc
   &marc2dcxml
   &marc2modsxml
+  &marc2madsxml
   &marc2bibtex
   &marc2csv
   &changeEncoding
@@ -77,7 +78,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($_) for @privatefields;
+            $marc = $marc_record_obj->as_usmarc();
+        }
+    } else {
+        $error = "Feature not yet implemented\n";
+    }
        return ($error,$marc);
 }
 
@@ -242,25 +268,52 @@ sub marc2dcxml {
 
 =head2 marc2modsxml - Convert from ISO-2709 to MODS
 
-  my ($error,$modsxml) = marc2modsxml($marc);
+  my $modsxml = marc2modsxml($marc);
 
 Returns a MODS scalar
 
 =cut
 
 sub marc2modsxml {
-       my ($marc) = @_;
-       # grab the XML, run it through our stylesheet, push it out to the browser
-       my $xmlrecord = marc2marcxml($marc);
-       my $xslfile = C4::Context->config('intrahtdocs')."/prog/en/xslt/MARC21slim2MODS3-1.xsl";
-       my $parser = XML::LibXML->new();
-       my $xslt = XML::LibXSLT->new();
-       my $source = $parser->parse_string($xmlrecord);
-       my $style_doc = $parser->parse_file($xslfile);
-       my $stylesheet = $xslt->parse_stylesheet($style_doc);
-       my $results = $stylesheet->transform($source);
-       my $newxmlrecord = $stylesheet->output_string($results);
-       return ($newxmlrecord);
+    my ($marc) = @_;
+    return _transformWithStylesheet($marc, "/prog/en/xslt/MARC21slim2MODS3-1.xsl");
+}
+
+=head2 marc2madsxml - Convert from ISO-2709 to MADS
+
+  my $madsxml = marc2madsxml($marc);
+
+Returns a MADS scalar
+
+=cut
+
+sub marc2madsxml {
+    my ($marc) = @_;
+    return _transformWithStylesheet($marc, "/prog/en/xslt/MARC21slim2MADS.xsl");
+}
+
+=head2 _transformWithStylesheet - Transform a MARC record with a stylesheet
+
+    my $xml = _transformWithStylesheet($marc, $stylesheet)
+
+Returns the XML scalar result of the transformation. $stylesheet should
+contain the path to a stylesheet under intrahtdocs.
+
+=cut
+
+sub _transformWithStylesheet {
+    my ($marc, $stylesheet) = @_;
+    # grab the XML, run it through our stylesheet, push it out to the browser
+    my $xmlrecord = marc2marcxml($marc);
+    my $xslfile = C4::Context->config('intrahtdocs') . $stylesheet;
+    my $parser = XML::LibXML->new();
+    my $xslt = XML::LibXSLT->new();
+    my $source = $parser->parse_string($xmlrecord);
+    my $style_doc = $parser->parse_file($xslfile);
+    my $stylesheet = $xslt->parse_stylesheet($style_doc);
+    my $results = $stylesheet->transform($source);
+    my $newxmlrecord = $stylesheet->output_string($results);
+    return ($newxmlrecord);
 }
 
 sub marc2endnote {
@@ -398,7 +451,7 @@ sub marcrecord2csv {
     # Getting the marcfields as an array
     my @marcfieldsarray = split('\|', $marcfieldslist);
 
-   # Separating the marcfields from the the user-supplied headers
+   # Separating the marcfields from the user-supplied headers
     my @marcfields;
     foreach (@marcfieldsarray) {
         my @result = split('=', $_);