Attachment #141496 for bug #31552

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




        $resp .= add_field( FID_ITEM_ID,   $item_id, $server );
        $resp .= add_field( FID_TITLE_ID,  $item->title_id, $server );
        if ( $item->due_date ) {
            my $due_date =
              $account->{format_due_date}
              ? output_pref( { str => $item->due_date, as_due_date => 1 } )
              : timestamp( $item->due_date );
                $due_date = timestamp( $item->due_date );
            }
            $resp .= add_field( FID_DUE_DATE, $due_date, $server );
        } else {
            $resp .= add_field( FID_DUE_DATE, q{}, $server );


sub handle_item_information {
    my ( $self, $server ) = @_;
    my $account = $server->{account};
    my $ils     = $server->{ils};
    my $fields  = $self->{fields};
    my $resp    = ITEM_INFO_RESP;
    my $trans_date;
    my $fields = $self->{fields};
    my $resp   = ITEM_INFO_RESP;
    my $item;
    my $i;


            $resp .= add_field( FID_HOLD_QUEUE_LEN, $i, $server );
        }
        if ( $item->due_date ) {
            my $due_date =
              $account->{format_due_date}
              ? output_pref( { str => $item->due_date, as_due_date => 1 } )
              : timestamp( $item->due_date );
            $resp .= add_field( FID_DUE_DATE, $due_date, $server );
        }
        if ( ( $i = $item->recall_date ) != 0 ) {
            $resp .= add_field( FID_RECALL_DATE, timestamp($i), $server );




};

subtest "Test cr_item_field" => sub {
    plan tests => 3;

    my $builder = t::lib::TestBuilder->new();
    my $branchcode  = $builder->build({ source => 'Branch' })->{branchcode};


    my $itype = $item_object->itype;
    ok( $response =~ m/CR$itype/, "Found correct CR field in response");

    $server->{account}->{format_due_date} = 1;
    t::lib::Mocks::mock_preference( 'dateFormat',  'sql' );
    my $issue = Koha::Checkout->new({ branchcode => $branchcode, borrowernumber => $patron1->{borrowernumber}, itemnumber => $item_object->itemnumber, date_due => "1999-01-01 12:59:00" })->store;
    $siprequest = ITEM_INFORMATION . 'YYYYMMDDZZZZHHMMSS' .
        FID_INST_ID . $branchcode . '|'.
        FID_ITEM_ID . $item_object->barcode . '|' .
        FID_TERMINAL_PWD . 'ignored' . '|';
    undef $response;
    $msg = C4::SIP::Sip::MsgType->new( $siprequest, 0 );
    $msg->handle_item_information( $server );
    ok( $response =~ m/AH1999-01-01 12:59/, "Found correct CR field in response");
};

subtest 'Patron info summary > 5 should not crash server' => sub {
- 

Return to bug 31552

Lines 574-585 sub handle_checkout { Link Here

(-)a/C4/SIP/Sip/MsgType.pm (-10 / +13 lines)
574	$resp .= add_field( FID_ITEM_ID, $item_id, $server );	574	$resp .= add_field( FID_ITEM_ID, $item_id, $server );
575	$resp .= add_field( FID_TITLE_ID, $item->title_id, $server );	575	$resp .= add_field( FID_TITLE_ID, $item->title_id, $server );
576	if ( $item->due_date ) {	576	if ( $item->due_date ) {
577	my $due_date;	577	my $due_date =
578	if( $account->{format_due_date} ){	578	$account->{format_due_date}
579	$due_date = output_pref({ str => $item->due_date, as_due_date => 1 });	579	? output_pref( { str => $item->due_date, as_due_date => 1 } )
580	} else {	580	: timestamp( $item->due_date );
581	$due_date = timestamp( $item->due_date );
582	}
583	$resp .= add_field( FID_DUE_DATE, $due_date, $server );	581	$resp .= add_field( FID_DUE_DATE, $due_date, $server );
584	} else {	582	} else {
585	$resp .= add_field( FID_DUE_DATE, q{}, $server );	583	$resp .= add_field( FID_DUE_DATE, q{}, $server );
Lines 1203-1212 sub handle_fee_paid { Link Here
1203		1201
1204	sub handle_item_information {	1202	sub handle_item_information {
1205	my ( $self, $server ) = @_;	1203	my ( $self, $server ) = @_;
1206	my $ils = $server->{ils};	1204	my $account = $server->{account};
		1205	my $ils = $server->{ils};
		1206	my $fields = $self->{fields};
		1207	my $resp = ITEM_INFO_RESP;
1207	my $trans_date;	1208	my $trans_date;
1208	my $fields = $self->{fields};
1209	my $resp = ITEM_INFO_RESP;
1210	my $item;	1209	my $item;
1211	my $i;	1210	my $i;
1212		1211
Lines 1266-1272 sub handle_item_information { Link Here
1266	$resp .= add_field( FID_HOLD_QUEUE_LEN, $i, $server );	1265	$resp .= add_field( FID_HOLD_QUEUE_LEN, $i, $server );
1267	}	1266	}
1268	if ( $item->due_date ) {	1267	if ( $item->due_date ) {
1269	$resp .= add_field( FID_DUE_DATE, timestamp( $item->due_date ), $server );	1268	my $due_date =
		1269	$account->{format_due_date}
		1270	? output_pref( { str => $item->due_date, as_due_date => 1 } )
		1271	: timestamp( $item->due_date );
		1272	$resp .= add_field( FID_DUE_DATE, $due_date, $server );
1270	}	1273	}
1271	if ( ( $i = $item->recall_date ) != 0 ) {	1274	if ( ( $i = $item->recall_date ) != 0 ) {
1272	$resp .= add_field( FID_RECALL_DATE, timestamp($i), $server );	1275	$resp .= add_field( FID_RECALL_DATE, timestamp($i), $server );

Lines 296-302 subtest "Test build_custom_field_string" => sub { Link Here

(-)a/t/db_dependent/SIP/Message.t (-2 / +13 lines)
296	};	296	};
297		297
298	subtest "Test cr_item_field" => sub {	298	subtest "Test cr_item_field" => sub {
299	plan tests => 2;	299	plan tests => 3;
300		300
301	my $builder = t::lib::TestBuilder->new();	301	my $builder = t::lib::TestBuilder->new();
302	my $branchcode = $builder->build({ source => 'Branch' })->{branchcode};	302	my $branchcode = $builder->build({ source => 'Branch' })->{branchcode};
Lines 368-373 subtest "Test cr_item_field" => sub { Link Here
368		368
369	my $itype = $item_object->itype;	369	my $itype = $item_object->itype;
370	ok( $response =~ m/CR$itype/, "Found correct CR field in response");	370	ok( $response =~ m/CR$itype/, "Found correct CR field in response");
		371
		372	$server->{account}->{format_due_date} = 1;
		373	t::lib::Mocks::mock_preference( 'dateFormat', 'sql' );
		374	my $issue = Koha::Checkout->new({ branchcode => $branchcode, borrowernumber => $patron1->{borrowernumber}, itemnumber => $item_object->itemnumber, date_due => "1999-01-01 12:59:00" })->store;
		375	$siprequest = ITEM_INFORMATION . 'YYYYMMDDZZZZHHMMSS' .
		376	FID_INST_ID . $branchcode . '\|'.
		377	FID_ITEM_ID . $item_object->barcode . '\|' .
		378	FID_TERMINAL_PWD . 'ignored' . '\|';
		379	undef $response;
		380	$msg = C4::SIP::Sip::MsgType->new( $siprequest, 0 );
		381	$msg->handle_item_information( $server );
		382	ok( $response =~ m/AH1999-01-01 12:59/, "Found correct CR field in response");
371	};	383	};
372		384
373	subtest 'Patron info summary > 5 should not crash server' => sub {	385	subtest 'Patron info summary > 5 should not crash server' => sub {
374	-