Bug 14639: (QA followup) make schema mandatory

[koha.git] / opac / unapi

diff --git a/opac/unapi b/opac/unapi
index 0f97ece..7b21ee0 100755 (executable)
--- a/opac/unapi
+++ b/opac/unapi
@@ -4,18 +4,18 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use strict;
 use warnings;
@@ -37,7 +37,7 @@ an XML format such as OAI DC, RSS2, MARCXML, or MODS.
 
 =cut
 
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Context;
 use C4::Biblio;
 use XML::LibXML;
@@ -75,6 +75,19 @@ my $format_to_stylesheet_map = {
         'rss2-full'    => 'MARC21slim2RSS2.xsl',
         'srw_dc'       => 'MARC21slim2SRWDC.xsl',
     },
+    'NORMARC' => {
+        'marcxml'      => 'identity.xsl',
+        'marcxml-full' => 'identity.xsl',
+        'mods'         => 'MARC21slim2MODS.xsl',
+        'mods-full'    => 'MARC21slim2MODS.xsl',
+        'mods3'        => 'MARC21slim2MODS3-1.xsl',
+        'mods3-full'   => 'MARC21slim2MODS3-1.xsl',
+        'oai_dc'       => 'MARC21slim2OAIDC.xsl',
+        'rdfdc',       => 'MARC21slim2RDFDC.xsl',
+        'rss2'         => 'MARC21slim2RSS2.xsl',
+        'rss2-full'    => 'MARC21slim2RSS2.xsl',
+        'srw_dc'       => 'MARC21slim2SRWDC.xsl',
+    },
     'UNIMARC' => {
         'marcxml'      => 'identity.xsl',
         'marcxml-full' => 'identity.xsl',
@@ -107,7 +120,7 @@ my $id     = $cgi->param('id');
 my $format = $cgi->param('format');
 
 if (not defined $format) {
-    emit_formats($id);
+    emit_formats($id, $format_to_stylesheet_map, $format_info, $cgi);
 } elsif ($id) {
 
     # koha:biblionumber:0152018484
@@ -123,7 +136,7 @@ if (not defined $format) {
                 exit 0;
             }
 
-            my $transformer = get_transformer($format);
+            my $transformer = get_transformer($format, $format_to_stylesheet_map, $format_info);
             unless (defined $transformer) {
                 print $cgi->header( -status => '406 invalid format requested' );
                 exit 0;
@@ -154,7 +167,7 @@ if (not defined $format) {
 exit 0;
 
 sub emit_formats {
-    my $id = shift;
+    my ($id, $format_to_stylesheet_map, $format_info, $cgi) = @_;
 
     if (defined $id) {
         print $cgi->header( -type =>'application/xml', -status => '300 multiple choices' );
@@ -179,13 +192,14 @@ sub emit_formats {
 
 
 sub get_transformer {
-    my $format = lc shift;
+    my ($format, $format_to_stylesheet_map, $format_info) = @_;
+    $format = lc $format;
 
     my $marcflavour = uc(C4::Context->preference('marcflavour'));
     return unless $format_to_stylesheet_map->{$marcflavour}->{$format};
 
-    my $xslt_file = C4::Context->config('intranetdir') .
-                    "/koha-tmpl/intranet-tmpl/prog/en/xslt/" .
+    my $xslt_file = C4::Context->config('intrahtdocs') .
+                    "/prog/en/xslt/" .
                     $format_to_stylesheet_map->{$marcflavour}->{$format};
 
     my $parser = XML::LibXML->new();