fixed typo in 018 DB change

[koha_fer] / C4 / Record.pm

diff --git a/C4/Record.pm b/C4/Record.pm
index 3d5cf7a..0a74086 100644 (file)
--- a/C4/Record.pm
+++ b/C4/Record.pm
@@ -18,22 +18,21 @@ package C4::Record;
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 #
-# $Id$
 #
-use strict; use warnings; #FIXME: turn off warnings before release
+use strict;# use warnings; #FIXME: turn off warnings before release
 
 # please specify in which methods a given module is used
 use MARC::Record; # marc2marcxml, marcxml2marc, html2marc, changeEncoding
 use MARC::File::XML; # marc2marcxml, marcxml2marc, html2marcxml, changeEncoding
 use MARC::Crosswalk::DublinCore; # marc2dcxml
-#use MODS::Record; # marc2modsxml
 use Unicode::Normalize; # _entity_encode
+use XML::LibXSLT;
+use XML::LibXML;
 
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision$' =~ /\d+/g;
-                shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
+$VERSION = 3.00;
 
 @ISA = qw(Exporter);
 
@@ -247,7 +246,19 @@ sub marc2dcxml {
                $crosswalk = MARC::Crosswalk::DublinCore->new( qualified => 1 );
        }
        my $dcxml = $crosswalk->as_dublincore($marc_record_obj);
-       return ($error,$dcxml);
+       my $dcxmlfinal = "<?xml version=\"1.0\"?>\n";
+       $dcxmlfinal .= "<metadata
+  xmlns=\"http://example.org/myapp/\"
+  xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
+  xsi:schemaLocation=\"http://example.org/myapp/ http://example.org/myapp/schema.xsd\"
+  xmlns:dc=\"http://purl.org/dc/elements/1.1/\"
+  xmlns:dcterms=\"http://purl.org/dc/terms/\">";
+
+       foreach my $element ( $dcxml->elements() ) {
+                $dcxmlfinal.="<"."dc:".$element->name().">".$element->content()."</"."dc:".$element->name()."\n";
+    }
+       $dcxmlfinal .= "\n</metadata>";
+       return ($error,$dcxmlfinal);
 }
 =head2 marc2modsxml - Convert from ISO-2709 to MODS
 
@@ -262,31 +273,18 @@ Returns a MODS scalar
 =cut
 
 sub marc2modsxml {
-       use XML::XSLT;
-       #use XML::LibXSLT;
        my ($marc) = @_;
-       my $error;
-       my $marcxml;
-
-       # open some files for testing
-       open MARCBIG21MARC21SLIM,"/home/koha/head/koha/C4/MARC21slim2MODS3-1.xsl" or die $!;
-       my $marcbig2marc21_slim; # = scalar (MARC21MARC8);
-       foreach my $line (<MARCBIG21MARC21SLIM>) {
-       $marcbig2marc21_slim .= $line;
-       }
-
-       # set some defailts
-       my $to_encoding = "UTF-8";
-       my $flavour = "MARC21";
-       
-       # first convert our ISO-2709 to MARCXML
-       ($error,$marcxml) = marc2marcxml($marc,$to_encoding,$flavour);  
-       my $xslt_obj = XML::XSLT->new ($marcbig2marc21_slim, warnings => 1);
-       $xslt_obj->transform ($marcxml);
-       my $xslt_string = $xslt_obj->toString;
-       $xslt_obj->dispose();
-       warn $xslt_string;
-       return ($error,$xslt_string);
+       # grab the XML, run it through our stylesheet, push it out to the browser
+       my $xmlrecord = marc2marcxml($marc);
+       my $xslfile = C4::Context->config('intranetdir')."/koha-tmpl/intranet-tmpl/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);
 }
 =head2 html2marcxml
 
@@ -562,14 +560,11 @@ END { }       # module clean-up code here (global destructor)
 1;
 __END__
 
-=back
-
 =head1 AUTHOR
 
 Joshua Ferraro <jmf@liblime.com>
 
 =head1 MODIFICATIONS
 
-# $Id$
 
 =cut