Bug Fixing : C4::Charset source_encoding always set to iso-8859-1

[koha-ffzg.git] / C4 / XSLT.pm

diff --git a/C4/XSLT.pm b/C4/XSLT.pm
index edba9bf..98b06da 100644 (file)
--- a/C4/XSLT.pm
+++ b/C4/XSLT.pm
@@ -17,6 +17,9 @@ package C4::XSLT;
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
+use strict;
+use warnings;
+
 use C4::Context;
 use C4::Branch;
 use C4::Items;
@@ -27,8 +30,6 @@ use Encode;
 use XML::LibXML;
 use XML::LibXSLT;
 
-use strict;
-
 use vars qw($VERSION @ISA @EXPORT);
 
 BEGIN {
@@ -123,7 +124,15 @@ sub XSLTParse4Display {
     #return $record->as_formatted();
     my $itemsxml  = buildKohaItemsNamespace($biblionumber);
     my $xmlrecord = $record->as_xml();
-    $xmlrecord =~ s/\<\/record\>/$itemsxml\<\/record\>/;
+    my $sysxml = "<sysprefs>\n";
+    foreach my $syspref ( qw/OPACURLOpenInNewWindow DisplayOPACiconsXSLT URLLinkText/ ) {
+        $sysxml .= "<syspref name=\"$syspref\">" .
+                   C4::Context->preference( $syspref ) .
+                   "</syspref>\n";
+    }
+    $sysxml .= "</sysprefs>\n";
+    $xmlrecord =~ s/\<\/record\>/$itemsxml$sysxml\<\/record\>/;
+
     my $parser = XML::LibXML->new();
     # don't die when you find &, >, etc
     $parser->recover_silently(1);
@@ -147,15 +156,14 @@ sub buildKohaItemsNamespace {
     my @items = C4::Items::GetItemsInfo($biblionumber);
     my $branches = GetBranches();
     my $itemtypes = GetItemTypes();
-
-    my $xml;
+    my $xml = '';
     for my $item (@items) {
         my $status;
 
         my ( $transfertwhen, $transfertfrom, $transfertto ) = C4::Circulation::GetTransfers($item->{itemnumber});
 
-        if ( $itemtypes->{ $item->{itype} }->{notforloan} == 1 || $item->{notforloan} || $item->{onloan} || $item->{wthdrawn} || $item->{itemlost} || $item->{damaged} ||
-             ($transfertwhen ne '') || $item->{itemnotforloan} ) {
+        if ( $itemtypes->{ $item->{itype} }->{notforloan} || $item->{notforloan} || $item->{onloan} || $item->{wthdrawn} || $item->{itemlost} || $item->{damaged} ||
+             (defined $transfertwhen && $transfertwhen ne '') || $item->{itemnotforloan} ) {
             if ( $item->{notforloan} < 0) {
                 $status = "On order";
             } 
@@ -174,7 +182,7 @@ sub buildKohaItemsNamespace {
             if ($item->{damaged}) {
                 $status = "Damaged"; 
             }
-            if ($transfertwhen ne '') {
+            if (defined $transfertwhen && $transfertwhen ne '') {
                 $status = 'In transit';
             }
         } else {
@@ -183,7 +191,9 @@ sub buildKohaItemsNamespace {
         my $homebranch = $branches->{$item->{homebranch}}->{'branchname'};
         $xml.= "<item><homebranch>$homebranch</homebranch>".
                "<status>$status</status>".
-               "<itemcallnumber>".$item->{'itemcallnumber'}."</itemcallnumber></item>";
+               (defined $item->{'itemcallnumber'} ? "<itemcallnumber>".$item->{'itemcallnumber'}."</itemcallnumber>" 
+                                           : "<itemcallnumber />")
+        . "</item>";
 
     }
     $xml = "<items xmlns=\"http://www.koha.org/items\">".$xml."</items>";