use Modern::Perl;
use C4::Context;
-use C4::Items;
-use C4::Koha;
-use C4::Biblio;
-use C4::Circulation;
-use C4::Reserves;
+use C4::Koha qw( xml_escape );
+use C4::Biblio qw( GetAuthorisedValueDesc GetFrameworkCode GetMarcStructure );
use Koha::AuthorisedValues;
use Koha::ItemTypes;
-use Koha::XSLT_Handler;
+use Koha::XSLT::Base;
use Koha::Libraries;
-use Encode;
-use vars qw(@ISA @EXPORT);
my $engine; #XSLT Handler object
my %authval_per_framework;
# Cache for tagfield-tagsubfield to decode per framework.
# Should be preferably be placed in Koha-core...
+our (@ISA, @EXPORT_OK);
BEGIN {
require Exporter;
@ISA = qw(Exporter);
- @EXPORT = qw(
- &XSLTParse4Display
+ @EXPORT_OK = qw(
+ transformMARCXML4XSLT
+ getAuthorisedValues4MARCSubfields
+ buildKohaItemsNamespace
+ XSLTParse4Display
);
- $engine=Koha::XSLT_Handler->new( { do_not_return_source => 1 } );
+ $engine=Koha::XSLT::Base->new( { do_not_return_source => 1 } );
}
=head1 NAME
for my $subfield ( $field->subfields() ) {
my ( $letter, $value ) = @$subfield;
# Replace the field value with the authorised value *except* for MARC21/NORMARC field 942$n (suppression in opac)
- if ( !( $tag eq '942' && $subfield eq 'n' ) || $marcflavour eq 'UNIMARC' ) {
+ if ( !( $tag eq '942' && $subfield->[0] eq 'n' ) || $marcflavour eq 'UNIMARC' ) {
$value = GetAuthorisedValueDesc( $tag, $letter, $value, '', $tagslib )
if $av->{ $tag }->{ $letter };
}
my $sysxml = "<sysprefs>\n";
foreach my $syspref ( qw/ hidelostitems OPACURLOpenInNewWindow
DisplayOPACiconsXSLT URLLinkText viewISBD
- OPACBaseURL TraceCompleteSubfields UseICU
+ OPACBaseURL TraceCompleteSubfields UseICUStyleQuotes
UseAuthoritiesForTracings TraceSubjectSubdivisions
Display856uAsImage OPACDisplay856uAsImage
UseControlNumber IntranetBiblioDefaultView BiblioDefaultView
}
sub XSLTParse4Display {
- my ( $biblionumber, $orig_record, $xslsyspref, $fixamps, $hidden_items, $sysxml, $xslfilename, $lang, $variables ) = @_;
+ my ( $biblionumber, $orig_record, $xslsyspref, $fixamps, $hidden_items, $sysxml, $xslfilename, $lang, $variables, $items_rs ) = @_;
$sysxml ||= C4::Context->preference($xslsyspref);
$xslfilename ||= C4::Context->preference($xslsyspref);
# grab the XML, run it through our stylesheet, push it out to the browser
my $record = transformMARCXML4XSLT($biblionumber, $orig_record);
- my $itemsxml = buildKohaItemsNamespace($biblionumber, $hidden_items);
+ my $itemsxml;
+ if ( $xslsyspref eq "OPACXSLTDetailsDisplay" || $xslsyspref eq "XSLTDetailsDisplay" || $xslsyspref eq "XSLTResultsDisplay" ) {
+ $itemsxml = ""; #We don't use XSLT for items display on these pages
+ } else {
+ $itemsxml = buildKohaItemsNamespace($biblionumber, $hidden_items, $items_rs);
+ }
my $xmlrecord = $record->as_xml(C4::Context->preference('marcflavour'));
$variables ||= {};
=head2 buildKohaItemsNamespace
-Returns XML for items.
+ my $items_xml = buildKohaItemsNamespace( $biblionumber, [ $hidden_items, $items ] );
+
+Returns XML for items. It accepts two optional parameters:
+- I<$hidden_items>: An arrayref of itemnumber values, for items that should be hidden
+- I<$items>: A Koha::Items resultset, for the items to be returned
+
+If both parameters are passed, I<$items> is used as the basis resultset, and I<$hidden_items>
+are filtered out of it.
+
Is only used in this module currently.
=cut
sub buildKohaItemsNamespace {
- my ($biblionumber, $hidden_items) = @_;
+ my ($biblionumber, $hidden_items, $items_rs) = @_;
+
+ $hidden_items ||= [];
+
+ my $query = {};
+ $query = { 'me.itemnumber' => { not_in => $hidden_items } }
+ if $hidden_items;
+
+ unless ( $items_rs && ref($items_rs) eq 'Koha::Items' ) {
+ $query->{'me.biblionumber'} = $biblionumber;
+ $items_rs = Koha::Items->new;
+ }
- my $search_params;
- $search_params->{biblionumber} = $biblionumber;
- $search_params->{itemnumber} = { not_in => $hidden_items } if $hidden_items;
- my @items = Koha::Items->search($search_params);
+ my $items = $items_rs->search( $query, { prefetch => [ 'branchtransfers', 'reserves' ] } );
my $shelflocations =
- { map { $_->{authorised_value} => $_->{opac_description} } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => GetFrameworkCode($biblionumber), kohafield => 'items.location' } ) };
+ { map { $_->{authorised_value} => $_->{opac_description} } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => "", kohafield => 'items.location' } ) };
my $ccodes =
- { map { $_->{authorised_value} => $_->{opac_description} } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => GetFrameworkCode($biblionumber), kohafield => 'items.ccode' } ) };
+ { map { $_->{authorised_value} => $_->{opac_description} } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => "", kohafield => 'items.ccode' } ) };
my %branches = map { $_->branchcode => $_->branchname } Koha::Libraries->search({}, { order_by => 'branchname' });
my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search->unblessed } };
- my $location = "";
- my $ccode = "";
my $xml = '';
- for my $item (@items) {
- my $status;
-
- my ( $transfertwhen, $transfertfrom, $transfertto ) = C4::Circulation::GetTransfers($item->itemnumber);
+ my %descs = map { $_->{authorised_value} => $_ } Koha::AuthorisedValues->get_descriptions_by_koha_field( { kohafield => 'items.notforloan' } );
+ my $ref_status = C4::Context->preference('Reference_NFL_Statuses') || '1|2';
- my $reservestatus = C4::Reserves::GetReserveStatus( $item->itemnumber );
+ while ( my $item = $items->next ) {
+ my $status;
+ my $substatus = '';
- if ( ( $item->itype && $itemtypes->{ $item->itype }->{notforloan} ) || $item->notforloan || $item->onloan || $item->withdrawn || $item->itemlost || $item->damaged ||
- (defined $transfertwhen && $transfertwhen ne '') || $item->{itemnotforloan} || (defined $reservestatus && $reservestatus eq "Waiting") || $item->has_pending_hold ){
- if ( $item->notforloan < 0) {
- $status = "On order";
- }
- if ( $item->notforloan && $item->notforloan > 0 || $item->itype && $itemtypes->{ $item->itype }->{notforloan} && $itemtypes->{ $item->itype }->{notforloan} == 1 ) {
- $status = "reference";
- }
- if ($item->onloan) {
- $status = "Checked out";
- }
- if ( $item->withdrawn) {
- $status = "Withdrawn";
- }
- if ($item->itemlost) {
- $status = "Lost";
- }
- if ($item->damaged) {
- $status = "Damaged";
- }
- if (defined $transfertwhen && $transfertwhen ne '') {
- $status = 'In transit';
- }
- if (defined $reservestatus && $reservestatus eq "Waiting") {
- $status = 'Waiting';
- }
- if ($item->has_pending_hold) {
- $status = 'Pending hold';
- }
- } else {
+ if ($item->has_pending_hold) {
+ $status = 'Pending hold';
+ }
+ elsif ( $item->holds->waiting->count ) {
+ $status = 'Waiting';
+ }
+ elsif ($item->get_transfer) {
+ $status = 'In transit';
+ }
+ elsif ($item->damaged) {
+ $status = "Damaged";
+ }
+ elsif ($item->itemlost) {
+ $status = "Lost";
+ }
+ elsif ( $item->withdrawn) {
+ $status = "Withdrawn";
+ }
+ elsif ($item->onloan) {
+ $status = "Checked out";
+ }
+ elsif ( $item->notforloan ) {
+ $status = $item->notforloan =~ /^($ref_status)$/
+ ? "reference"
+ : "reallynotforloan";
+ $substatus = exists $descs{$item->notforloan} ? $descs{$item->notforloan}->{opac_description} : "Not for loan";
+ }
+ elsif ( exists $itemtypes->{ $item->effective_itemtype }
+ && $itemtypes->{ $item->effective_itemtype }->{notforloan}
+ && $itemtypes->{ $item->effective_itemtype }->{notforloan} == 1 )
+ {
+ $status = "1" =~ /^($ref_status)$/
+ ? "reference"
+ : "reallynotforloan";
+ $substatus = "Not for loan";
+ }
+ else {
$status = "available";
}
- my $homebranch = $item->homebranch? xml_escape($branches{$item->homebranch}):'';
- my $holdingbranch = $item->holdingbranch? xml_escape($branches{$item->holdingbranch}):'';
- $location = $item->location? xml_escape($shelflocations->{$item->location}||$item->location):'';
- $ccode = $item->ccode? xml_escape($ccodes->{$item->ccode}||$item->ccode):'';
+ my $homebranch = xml_escape($branches{$item->homebranch});
+ my $holdingbranch = xml_escape($branches{$item->holdingbranch});
+ my $location = xml_escape($item->location && exists $shelflocations->{$item->location} ? $shelflocations->{$item->location} : $item->location);
+ my $ccode = xml_escape($item->ccode && exists $ccodes->{$item->ccode} ? $ccodes->{$item->ccode} : $item->ccode);
my $itemcallnumber = xml_escape($item->itemcallnumber);
- my $stocknumber = $item->stocknumber? xml_escape($item->stocknumber):'';
+ my $stocknumber = xml_escape($item->stocknumber);
$xml .=
"<item>"
. "<homebranch>$homebranch</homebranch>"
. "<location>$location</location>"
. "<ccode>$ccode</ccode>"
. "<status>".( $status // q{} )."</status>"
+ . "<substatus>$substatus</substatus>"
. "<itemcallnumber>$itemcallnumber</itemcallnumber>"
. "<stocknumber>$stocknumber</stocknumber>"
. "</item>";
projects / srvgit / blobdiff