Merge commit 'kc/master'

[koha.git] / C4 / XSLT.pm

diff --git a/C4/XSLT.pm b/C4/XSLT.pm
index 8a67e04..1c45e44 100644 (file)
--- a/C4/XSLT.pm
+++ b/C4/XSLT.pm
@@ -13,9 +13,9 @@ package C4::XSLT;
 # 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., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# 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.
 
 use strict;
 use warnings;
@@ -26,6 +26,8 @@ use C4::Items;
 use C4::Koha;
 use C4::Biblio;
 use C4::Circulation;
+use C4::Reserves;
+use C4::Output qw//;
 use Encode;
 use XML::LibXML;
 use XML::LibXSLT;
@@ -47,9 +49,9 @@ C4::XSLT - Functions for displaying XSLT-generated content
 
 =head1 FUNCTIONS
 
-=head1 transformMARCXML4XSLT
+=head2 transformMARCXML4XSLT
 
-=head2 replaces codes with authorized values in a MARC::Record object
+Replaces codes with authorized values in a MARC::Record object
 
 =cut
 
@@ -86,9 +88,9 @@ sub transformMARCXML4XSLT {
     return $record;
 }
 
-=head1 getAuthorisedValues4MARCSubfields
+=head2 getAuthorisedValues4MARCSubfields
 
-=head2 returns an ref of hash of ref of hash for tag -> letter controled bu authorised values
+Returns a ref of hash of ref of hash for tag -> letter controled by authorised values
 
 =cut
 
@@ -124,9 +126,9 @@ sub XSLTParse4Display {
     my $record = transformMARCXML4XSLT($biblionumber, $orig_record);
     #return $record->as_formatted();
     my $itemsxml  = buildKohaItemsNamespace($biblionumber);
-    my $xmlrecord = $record->as_xml();
+    my $xmlrecord = $record->as_xml(C4::Context->preference('marcflavour'));
     my $sysxml = "<sysprefs>\n";
-    foreach my $syspref ( qw/OPACURLOpenInNewWindow DisplayOPACiconsXSLT URLLinkText/ ) {
+    foreach my $syspref ( qw/OPACURLOpenInNewWindow DisplayOPACiconsXSLT URLLinkText viewISBD OPACBaseURL/ ) {
         $sysxml .= "<syspref name=\"$syspref\">" .
                    C4::Context->preference( $syspref ) .
                    "</syspref>\n";
@@ -134,22 +136,27 @@ sub XSLTParse4Display {
     $sysxml .= "</sysprefs>\n";
     $xmlrecord =~ s/\<\/record\>/$itemsxml$sysxml\<\/record\>/;
     $xmlrecord =~ s/\& /\&amp\; /;
+    $xmlrecord=~ s/\&amp\;amp\; /\&amp\; /;
 
     my $parser = XML::LibXML->new();
     # don't die when you find &, >, etc
-    $parser->recover_silently(1);
+    $parser->recover_silently(0);
     my $source = $parser->parse_string($xmlrecord);
     unless ( $stylesheet ) {
         my $xslt = XML::LibXSLT->new();
         my $xslfile;
         if ($interface eq 'intranet') {
             $xslfile = C4::Context->config('intrahtdocs') . 
-                      "/prog/en/xslt/" .
+                      '/' . C4::Context->preference("template") . 
+                      '/' . C4::Output::_current_language() .
+                      '/xslt/' .
                       C4::Context->preference('marcflavour') .
                       "slim2intranet$xsl_suffix.xsl";
         } else {
             $xslfile = C4::Context->config('opachtdocs') . 
-                      "/prog/en/xslt/" .
+                      '/' . C4::Context->preference("opacthemes") . 
+                      '/' . C4::Output::_current_language() .
+                      '/xslt/' .
                       C4::Context->preference('marcflavour') .
                       "slim2OPAC$xsl_suffix.xsl";
         }
@@ -172,8 +179,10 @@ sub buildKohaItemsNamespace {
 
         my ( $transfertwhen, $transfertfrom, $transfertto ) = C4::Circulation::GetTransfers($item->{itemnumber});
 
-        if ( $itemtypes->{ $item->{itype} }->{notforloan} || $item->{notforloan} || $item->{onloan} || $item->{wthdrawn} || $item->{itemlost} || $item->{damaged} ||
-             (defined $transfertwhen && $transfertwhen ne '') || $item->{itemnotforloan} ) {
+       my ( $reservestatus, $reserveitem ) = C4::Reserves::CheckReserves($item->{itemnumber});
+
+        if ( $itemtypes->{ $item->{itype} }->{notforloan} || $item->{notforloan} || $item->{onloan} || $item->{wthdrawn} || $item->{itemlost} || $item->{damaged} || 
+             (defined $transfertwhen && $transfertwhen ne '') || $item->{itemnotforloan} || (defined $reservestatus && $reservestatus eq "Waiting") ){ 
             if ( $item->{notforloan} < 0) {
                 $status = "On order";
             } 
@@ -195,14 +204,18 @@ sub buildKohaItemsNamespace {
             if (defined $transfertwhen && $transfertwhen ne '') {
                 $status = 'In transit';
             }
+            if (defined $reservestatus && $reservestatus eq "Waiting") {
+                $status = 'Waiting';
+            }
         } else {
             $status = "available";
         }
         my $homebranch = $branches->{$item->{homebranch}}->{'branchname'};
+        my $itemcallnumber = $item->{itemcallnumber} || '';
+        $itemcallnumber =~ s/\&/\&amp\;/g;
         $xml.= "<item><homebranch>$homebranch</homebranch>".
                "<status>$status</status>".
-               (defined $item->{'itemcallnumber'} ? "<itemcallnumber>".$item->{'itemcallnumber'}."</itemcallnumber>" 
-                                           : "<itemcallnumber />")
+               "<itemcallnumber>".$itemcallnumber."</itemcallnumber>"
         . "</item>";
 
     }
@@ -217,6 +230,8 @@ __END__
 
 =head1 NOTES
 
+=cut
+
 =head1 AUTHOR
 
 Joshua Ferraro <jmf@liblime.com>