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

(-)a/C4/SIP/Sip/MsgType.pm (-16 / +15 lines)
Lines 453-459 sub build_patron_status { Link Here
453
453
454
        my $msg = $patron->screen_msg;
454
        my $msg = $patron->screen_msg;
455
        $msg .= ' -- '. INVALID_PW if $patron_pwd && !$password_rc;
455
        $msg .= ' -- '. INVALID_PW if $patron_pwd && !$password_rc;
456
        $resp .= maybe_add( FID_SCREEN_MSG, $msg, $server, $server );
456
        $resp .= maybe_add( FID_SCREEN_MSG, $msg, $server );
457
457
458
        $resp .= maybe_add( FID_SCREEN_MSG, $patron->{branchcode}, $server )
458
        $resp .= maybe_add( FID_SCREEN_MSG, $patron->{branchcode}, $server )
459
          if ( $server->{account}->{send_patron_home_library_in_af} );
459
          if ( $server->{account}->{send_patron_home_library_in_af} );
Lines 476-482 sub build_patron_status { Link Here
476
        ( $protocol_version >= 2 )
476
        ( $protocol_version >= 2 )
477
          and $resp .= add_field( FID_VALID_PATRON, 'N', $server );
477
          and $resp .= add_field( FID_VALID_PATRON, 'N', $server );
478
478
479
        $resp .= maybe_add( FID_SCREEN_MSG, INVALID_CARD, $server, $server );
479
        $resp .= maybe_add( FID_SCREEN_MSG, INVALID_CARD, $server );
480
    }
480
    }
481
481
482
    $resp .= add_field( FID_INST_ID, $fields->{ (FID_INST_ID) }, $server );
482
    $resp .= add_field( FID_INST_ID, $fields->{ (FID_INST_ID) }, $server );
Lines 561-567 sub handle_checkout { Link Here
561
            $resp .= add_field( FID_DUE_DATE, q{}, $server );
561
            $resp .= add_field( FID_DUE_DATE, q{}, $server );
562
        }
562
        }
563
563
564
        $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server, $server );
564
        $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server );
565
        $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server );
565
        $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server );
566
566
567
        if ( $protocol_version >= 2 ) {
567
        if ( $protocol_version >= 2 ) {
Lines 592-598 sub handle_checkout { Link Here
592
        # it's not due, so leave the date blank
592
        # it's not due, so leave the date blank
593
        $resp .= add_field( FID_DUE_DATE, '', $server );
593
        $resp .= add_field( FID_DUE_DATE, '', $server );
594
594
595
        $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server, $server );
595
        $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server );
596
        $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server );
596
        $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server );
597
597
598
        if ( $protocol_version >= 2 ) {
598
        if ( $protocol_version >= 2 ) {
Lines 1021-1027 sub handle_patron_info { Link Here
1021
        if( defined( $patron_pwd ) && !$password_rc ) {
1021
        if( defined( $patron_pwd ) && !$password_rc ) {
1022
            $msg .= ' -- ' . INVALID_PW;
1022
            $msg .= ' -- ' . INVALID_PW;
1023
        }
1023
        }
1024
        $resp .= maybe_add( FID_SCREEN_MSG, $msg, $server, $server );
1024
        $resp .= maybe_add( FID_SCREEN_MSG, $msg, $server );
1025
        if ( $server->{account}->{send_patron_home_library_in_af} ) {
1025
        if ( $server->{account}->{send_patron_home_library_in_af} ) {
1026
            $resp .= maybe_add( FID_SCREEN_MSG, $patron->{branchcode}, $server);
1026
            $resp .= maybe_add( FID_SCREEN_MSG, $patron->{branchcode}, $server);
1027
        }
1027
        }
Lines 1045-1051 sub handle_patron_info { Link Here
1045
        if ( $protocol_version >= 2 ) {
1045
        if ( $protocol_version >= 2 ) {
1046
            $resp .= add_field( FID_VALID_PATRON, 'N', $server );
1046
            $resp .= add_field( FID_VALID_PATRON, 'N', $server );
1047
        }
1047
        }
1048
        $resp .= maybe_add( FID_SCREEN_MSG, INVALID_CARD, $server, $server );
1048
        $resp .= maybe_add( FID_SCREEN_MSG, INVALID_CARD, $server );
1049
    }
1049
    }
1050
1050
1051
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
1051
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
Lines 1072-1078 sub handle_end_patron_session { Link Here
1072
    $resp .= add_field( FID_INST_ID, $server->{ils}->institution, $server );
1072
    $resp .= add_field( FID_INST_ID, $server->{ils}->institution, $server );
1073
    $resp .= add_field( FID_PATRON_ID, $fields->{ (FID_PATRON_ID) }, $server );
1073
    $resp .= add_field( FID_PATRON_ID, $fields->{ (FID_PATRON_ID) }, $server );
1074
1074
1075
    $resp .= maybe_add( FID_SCREEN_MSG, $screen_msg, $server, $server );
1075
    $resp .= maybe_add( FID_SCREEN_MSG, $screen_msg, $server );
1076
    $resp .= maybe_add( FID_PRINT_LINE, $print_line, $server );
1076
    $resp .= maybe_add( FID_PRINT_LINE, $print_line, $server );
1077
1077
1078
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
1078
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
Lines 1150-1156 sub handle_fee_paid { Link Here
1150
    $resp .= add_field( FID_INST_ID,   $inst_id, $server );
1150
    $resp .= add_field( FID_INST_ID,   $inst_id, $server );
1151
    $resp .= add_field( FID_PATRON_ID, $patron_id, $server );
1151
    $resp .= add_field( FID_PATRON_ID, $patron_id, $server );
1152
    $resp .= maybe_add( FID_TRANSACTION_ID, $status->transaction_id, $server );
1152
    $resp .= maybe_add( FID_TRANSACTION_ID, $status->transaction_id, $server );
1153
    $resp .= maybe_add( FID_SCREEN_MSG,     $status->screen_msg, $server, $server );
1153
    $resp .= maybe_add( FID_SCREEN_MSG,     $status->screen_msg, $server );
1154
    $resp .= maybe_add( FID_PRINT_LINE,     $status->print_line, $server );
1154
    $resp .= maybe_add( FID_PRINT_LINE,     $status->print_line, $server );
1155
1155
1156
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
1156
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
Lines 1220-1226 sub handle_item_information { Link Here
1220
            $resp .= add_field( FID_HOLD_PICKUP_DATE, timestamp($i), $server );
1220
            $resp .= add_field( FID_HOLD_PICKUP_DATE, timestamp($i), $server );
1221
        }
1221
        }
1222
1222
1223
        $resp .= maybe_add( FID_SCREEN_MSG, $item->screen_msg, $server, $server );
1223
        $resp .= maybe_add( FID_SCREEN_MSG, $item->screen_msg, $server );
1224
        $resp .= maybe_add( FID_PRINT_LINE, $item->print_line, $server );
1224
        $resp .= maybe_add( FID_PRINT_LINE, $item->print_line, $server );
1225
    }
1225
    }
1226
1226
Lines 1271-1277 sub handle_item_status_update { Link Here
1271
        $resp .= maybe_add( FID_ITEM_PROPS, $item->sip_item_properties, $server );
1271
        $resp .= maybe_add( FID_ITEM_PROPS, $item->sip_item_properties, $server );
1272
    }
1272
    }
