From f18884db8dc524ae4e55d6bfd5dee73637fdbb85 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 7 Dec 2018 14:32:00 -0500 Subject: [PATCH] Bug 21979: Add option to SIP2 config to send arbitrary item field in CR instead of collection code Some libraries need to send a different field as the collection code, depending on how the library catalogs items. We should allow any arbitrary item field to be used as the value for the CR field. Test Plan: 1) Apply this patch 2) Set the new option cr_item_field to 'shelving_location' 3) Restart the SIP server 3) Perform a checkin via SIP 4) Note the CR field contains the shelving location code in the response 5) Perform an item information request 6) Note the CR field contains the shelving location code in the response Signed-off-by: Jesse Maseto Signed-off-by: Bouzid Fergani Signed-off-by: Martin Renvoize --- C4/SIP/ILS/Item.pm | 4 ++++ C4/SIP/Sip/MsgType.pm | 25 ++++++++++++++++++------- etc/SIPconfig.xml | 1 + 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/C4/SIP/ILS/Item.pm b/C4/SIP/ILS/Item.pm index 056c214be4..8957a99fc6 100644 --- a/C4/SIP/ILS/Item.pm +++ b/C4/SIP/ILS/Item.pm @@ -89,6 +89,8 @@ sub new { $self->{permanent_location} = $item->homebranch; $self->{collection_code} = $item->ccode; $self->{call_number} = $item->itemcallnumber; + $self->{'shelving_location'} = $item->location; + $self->{'permanent_shelving_location'} = $item->permanent_location; $self->{object} = $item; @@ -135,6 +137,8 @@ my %fields = ( barcode => 0, onloan => 0, collection_code => 0, + shelving_location => 0, + permanent_shelving_location => 0, call_number => 0, enumchron => 0, location => 0, diff --git a/C4/SIP/Sip/MsgType.pm b/C4/SIP/Sip/MsgType.pm index d9f8901c06..e5c2b9edbc 100644 --- a/C4/SIP/Sip/MsgType.pm +++ b/C4/SIP/Sip/MsgType.pm @@ -691,13 +691,18 @@ sub handle_checkin { $resp .= add_field( FID_PATRON_ID, $patron->id, $server ); } if ($item) { -$resp .= maybe_add( FID_MEDIA_TYPE, $item->sip_media_type, $server ); -$resp .= maybe_add( FID_ITEM_PROPS, $item->sip_item_properties, $server ); -$resp .= maybe_add( FID_COLLECTION_CODE, $item->collection_code, $server ); -$resp .= maybe_add( FID_CALL_NUMBER, $item->call_number, $server ); -$resp .= maybe_add( FID_HOLD_PATRON_ID, $item->hold_patron_bcode, $server ); -$resp .= add_field( FID_DESTINATION_LOCATION, $item->destination_loc, $server ) if ( $item->destination_loc || $server->{account}->{ct_always_send} ); -$resp .= maybe_add( FID_HOLD_PATRON_NAME, $item->hold_patron_name( $server->{account}->{da_field_template} ), $server ); + $resp .= maybe_add( FID_MEDIA_TYPE, $item->sip_media_type, $server ); + $resp .= maybe_add( FID_ITEM_PROPS, $item->sip_item_properties, $server ); + $resp .= maybe_add( FID_CALL_NUMBER, $item->call_number, $server ); + $resp .= maybe_add( FID_HOLD_PATRON_ID, $item->hold_patron_bcode, $server ); + $resp .= add_field( FID_DESTINATION_LOCATION, $item->destination_loc, $server ) if ( $item->destination_loc || $server->{account}->{ct_always_send} ); + $resp .= maybe_add( FID_HOLD_PATRON_NAME, $item->hold_patron_name( $server->{account}->{da_field_template} ), $server ); + + if ( my $CR = $server->{account}->{cr_item_field} ) { + $resp .= maybe_add( FID_COLLECTION_CODE, $item->{$CR}, $server ); + } else { + $resp .= maybe_add( FID_COLLECTION_CODE, $item->collection_code, $server ); + } if ( $status->hold and $status->hold->{branchcode} ne $item->destination_loc ) { warn 'SIP hold mismatch: $status->hold->{branchcode}=' . $status->hold->{branchcode} . '; $item->destination_loc=' . $item->destination_loc; @@ -1214,6 +1219,12 @@ sub handle_item_information { $resp .= maybe_add( FID_CURRENT_LOCN, $item->current_location, $server ); $resp .= maybe_add( FID_ITEM_PROPS, $item->sip_item_properties, $server ); + if ( my $CR = $server->{account}->{cr_item_field} ) { + $resp .= maybe_add( FID_COLLECTION_CODE, $item->$CR, $server ); + } else { + $resp .= maybe_add( FID_COLLECTION_CODE, $item->collection_code, $server ); + } + if ( ( $i = $item->fee ) != 0 ) { $resp .= add_field( FID_CURRENCY, $item->fee_currency, $server ); $resp .= add_field( FID_FEE_AMT, $i, $server ); diff --git a/etc/SIPconfig.xml b/etc/SIPconfig.xml index e61289f2de..43f34ee05b 100644 --- a/etc/SIPconfig.xml +++ b/etc/SIPconfig.xml @@ -55,6 +55,7 @@ ct_always_send="1" cv_triggers_alert="1" allow_empty_passwords="1" + cr_item_field="shelving_location" ae_field_template="[% patron.surname %][% IF patron.firstname %], [% patron.firstname %][% END %]" da_field_template="[% patron.surname %][% IF patron.firstname %], [% patron.firstname %][% END %]" av_field_template="[% accountline.description %] [% accountline.amountoutstanding | format('%.2f') %]" -- 2.20.1