View | Details | Raw Unified | Return to bug 25107
Collapse All | Expand All

(-)a/C4/SIP/Sip/MsgType.pm (-16 / +15 lines)
Lines 458-464 sub build_patron_status { Link Here
458
458
459
        my $msg = $patron->screen_msg;
459
        my $msg = $patron->screen_msg;
460
        $msg .= ' -- '. INVALID_PW if $patron_pwd && !$password_rc;
460
        $msg .= ' -- '. INVALID_PW if $patron_pwd && !$password_rc;
461
        $resp .= maybe_add( FID_SCREEN_MSG, $msg, $server, $server );
461
        $resp .= maybe_add( FID_SCREEN_MSG, $msg, $server );
462
462
463
        $resp .= maybe_add( FID_SCREEN_MSG, $patron->{branchcode}, $server )
463
        $resp .= maybe_add( FID_SCREEN_MSG, $patron->{branchcode}, $server )
464
          if ( $server->{account}->{send_patron_home_library_in_af} );
464
          if ( $server->{account}->{send_patron_home_library_in_af} );
Lines 482-488 sub build_patron_status { Link Here
482
        ( $protocol_version >= 2 )
482
        ( $protocol_version >= 2 )
483
          and $resp .= add_field( FID_VALID_PATRON, 'N', $server );
483
          and $resp .= add_field( FID_VALID_PATRON, 'N', $server );
484
484
485
        $resp .= maybe_add( FID_SCREEN_MSG, INVALID_CARD, $server, $server );
485
        $resp .= maybe_add( FID_SCREEN_MSG, INVALID_CARD, $server );
486
    }
486
    }
487
487
488
    $resp .= add_field( FID_INST_ID, $fields->{ (FID_INST_ID) }, $server );
488
    $resp .= add_field( FID_INST_ID, $fields->{ (FID_INST_ID) }, $server );
Lines 567-573 sub handle_checkout { Link Here
567
            $resp .= add_field( FID_DUE_DATE, q{}, $server );
567
            $resp .= add_field( FID_DUE_DATE, q{}, $server );
568
        }
568
        }
569
569
570
        $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server, $server );
570
        $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server );
571
        $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server );
571
        $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server );
572
572
573
        if ( $protocol_version >= 2 ) {
573
        if ( $protocol_version >= 2 ) {
Lines 598-604 sub handle_checkout { Link Here
598
        # it's not due, so leave the date blank
598
        # it's not due, so leave the date blank
599
        $resp .= add_field( FID_DUE_DATE, '', $server );
599
        $resp .= add_field( FID_DUE_DATE, '', $server );
600
600
601
        $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server, $server );
601
        $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server );
602
        $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server );
602
        $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server );
603
603
604
        if ( $protocol_version >= 2 ) {
604
        if ( $protocol_version >= 2 ) {
Lines 1031-1037 sub handle_patron_info { Link Here
1031
        if( defined( $patron_pwd ) && !$password_rc ) {
1031
        if( defined( $patron_pwd ) && !$password_rc ) {
1032
            $msg .= ' -- ' . INVALID_PW;
1032
            $msg .= ' -- ' . INVALID_PW;
1033
        }
1033
        }
1034
        $resp .= maybe_add( FID_SCREEN_MSG, $msg, $server, $server );
1034
        $resp .= maybe_add( FID_SCREEN_MSG, $msg, $server );
1035
        if ( $server->{account}->{send_patron_home_library_in_af} ) {
1035
        if ( $server->{account}->{send_patron_home_library_in_af} ) {
1036
            $resp .= maybe_add( FID_SCREEN_MSG, $patron->{branchcode}, $server);
1036
            $resp .= maybe_add( FID_SCREEN_MSG, $patron->{branchcode}, $server);
1037
        }
1037
        }
Lines 1056-1062 sub handle_patron_info { Link Here
1056
        if ( $protocol_version >= 2 ) {
1056
        if ( $protocol_version >= 2 ) {
1057
            $resp .= add_field( FID_VALID_PATRON, 'N', $server );
1057
            $resp .= add_field( FID_VALID_PATRON, 'N', $server );
1058
        }
1058
        }
1059
        $resp .= maybe_add( FID_SCREEN_MSG, INVALID_CARD, $server, $server );
1059
        $resp .= maybe_add( FID_SCREEN_MSG, INVALID_CARD, $server );
1060
    }
1060
    }
1061
1061
1062
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
1062
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
Lines 1083-1089 sub handle_end_patron_session { Link Here
1083
    $resp .= add_field( FID_INST_ID, $server->{ils}->institution, $server );
1083
    $resp .= add_field( FID_INST_ID, $server->{ils}->institution, $server );
1084
    $resp .= add_field( FID_PATRON_ID, $fields->{ (FID_PATRON_ID) }, $server );
1084
    $resp .= add_field( FID_PATRON_ID, $fields->{ (FID_PATRON_ID) }, $server );
1085
1085
1086
    $resp .= maybe_add( FID_SCREEN_MSG, $screen_msg, $server, $server );
1086
    $resp .= maybe_add( FID_SCREEN_MSG, $screen_msg, $server );
1087
    $resp .= maybe_add( FID_PRINT_LINE, $print_line, $server );
1087
    $resp .= maybe_add( FID_PRINT_LINE, $print_line, $server );
1088
1088
1089
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
1089
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
Lines 1161-1167 sub handle_fee_paid { Link Here
1161
    $resp .= add_field( FID_INST_ID,   $inst_id, $server );
1161
    $resp .= add_field( FID_INST_ID,   $inst_id, $server );
1162
    $resp .= add_field( FID_PATRON_ID, $patron_id, $server );
1162
    $resp .= add_field( FID_PATRON_ID, $patron_id, $server );
1163
    $resp .= maybe_add( FID_TRANSACTION_ID, $status->transaction_id, $server );
1163
    $resp .= maybe_add( FID_TRANSACTION_ID, $status->transaction_id, $server );
1164
    $resp .= maybe_add( FID_SCREEN_MSG,     $status->screen_msg, $server, $server );
1164
    $resp .= maybe_add( FID_SCREEN_MSG,     $status->screen_msg, $server );
1165
    $resp .= maybe_add( FID_PRINT_LINE,     $status->print_line, $server );
1165
    $resp .= maybe_add( FID_PRINT_LINE,     $status->print_line, $server );
1166
1166
1167
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
1167
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
Lines 1231-1237 sub handle_item_information { Link Here
1231
            $resp .= add_field( FID_HOLD_PICKUP_DATE, timestamp($i), $server );
1231
            $resp .= add_field( FID_HOLD_PICKUP_DATE, timestamp($i), $server );
1232
        }
1232
        }
1233
1233
1234
        $resp .= maybe_add( FID_SCREEN_MSG, $item->screen_msg, $server, $server );
1234
        $resp .= maybe_add( FID_SCREEN_MSG, $item->screen_msg, $server );
1235
        $resp .= maybe_add( FID_PRINT_LINE, $item->print_line, $server );
1235
        $resp .= maybe_add( FID_PRINT_LINE, $item->print_line, $server );
1236
    }
1236
    }
1237
1237
Lines 1282-1288 sub handle_item_status_update { Link Here
1282
        $resp .= maybe_add( FID_ITEM_PROPS, $item->sip_item_properties, $server );
1282
        $resp .= maybe_add( FID_ITEM_PROPS, $item->sip_item_properties, $server );
1283
    }
1283
    }
