gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 22415: Update EDI to use Koha::Logger 

This patch updates the EDI code to use the Koha::Logger wrapper in
preference to the bare Log::Log4perl module.

Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Martin Renvoize 2024-12-12 13:26:15 +00:00 committed by Katrin Fischer
parent 8c3a42aa02
commit 7f6c186831
No known key found for this signature in database
GPG Key ID: 0EF6E2C03357A834
2 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Koha/EDI.pm
View File

@ -39,8 +39,8 @@ use C4::Biblio qw(
use Koha::Edifact::Order;
use Koha::Edifact;
use C4::Log qw( logaction );
use Log::Log4perl;
use Text::Unidecode qw( unidecode );
use Koha::Logger;
use Koha::Plugins; # Adds plugin dirs to @INC
use Koha::Plugins::Handler;
use Koha::Acquisition::Baskets;
@ -173,7 +173,7 @@ sub process_ordrsp {
$response_message->status('processing');
$response_message->update;
my $schema = Koha::Database->new()->schema();
my $logger = Log::Log4perl->get_logger();
my $logger = Koha::Logger->get({ interface => 'edi' });
my $vendor_acct;
my $edi =
Koha::Edifact->new( { transmission => $response_message->raw_msg, } );
@ -227,7 +227,7 @@ sub process_invoice {
$invoice_message->status('processing');
$invoice_message->update;
my $schema = Koha::Database->new()->schema();
my $logger = Log::Log4perl->get_logger();
my $logger = Koha::Logger->get({ interface => 'edi' });
my $vendor_acct;
my $plugin_class = $invoice_message->edi_acct()->plugin();
@ -442,7 +442,7 @@ sub _get_invoiced_price {
sub receipt_items {
my ( $schema, $inv_line, $ordernumber, $quantity ) = @_;
my $logger = Log::Log4perl->get_logger();
my $logger = Koha::Logger->get({ interface => 'edi' });
# itemnumber is not a foreign key ??? makes this a bit cumbersome
my @item_links = $schema->resultset('AqordersItem')->search(
@ -542,7 +542,7 @@ sub transfer_items {
}
++$gocc;
}
my $logger = Log::Log4perl->get_logger();
my $logger = Koha::Logger->get({ interface => 'edi' });
my $o1 = $order_from->ordernumber;
my $o2 = $order_to->ordernumber;
$logger->warn("transferring $quantity copies from order $o1 to order $o2");
@ -586,7 +586,7 @@ sub process_quote {
my $messages = $edi->message_array();
my $process_errors = 0;
my $logger = Log::Log4perl->get_logger();
my $logger = Koha::Logger->get({ interface => 'edi' });
my $schema = Koha::Database->new()->schema();
my $message_count = 0;
my @added_baskets; # if auto & multiple baskets need to order all
@ -671,7 +671,7 @@ sub quote_item {
my ( $item, $quote, $basketno ) = @_;
my $schema = Koha::Database->new()->schema();
my $logger = Log::Log4perl->get_logger();
my $logger = Koha::Logger->get({ interface => 'edi' });
# $basketno is the return from AddBasket in the calling routine
# So this call should not fail unless that has

15
misc/cronjobs/edi_cron.pl
View File

@ -31,26 +31,15 @@ use utf8;
use Koha::Script -cron;
use C4::Context;
use Log::Log4perl qw(:easy);
use Koha::Database;
use Koha::EDI qw( process_quote process_invoice process_ordrsp );
use Koha::Edifact::Transport;
use Koha::Logger;
use Koha::Plugins::Handler;
use Fcntl qw( LOCK_EX O_CREAT O_RDWR SEEK_SET );
die "Syspref 'EDIFACT' is disabled" unless C4::Context->preference('EDIFACT');
my $logdir = C4::Context->config('logdir');
# logging set to trace as this may be what you
# want on implementation
Log::Log4perl->easy_init(
{
level => $TRACE,
file => ">>$logdir/editrace.log",
}
);
# we dont have a lock dir in context so use the logdir
my $pidfile = "$logdir/edicron.pid";
@ -60,7 +49,7 @@ my $schema = Koha::Database->new()->schema();
my @edi_accts = $schema->resultset('VendorEdiAccount')->all();
my $logger = Log::Log4perl->get_logger();
my $logger = Koha::Logger->get({ interface => 'edi', prefix => 0 });
for my $acct (@edi_accts) {
if ( $acct->quotes_enabled ) {