1273
1273
1274
    $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server, $server );
1274
    $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server );
1275
    $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server );
1275
    $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server );
1276
1276
1277
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
1277
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
Lines 1320-1326 sub handle_patron_enable { Link Here
1320
            $resp .= add_field( FID_VALID_PATRON_PWD, sipbool( $patron->check_password($patron_pwd) ), $server );
1320
            $resp .= add_field( FID_VALID_PATRON_PWD, sipbool( $patron->check_password($patron_pwd) ), $server );
1321
        }
1321
        }
1322
        $resp .= add_field( FID_VALID_PATRON, 'Y', $server );
1322
        $resp .= add_field( FID_VALID_PATRON, 'Y', $server );
1323
        $resp .= maybe_add( FID_SCREEN_MSG, $patron->screen_msg, $server, $server );
1323
        $resp .= maybe_add( FID_SCREEN_MSG, $patron->screen_msg, $server );
1324
        $resp .= maybe_add( FID_PRINT_LINE, $patron->print_line, $server );
1324
        $resp .= maybe_add( FID_PRINT_LINE, $patron->print_line, $server );
1325
    }
1325
    }
1326
1326
Lines 1386-1392 sub handle_hold { Link Here
1386
    }
1386
    }
1387
1387
1388
    $resp .= add_field( FID_INST_ID, $ils->institution, $server );
1388
    $resp .= add_field( FID_INST_ID, $ils->institution, $server );
1389
    $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server, $server );
1389
    $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server );
1390
    $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server );
1390
    $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server );
1391
1391
1392
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
1392
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
Lines 1471-1477 sub handle_renew { Link Here
1471
    }
1471
    }
1472
1472
1473
    $resp .= add_field( FID_INST_ID, $ils->institution, $server );
1473
    $resp .= add_field( FID_INST_ID, $ils->institution, $server );
1474
    $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server, $server );
1474
    $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server );
1475
    $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server );
1475
    $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server );
1476
1476
1477
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
1477
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
Lines 1522-1528 sub handle_renew_all { Link Here
1522
    $resp .= join( '', map( add_field( FID_RENEWED_ITEMS,   $_ ), @renewed ), $server );
1522
    $resp .= join( '', map( add_field( FID_RENEWED_ITEMS,   $_ ), @renewed ), $server );
1523
    $resp .= join( '', map( add_field( FID_UNRENEWED_ITEMS, $_ ), @unrenewed ), $server );
1523
    $resp .= join( '', map( add_field( FID_UNRENEWED_ITEMS, $_ ), @unrenewed ), $server );
1524
1524
1525
    $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server, $server );
1525
    $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server );
1526
    $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server );
1526
    $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server );
1527
1527
1528
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
1528
    $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} );
Lines 1614-1620 sub send_acs_status { Link Here
1614
        $msg .= add_field( FID_SUPPORTED_MSGS, $supported_msgs, $server );
1614
        $msg .= add_field( FID_SUPPORTED_MSGS, $supported_msgs, $server );
1615
    }
1615
    }
1616
1616
1617
    $msg .= maybe_add( FID_SCREEN_MSG, $screen_msg, $server, $server );
1617
    $msg .= maybe_add( FID_SCREEN_MSG, $screen_msg, $server );
1618
1618
1619
    if (   defined( $account->{print_width} )
1619
    if (   defined( $account->{print_width} )
1620
        && defined($print_line)
1620
        && defined($print_line)
1621
- 

Return to bug 25107