Bug 4032 XSLT systempreference takes a path to file rather than YesNo

[koha_gimpoz] / C4 / XSLT.pm

diff --git a/C4/XSLT.pm b/C4/XSLT.pm
index 7557efe..621f08f 100644 (file)
--- a/C4/XSLT.pm
+++ b/C4/XSLT.pm
@@ -3,6 +3,7 @@ package C4::XSLT;
 # <jmf at liblime dot com>
 # Parts Copyright Katrin Fischer 2011
 # Parts Copyright ByWater Solutions 2011
+# Parts Copyright Biblibre 2012
 #
 # This file is part of Koha.
 #
@@ -32,6 +33,7 @@ use C4::Reserves;
 use Encode;
 use XML::LibXML;
 use XML::LibXSLT;
+use LWP::Simple;
 
 use vars qw($VERSION @ISA @EXPORT);
 
@@ -41,6 +43,7 @@ BEGIN {
     @ISA = qw(Exporter);
     @EXPORT = qw(
         &XSLTParse4Display
+        &GetURI
     );
 }
 
@@ -50,6 +53,19 @@ C4::XSLT - Functions for displaying XSLT-generated content
 
 =head1 FUNCTIONS
 
+=head2 GetURI
+
+GetURI file and returns the xslt as a string
+
+=cut
+
+sub GetURI {
+    my ($uri) = @_;
+    my $string;
+    $string = get $uri ;
+    return $string;
+}
+
 =head2 transformMARCXML4XSLT
 
 Replaces codes with authorized values in a MARC::Record object
@@ -121,8 +137,39 @@ sub getAuthorisedValues4MARCSubfields {
 my $stylesheet;
 
 sub XSLTParse4Display {
-    my ( $biblionumber, $orig_record, $xsl_suffix, $interface, $fixamps, $hidden_items ) = @_;
-    $interface = 'opac' unless $interface;
+    my ( $biblionumber, $orig_record, $xslsyspref, $fixamps, $hidden_items ) = @_;
+    my $xslfilename = C4::Context->preference($xslsyspref);
+    if ( $xslfilename =~ /^\s*"?default"?\s*$/i ) {
+        if ($xslsyspref eq "XSLTDetailsDisplay") {
+            $xslfilename = C4::Context->config('intrahtdocs') .
+                        '/' . C4::Context->preference("template") .
+                        '/' . C4::Templates::_current_language() .
+                        '/xslt/' .
+                        C4::Context->preference('marcflavour') .
+                        "slim2intranetDetail.xsl";
+        } elsif ($xslsyspref eq "XSLTResultsDisplay") {
+            $xslfilename = C4::Context->config('intrahtdocs') .
+                        '/' . C4::Context->preference("template") .
+                        '/' . C4::Templates::_current_language() .
+                        '/xslt/' .
+                        C4::Context->preference('marcflavour') .
+                        "slim2intranetResults.xsl";
+        } elsif ($xslsyspref eq "OPACXSLTDetailsDisplay") {
+            $xslfilename = C4::Context->config('opachtdocs') .
+                        '/' . C4::Context->preference("opacthemes") .
+                        '/' . C4::Templates::_current_language() .
+                        '/xslt/' .
+                        C4::Context->preference('marcflavour') .
+                        "slim2OPACDetail.xsl";
+        } elsif ($xslsyspref eq "OPACXSLTResultsDisplay") {
+            $xslfilename = C4::Context->config('opachtdocs') .
+                        '/' . C4::Context->preference("opacthemes") .
+                        '/' . C4::Templates::_current_language() .
+                        '/xslt/' .
+                        C4::Context->preference('marcflavour') .
+                        "slim2OPACResults.xsl";
+        }
+    }
     # grab the XML, run it through our stylesheet, push it out to the browser
     my $record = transformMARCXML4XSLT($biblionumber, $orig_record);
     #return $record->as_formatted();
@@ -153,29 +200,20 @@ sub XSLTParse4Display {
     # don't die when you find &, >, etc
     $parser->recover_silently(0);
     my $source = $parser->parse_string($xmlrecord);
-    unless ( $stylesheet ) {
+    unless ( $stylesheet->{$xslfilename} ) {
         my $xslt = XML::LibXSLT->new();
-        my $xslfile;
-        if ($interface eq 'intranet') {
-            $xslfile = C4::Context->config('intrahtdocs') . 
-                      '/' . C4::Context->preference("template") . 
-                      '/' . C4::Templates::_current_language() .
-                      '/xslt/' .
-                      C4::Context->preference('marcflavour') .
-                      "slim2intranet$xsl_suffix.xsl";
+        my $style_doc;
+        if ( $xslfilename =~ /^https?:\/\// ) {
+            my $xsltstring = GetURI($xslfilename);
+            $style_doc = $parser->parse_string($xsltstring);
         } else {
-            $xslfile = C4::Context->config('opachtdocs') . 
-                      '/' . C4::Context->preference("opacthemes") . 
-                      '/' . C4::Templates::_current_language() .
-                      '/xslt/' .
-                      C4::Context->preference('marcflavour') .
-                      "slim2OPAC$xsl_suffix.xsl";
+            use Cwd;
+            $style_doc = $parser->parse_file($xslfilename);
         }
-        my $style_doc = $parser->parse_file($xslfile);
-        $stylesheet = $xslt->parse_stylesheet($style_doc);
+        $stylesheet->{$xslfilename} = $xslt->parse_stylesheet($style_doc);
     }
-    my $results = $stylesheet->transform($source);
-    my $newxmlrecord = $stylesheet->output_string($results);
+    my $results      = $stylesheet->{$xslfilename}->transform($source);
+    my $newxmlrecord = $stylesheet->{$xslfilename}->output_string($results);
     return $newxmlrecord;
 }