Bug 3346: Fixes invalid XHTML in opac-shelves.tmpl

[koha.git] / C4 / XSLT.pm

diff --git a/C4/XSLT.pm b/C4/XSLT.pm
index 8c576b3..76e7ea7 100644 (file)
--- a/C4/XSLT.pm
+++ b/C4/XSLT.pm
@@ -17,17 +17,19 @@ 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;
 use C4::Koha;
 use C4::Biblio;
 use C4::Circulation;
+use Encode;
 use XML::LibXML;
 use XML::LibXSLT;
 
-use strict;
-
 use vars qw($VERSION @ISA @EXPORT);
 
 BEGIN {
@@ -52,9 +54,7 @@ C4::XSLT - Functions for displaying XSLT-generated content
 =cut
 
 sub transformMARCXML4XSLT {
-    my ($biblionumber, $orig_record) = @_;
-    my $record = $orig_record->clone(); # not updating original record; this may be unnecessarily paranoid
-    my $biblio = GetBiblioData($biblionumber);
+    my ($biblionumber, $record) = @_;
     my $frameworkcode = GetFrameworkCode($biblionumber);
     my $tagslib = &GetMarcStructure(1,$frameworkcode);
     my @fields;
@@ -63,26 +63,24 @@ sub transformMARCXML4XSLT {
         @fields = $record->fields();
     };
     if ($@) { warn "PROBLEM WITH RECORD"; next; }
-    my $list_of_authvalues = getAuthorisedValues4MARCSubfields($frameworkcode);
-    for my $authvalue (@$list_of_authvalues) {
-        for my $field ( $record->field($authvalue->{tagfield}) ) {
-            my @newSubfields = ();
-            for my $subfield ( $field->subfields() ) {
-                my ($code,$data) = @$subfield;
-                unless ($code eq $authvalue->{tagsubfield}) {
-                    push ( @newSubfields, $code, $data );
-                } else {
-                    my $newvalue = GetAuthorisedValueDesc( $authvalue->{tagfield}, $code, $data, '', $tagslib );
-                    push ( @newSubfields, $code, $newvalue );
-                }
+    my $av = getAuthorisedValues4MARCSubfields($frameworkcode);
+    foreach my $tag ( keys %$av ) {
+        foreach my $field ( $record->field( $tag ) ) {
+            if ( $av->{ $tag } ) {
+                my @new_subfields = ();
+                for my $subfield ( $field->subfields() ) {
+                    my ( $letter, $value ) = @$subfield;
+                    $value = GetAuthorisedValueDesc( $tag, $letter, $value, '', $tagslib )
+                        if $av->{ $tag }->{ $letter };
+                    push( @new_subfields, $letter, $value );
+                } 
+                $field ->replace_with( MARC::Field->new(
+                    $tag,
+                    $field->indicator(1),
+                    $field->indicator(2),
+                    @new_subfields
+                ) );
             }
-            my $newField = MARC::Field->new(
-                $authvalue->{tagfield},
-                $field->indicator(1),
-                $field->indicator(2),
-                $authvalue->{tagsubfield} => @newSubfields
-            );
-            $field->replace_with($newField);
         }
     }
     return $record;
@@ -90,7 +88,7 @@ sub transformMARCXML4XSLT {
 
 =head1 getAuthorisedValues4MARCSubfields
 
-=head2 returns an array of hash refs for authorised value tag/subfield combos for a given framework
+=head2 returns an ref of hash of ref of hash for tag -> letter controled bu authorised values
 
 =cut
 
@@ -101,7 +99,6 @@ my %authval_per_framework;
 sub getAuthorisedValues4MARCSubfields {
     my ($frameworkcode) = @_;
     unless ( $authval_per_framework{ $frameworkcode } ) {
-        my @results;
         my $dbh = C4::Context->dbh;
         my $sth = $dbh->prepare("SELECT DISTINCT tagfield, tagsubfield
                                  FROM marc_subfield_structure
@@ -109,10 +106,11 @@ sub getAuthorisedValues4MARCSubfields {
                                    AND authorised_value!=''
                                    AND frameworkcode=?");
         $sth->execute( $frameworkcode );
-        while ( my $result = $sth->fetchrow_hashref() ) {
-            push ( @results, $result );
+        my $av = { };
+        while ( my ( $tag, $letter ) = $sth->fetchrow() ) {
+            $av->{ $tag }->{ $letter } = 1;
         }
-        $authval_per_framework{ $frameworkcode } = \@results;
+        $authval_per_framework{ $frameworkcode } = $av;
     }
     return $authval_per_framework{ $frameworkcode };
 }
@@ -120,9 +118,10 @@ sub getAuthorisedValues4MARCSubfields {
 my $stylesheet;
 
 sub XSLTParse4Display {
-    my ($biblionumber, $orig_record, $xslfile) = @_;
+    my ( $biblionumber, $orig_record, $xsl_suffix ) = @_;
     # grab the XML, run it through our stylesheet, push it out to the browser
     my $record = transformMARCXML4XSLT($biblionumber, $orig_record);
+    #return $record->as_formatted();
     my $itemsxml  = buildKohaItemsNamespace($biblionumber);
     my $xmlrecord = $record->as_xml();
     $xmlrecord =~ s/\<\/record\>/$itemsxml\<\/record\>/;
@@ -132,6 +131,10 @@ sub XSLTParse4Display {
     my $source = $parser->parse_string($xmlrecord);
     unless ( $stylesheet ) {
         my $xslt = XML::LibXSLT->new();
+        my $xslfile = C4::Context->config('opachtdocs') . 
+                      "/prog/en/xslt/" .
+                      C4::Context->preference('marcflavour') .
+                      "slim2OPAC$xsl_suffix.xsl";
         my $style_doc = $parser->parse_file($xslfile);
         $stylesheet = $xslt->parse_stylesheet($style_doc);
     }
@@ -145,15 +148,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";
             } 
@@ -172,18 +174,22 @@ sub buildKohaItemsNamespace {
             if ($item->{damaged}) {
                 $status = "Damaged"; 
             }
-            if ($transfertwhen ne '') {
+            if (defined $transfertwhen && $transfertwhen ne '') {
                 $status = 'In transit';
             }
         } else {
             $status = "available";
         }
-        $xml.="<item><homebranch>".$branches->{$item->{homebranch}}->{'branchname'}."</homebranch>".
+        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>";
 
     }
-    return "<items xmlns='http://www.koha.org/items'>".$xml."</items>";
+    $xml = "<items xmlns=\"http://www.koha.org/items\">".$xml."</items>";
+    return $xml;
 }