X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=C4%2FXSLT.pm;h=7557efe5a2bac6d555a993877ef3d3aa6a14e7e1;hb=0486d0c6b781fbda73df19eb825ef330bdc4544a;hp=f230c2cba158c30d68cf037159b6e99f08deb03e;hpb=486a9496defc2955c8c57382c6e7b66805aeebab;p=koha_gimpoz diff --git a/C4/XSLT.pm b/C4/XSLT.pm index f230c2cba1..7557efe5a2 100644 --- a/C4/XSLT.pm +++ b/C4/XSLT.pm @@ -1,6 +1,8 @@ package C4::XSLT; # Copyright (C) 2006 LibLime # +# Parts Copyright Katrin Fischer 2011 +# Parts Copyright ByWater Solutions 2011 # # This file is part of Koha. # @@ -13,9 +15,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 +28,7 @@ use C4::Items; use C4::Koha; use C4::Biblio; use C4::Circulation; +use C4::Reserves; use Encode; use XML::LibXML; use XML::LibXSLT; @@ -47,15 +50,15 @@ 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 sub transformMARCXML4XSLT { my ($biblionumber, $record) = @_; - my $frameworkcode = GetFrameworkCode($biblionumber); + my $frameworkcode = GetFrameworkCode($biblionumber) || ''; my $tagslib = &GetMarcStructure(1,$frameworkcode); my @fields; # FIXME: wish there was a better way to handle exceptions @@ -86,9 +89,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 @@ -118,32 +121,56 @@ sub getAuthorisedValues4MARCSubfields { my $stylesheet; sub XSLTParse4Display { - my ( $biblionumber, $orig_record, $xsl_suffix ) = @_; + my ( $biblionumber, $orig_record, $xsl_suffix, $interface, $fixamps, $hidden_items ) = @_; + $interface = 'opac' unless $interface; # 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\>/; + my $itemsxml = buildKohaItemsNamespace($biblionumber, $hidden_items); + my $xmlrecord = $record->as_xml(C4::Context->preference('marcflavour')); my $sysxml = "\n"; - foreach my $syspref ( qw/OPACURLOpenInNewWindow DisplayOPACiconsXSLT URLLinkText/ ) { - $sysxml .= "" . - C4::Context->preference( $syspref ) . - "\n"; + foreach my $syspref ( qw/ hidelostitems OPACURLOpenInNewWindow + DisplayOPACiconsXSLT URLLinkText viewISBD + OPACBaseURL TraceCompleteSubfields UseICU + UseAuthoritiesForTracings TraceSubjectSubdivisions + Display856uAsImage OPACDisplay856uAsImage + UseControlNumber + AlternateHoldingsField AlternateHoldingsSeparator / ) + { + my $sp = C4::Context->preference( $syspref ); + next unless defined($sp); + $sysxml .= "$sp\n"; } $sysxml .= "\n"; $xmlrecord =~ s/\<\/record\>/$itemsxml$sysxml\<\/record\>/; + if ($fixamps) { # We need to correct the ampersand entities that Zebra outputs + $xmlrecord =~ s/\&amp;/\&/g; + } + $xmlrecord =~ s/\& /\&\; /; + $xmlrecord =~ s/\&\;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 = C4::Context->config('opachtdocs') . - "/prog/en/xslt/" . + 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"; + } else { + $xslfile = C4::Context->config('opachtdocs') . + '/' . C4::Context->preference("opacthemes") . + '/' . C4::Templates::_current_language() . + '/xslt/' . C4::Context->preference('marcflavour') . "slim2OPAC$xsl_suffix.xsl"; + } my $style_doc = $parser->parse_file($xslfile); $stylesheet = $xslt->parse_stylesheet($style_doc); } @@ -153,8 +180,13 @@ sub XSLTParse4Display { } sub buildKohaItemsNamespace { - my ($biblionumber) = @_; + my ($biblionumber, $hidden_items) = @_; + my @items = C4::Items::GetItemsInfo($biblionumber); + if ($hidden_items && @$hidden_items) { + my %hi = map {$_ => 1} @$hidden_items; + @items = grep { !$hi{$_->{itemnumber}} } @items; + } my $branches = GetBranches(); my $itemtypes = GetItemTypes(); my $xml = ''; @@ -163,8 +195,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, undef ) = 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"; } @@ -186,18 +220,21 @@ 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 $homebranch = $item->{homebranch}? xml_escape($branches->{$item->{homebranch}}->{'branchname'}):''; + my $itemcallnumber = xml_escape($item->{itemcallnumber}); $xml.= "$homebranch". "$status". - (defined $item->{'itemcallnumber'} ? "".$item->{'itemcallnumber'}."" - : "") + "".$itemcallnumber."" . ""; } - $xml = "".$xml.""; + $xml = "".$xml.""; return $xml; } @@ -208,6 +245,8 @@ __END__ =head1 NOTES +=cut + =head1 AUTHOR Joshua Ferraro