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

(-)a/Koha/ERM/EUsage/UsageDataProvider.pm (-10 / +27 lines)
Lines 174-184 sub harvest_sushi { Link Here
174
    $self->{report_type} = $args->{report_type};
174
    $self->{report_type} = $args->{report_type};
175
    $self->{begin_date}  = $args->{begin_date};
175
    $self->{begin_date}  = $args->{begin_date};
176
    $self->{end_date}    = $args->{end_date};
176
    $self->{end_date}    = $args->{end_date};
177
    my $url     = $self->_build_url_query;
177
    my $url      = $self->_build_url_query;
178
    my $request = HTTP::Request->new( 'GET' => $url );
178
    my $response = _handle_sushi_request($url);
179
    my $ua      = LWP::UserAgent->new;
180
    $ua->agent( 'Koha/' . Koha::version() );
181
    my $response = $ua->simple_request($request);
182
179
183
    if ( $response->code >= 400 ) {
180
    if ( $response->code >= 400 ) {
184
        my $result = decode_json( $response->decoded_content );
181
        my $result = decode_json( $response->decoded_content );
Lines 279-288 sub test_connection { Link Here
279
    $url .= '&requestor_id=' . $self->requestor_id if $self->requestor_id;
276
    $url .= '&requestor_id=' . $self->requestor_id if $self->requestor_id;
280
    $url .= '&api_key=' . $self->api_key           if $self->api_key;
277
    $url .= '&api_key=' . $self->api_key           if $self->api_key;
281
278
282
    my $request = HTTP::Request->new( 'GET' => $url );
279
    my $response = _handle_sushi_request($url);
283
    my $ua      = LWP::UserAgent->new;
284
    $ua->agent( 'Koha/' . Koha::version() );
285
    my $response = $ua->simple_request($request);
286
280
287
    if ( $response->{_rc} >= 400 ) {
281
    if ( $response->{_rc} >= 400 ) {
288
        my $message = $response->{_msg};
282
        my $message = $response->{_msg};
Lines 520-525 sub _counter_file_size_too_large { Link Here
520
    return 0;
514
    return 0;
521
}
515
}
522
516
517
=head3 _handle_sushi_response
518
519
Creates and sends the request based on a provided url
520
Also handles any redirects
521
522
=cut
523
524
sub _handle_sushi_request {
525
    my ($url) = @_;
526
527
    my $request = HTTP::Request->new( 'GET' => $url );
528
    my $ua      = LWP::UserAgent->new;
529
    $ua->agent( 'Koha/' . Koha::version() );
530
    my $response = $ua->simple_request($request);
531
532
    if ( $response->is_redirect ) {
533
        my $redirect_url = $response->header('Location');
534
        $redirect_url = URI->new_abs( $redirect_url, $url );
535
        $response     = $ua->get($redirect_url);
536
    }
537
538
    return $response;
539
}
540
523
=head3 _type
541
=head3 _type
524
542
525
=cut
543
=cut
526
- 

Return to bug 37526