use Memoize because Memcache::Memoize is slow for me

[koha.git] / C4 / XSLT.pm

diff --git a/C4/XSLT.pm b/C4/XSLT.pm
old mode 100644 (file)
new mode 100755 (executable)
index f349376..8bc4000
--- a/C4/XSLT.pm
+++ b/C4/XSLT.pm
@@ -1,6 +1,8 @@
 package C4::XSLT;
 # Copyright (C) 2006 LibLime
 # <jmf at liblime dot com>
+# Parts Copyright Katrin Fischer 2011
+# Parts Copyright ByWater Solutions 2011
 #
 # This file is part of Koha.
 #
@@ -27,7 +29,6 @@ use C4::Koha;
 use C4::Biblio;
 use C4::Circulation;
 use C4::Reserves;
-use C4::Output qw//;
 use Encode;
 use XML::LibXML;
 use XML::LibXSLT;
@@ -131,7 +132,10 @@ sub XSLTParse4Display {
     foreach my $syspref ( qw/ hidelostitems OPACURLOpenInNewWindow
                               DisplayOPACiconsXSLT URLLinkText viewISBD
                               OPACBaseURL TraceCompleteSubfields
-                              UseAuthoritiesForTracings TraceSubjectSubdivisions / )
+                              UseAuthoritiesForTracings TraceSubjectSubdivisions
+                              Display856uAsImage OPACDisplay856uAsImage 
+                              UseControlNumber
+                              AlternateHoldingsField AlternateHoldingsSeparator / )
     {
         my $sp = C4::Context->preference( $syspref );
         next unless defined($sp);
@@ -155,14 +159,14 @@ sub XSLTParse4Display {
         if ($interface eq 'intranet') {
             $xslfile = C4::Context->config('intrahtdocs') . 
                       '/' . C4::Context->preference("template") . 
-                      '/' . C4::Output::_current_language() .
+                      '/' . C4::Templates::_current_language() .
                       '/xslt/' .
                       C4::Context->preference('marcflavour') .
                       "slim2intranet$xsl_suffix.xsl";
         } else {
             $xslfile = C4::Context->config('opachtdocs') . 
                       '/' . C4::Context->preference("opacthemes") . 
-                      '/' . C4::Output::_current_language() .
+                      '/' . C4::Templates::_current_language() .
                       '/xslt/' .
                       C4::Context->preference('marcflavour') .
                       "slim2OPAC$xsl_suffix.xsl";
@@ -217,7 +221,7 @@ sub buildKohaItemsNamespace {
         } else {
             $status = "available";
         }
-        my $homebranch = xml_escape($branches->{$item->{homebranch}}->{'branchname'});
+        my $homebranch = $item->{homebranch}? xml_escape($branches->{$item->{homebranch}}->{'branchname'}):'';
            my $itemcallnumber = xml_escape($item->{itemcallnumber});
         $xml.= "<item><homebranch>$homebranch</homebranch>".
                "<status>$status</status>".