1284
1284
1285
    $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server, $server );
1285
    $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server );
1286
    $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server );
1286
    $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server );
1287
1287
1288
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
1288
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
Lines 1331-1337 sub handle_patron_enable { Link Here
1331
            $resp .= add_field( FID_VALID_PATRON_PWD, sipbool( $patron->check_password($patron_pwd) ), $server );
1331
            $resp .= add_field( FID_VALID_PATRON_PWD, sipbool( $patron->check_password($patron_pwd) ), $server );
1332
        }
1332
        }
1333
        $resp .= add_field( FID_VALID_PATRON, 'Y', $server );
1333
        $resp .= add_field( FID_VALID_PATRON, 'Y', $server );
1334
        $resp .= maybe_add( FID_SCREEN_MSG, $patron->screen_msg, $server, $server );
1334
        $resp .= maybe_add( FID_SCREEN_MSG, $patron->screen_msg, $server );
1335
        $resp .= maybe_add( FID_PRINT_LINE, $patron->print_line, $server );
1335
        $resp .= maybe_add( FID_PRINT_LINE, $patron->print_line, $server );
1336
    }
1336
    }
1337
1337
Lines 1397-1403 sub handle_hold { Link Here
1397
    }
1397
    }
1398
1398
1399
    $resp .= add_field( FID_INST_ID, $ils->institution, $server );
1399
    $resp .= add_field( FID_INST_ID, $ils->institution, $server );
1400
    $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server, $server );
1400
    $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server );
1401
    $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server );
1401
    $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server );
1402
1402
1403
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
1403
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
Lines 1482-1488 sub handle_renew { Link Here
1482
    }
1482
    }
1483
1483
1484
    $resp .= add_field( FID_INST_ID, $ils->institution, $server );
1484
    $resp .= add_field( FID_INST_ID, $ils->institution, $server );
1485
    $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server, $server );
1485
    $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server );
1486
    $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server );
1486
    $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server );
1487
1487
1488
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
1488
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
Lines 1533-1539 sub handle_renew_all { Link Here
1533
    $resp .= join( '', map( add_field( FID_RENEWED_ITEMS,   $_ ), @renewed ), $server );
1533
    $resp .= join( '', map( add_field( FID_RENEWED_ITEMS,   $_ ), @renewed ), $server );
1534
    $resp .= join( '', map( add_field( FID_UNRENEWED_ITEMS, $_ ), @unrenewed ), $server );
1534
    $resp .= join( '', map( add_field( FID_UNRENEWED_ITEMS, $_ ), @unrenewed ), $server );
1535
1535
1536
    $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server, $server );
1536
    $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server );
1537
    $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server );
1537
    $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server );
1538
1538
1539
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
1539
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
Lines 1625-1631 sub send_acs_status { Link Here
1625
        $msg .= add_field( FID_SUPPORTED_MSGS, $supported_msgs, $server );
1625
        $msg .= add_field( FID_SUPPORTED_MSGS, $supported_msgs, $server );
1626
    }
1626
    }
1627
1627
1628
    $msg .= maybe_add( FID_SCREEN_MSG, $screen_msg, $server, $server );
1628
    $msg .= maybe_add( FID_SCREEN_MSG, $screen_msg, $server );
1629
1629
1630
    if (   defined( $account->{print_width} )
1630
    if (   defined( $account->{print_width} )
1631
        && defined($print_line)
1631
        && defined($print_line)
1632
- 

Return to bug 25107