From d990e2cd32a026c60c00c8c2acbab29f530c35e7 Mon Sep 17 00:00:00 2001 From: Nahuel ANGELINETTI Date: Mon, 1 Feb 2010 12:31:35 +0100 Subject: [PATCH] (bug #4084) fix offline circ this add the function C4::Circulation::GetOpenIssue and delete \r chars when processing koc files. Cherry picked from 3.0.x commit 5af80ab Signed-off-by: Galen Charlton --- C4/Circulation.pm | 3 +-- offline_circ/process_koc.pl | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 034a8d6d4b..644ab2749b 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -69,7 +69,6 @@ BEGIN { &AddRenewal &GetRenewCount &GetItemIssue - &GetOpenIssue &GetItemIssues &GetBorrowerIssues &GetIssuingCharges @@ -77,6 +76,7 @@ BEGIN { &GetBranchBorrowerCircRule &GetBranchItemRule &GetBiblioIssues + &GetOpenIssue &AnonymiseIssueHistory ); @@ -904,7 +904,6 @@ sub AddIssue { my ( $borrower, $barcode, $datedue, $cancelreserve, $issuedate, $sipmode) = @_; my $dbh = C4::Context->dbh; my $barcodecheck=CheckValidBarcode($barcode); - # $issuedate defaults to today. if ( ! defined $issuedate ) { $issuedate = strftime( "%Y-%m-%d", localtime ); diff --git a/offline_circ/process_koc.pl b/offline_circ/process_koc.pl index a187722f8c..5655f0c570 100755 --- a/offline_circ/process_koc.pl +++ b/offline_circ/process_koc.pl @@ -189,7 +189,8 @@ sub parse_header_line { sub parse_command_line { my $command_line = shift; chomp($command_line); - + $command_line =~ s/\r//g; + my ( $timestamp, $command, @args ) = split( /\t/, $command_line ); my ( $date, $time, $id ) = split( /\s/, $timestamp ); @@ -248,11 +249,11 @@ sub kocIssueItem { my ( $year, $month, $day ) = split( /-/, $circ->{'date'} ); ( $year, $month, $day ) = Add_Delta_Days( $year, $month, $day, $issuelength ); my $date_due = sprintf("%04d-%02d-%02d", $year, $month, $day); - + if ( $issue->{ 'date_due' } ) { ## Item is currently checked out to another person. #warn "Item Currently Issued."; my $issue = GetOpenIssue( $item->{'itemnumber'} ); - + if ( $issue->{'borrowernumber'} eq $borrower->{'borrowernumber'} ) { ## Issued to this person already, renew it. #warn "Item issued to this member already, renewing."; -- 2.20.1