From fc1a5ed3187c8f4da2db23e0f14e9f4b332055d2 Mon Sep 17 00:00:00 2001 From: Henri-Damien LAURENT Date: Wed, 11 Nov 2009 12:00:18 +0100 Subject: [PATCH] MT1883 : Serials enddate was not cleanly used GetExpirationDate should now be used only to get the NEXT expirationdate based on startdate Perltidying C4/Serials.pm --- C4/Serials.pm | 1440 +++++++++++++++------------------ serials/subscription-renew.pl | 2 +- t/db_dependent/Serials.t | 15 +- 3 files changed, 677 insertions(+), 780 deletions(-) diff --git a/C4/Serials.pm b/C4/Serials.pm index ab389e0a0d..8bfa6590d0 100644 --- a/C4/Serials.pm +++ b/C4/Serials.pm @@ -17,7 +17,6 @@ package C4::Serials; #assumes C4/Serials.pm # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, # Suite 330, Boston, MA 02111-1307 USA - use strict; use C4::Dates qw(format_date); use Date::Calc qw(:all); @@ -28,36 +27,36 @@ use C4::Biblio; use C4::Items; use C4::Search; use C4::Letters; -use C4::Log; # logaction +use C4::Log; # logaction use C4::Debug; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); BEGIN { - $VERSION = 3.01; # set version for version checking + $VERSION = 3.01; # set version for version checking require Exporter; @ISA = qw(Exporter); @EXPORT = qw( - &NewSubscription &ModSubscription &DelSubscription &GetSubscriptions - &GetSubscription &CountSubscriptionFromBiblionumber &GetSubscriptionsFromBiblionumber - &GetFullSubscriptionsFromBiblionumber &GetFullSubscription &ModSubscriptionHistory - &HasSubscriptionStrictlyExpired &HasSubscriptionExpired &GetExpirationDate &abouttoexpire - - &GetNextSeq &NewIssue &ItemizeSerials &GetSerials - &GetLatestSerials &ModSerialStatus &GetNextDate &GetSerials2 - &ReNewSubscription &GetLateIssues &GetLateOrMissingIssues - &GetSerialInformation &AddItem2Serial - &PrepareSerialsData &GetNextExpected &ModNextExpected - - &UpdateClaimdateIssues - &GetSuppliersWithLateIssues &getsupplierbyserialid - &GetDistributedTo &SetDistributedTo - &getroutinglist &delroutingmember &addroutingmember - &reorder_members - &check_routing &updateClaim &removeMissingIssue - &CountIssues + &NewSubscription &ModSubscription &DelSubscription &GetSubscriptions + &GetSubscription &CountSubscriptionFromBiblionumber &GetSubscriptionsFromBiblionumber + &GetFullSubscriptionsFromBiblionumber &GetFullSubscription &ModSubscriptionHistory + &HasSubscriptionStrictlyExpired &HasSubscriptionExpired &GetExpirationDate &abouttoexpire - ); + &GetNextSeq &NewIssue &ItemizeSerials &GetSerials + &GetLatestSerials &ModSerialStatus &GetNextDate &GetSerials2 + &ReNewSubscription &GetLateIssues &GetLateOrMissingIssues + &GetSerialInformation &AddItem2Serial + &PrepareSerialsData &GetNextExpected &ModNextExpected + + &UpdateClaimdateIssues + &GetSuppliersWithLateIssues &getsupplierbyserialid + &GetDistributedTo &SetDistributedTo + &getroutinglist &delroutingmember &addroutingmember + &reorder_members + &check_routing &updateClaim &removeMissingIssue + &CountIssues + + ); } =head2 GetSuppliersWithLateIssues @@ -141,8 +140,7 @@ sub GetLateIssues { ORDER BY title |; $sth = $dbh->prepare($query); - } - else { + } else { my $query = qq| SELECT name,title,planneddate,serialseq,serial.subscriptionid FROM subscription @@ -238,41 +236,41 @@ sub GetSerialInformation { my $dbh = C4::Context->dbh; my $query = qq| SELECT serial.*, serial.notes as sernotes, serial.status as serstatus,subscription.*,subscription.subscriptionid as subsid |; - if (C4::Context->preference('IndependantBranches') && - C4::Context->userenv && - C4::Context->userenv->{'flags'} != 1 && C4::Context->userenv->{'branch'}){ - $query.=" - , ((subscription.branchcode <>\"".C4::Context->userenv->{'branch'}."\") and subscription.branchcode <>\"\" and subscription.branchcode IS NOT NULL) as cannotedit "; - } - $query .= qq| + if ( C4::Context->preference('IndependantBranches') + && C4::Context->userenv + && C4::Context->userenv->{'flags'} != 1 + && C4::Context->userenv->{'branch'} ) { + $query .= " + , ((subscription.branchcode <>\"" . C4::Context->userenv->{'branch'} . "\") and subscription.branchcode <>\"\" and subscription.branchcode IS NOT NULL) as cannotedit "; + } + $query .= qq| FROM serial LEFT JOIN subscription ON subscription.subscriptionid=serial.subscriptionid WHERE serialid = ? |; my $rq = $dbh->prepare($query); $rq->execute($serialid); my $data = $rq->fetchrow_hashref; + # create item information if we have serialsadditems for this subscription if ( $data->{'serialsadditems'} ) { - my $queryitem=$dbh->prepare("SELECT itemnumber from serialitems where serialid=?"); + my $queryitem = $dbh->prepare("SELECT itemnumber from serialitems where serialid=?"); $queryitem->execute($serialid); - my $itemnumbers=$queryitem->fetchall_arrayref([0]); - if (scalar(@$itemnumbers)>0){ + my $itemnumbers = $queryitem->fetchall_arrayref( [0] ); + if ( scalar(@$itemnumbers) > 0 ) { foreach my $itemnum (@$itemnumbers) { + #It is ASSUMED that GetMarcItem ALWAYS WORK... #Maybe GetMarcItem should return values on failure - $debug and warn "itemnumber :$itemnum->[0], bibnum :".$data->{'biblionumber'}; - my $itemprocessed = - PrepareItemrecordDisplay( $data->{'biblionumber'}, $itemnum->[0] , $data ); + $debug and warn "itemnumber :$itemnum->[0], bibnum :" . $data->{'biblionumber'}; + my $itemprocessed = PrepareItemrecordDisplay( $data->{'biblionumber'}, $itemnum->[0], $data ); $itemprocessed->{'itemnumber'} = $itemnum->[0]; $itemprocessed->{'itemid'} = $itemnum->[0]; $itemprocessed->{'serialid'} = $serialid; $itemprocessed->{'biblionumber'} = $data->{'biblionumber'}; push @{ $data->{'items'} }, $itemprocessed; } - } - else { - my $itemprocessed = - PrepareItemrecordDisplay( $data->{'biblionumber'}, '', $data ); + } else { + my $itemprocessed = PrepareItemrecordDisplay( $data->{'biblionumber'}, '', $data ); $itemprocessed->{'itemid'} = "N$serialid"; $itemprocessed->{'serialid'} = $serialid; $itemprocessed->{'biblionumber'} = $data->{'biblionumber'}; @@ -281,10 +279,8 @@ sub GetSerialInformation { } } $data->{ "status" . $data->{'serstatus'} } = 1; - $data->{'subscriptionexpired'} = - HasSubscriptionExpired( $data->{'subscriptionid'} ) && $data->{'status'}==1; - $data->{'abouttoexpire'} = - abouttoexpire( $data->{'subscriptionid'} ); + $data->{'subscriptionexpired'} = HasSubscriptionExpired( $data->{'subscriptionid'} ) && $data->{'status'} == 1; + $data->{'abouttoexpire'} = abouttoexpire( $data->{'subscriptionid'} ); return $data; } @@ -301,9 +297,9 @@ Adds an itemnumber to Serial record sub AddItem2Serial { my ( $serialid, $itemnumber ) = @_; - my $dbh = C4::Context->dbh; - my $rq = $dbh->prepare("INSERT INTO `serialitems` SET serialid=? , itemnumber=?"); - $rq->execute($serialid, $itemnumber); + my $dbh = C4::Context->dbh; + my $rq = $dbh->prepare("INSERT INTO `serialitems` SET serialid=? , itemnumber=?"); + $rq->execute( $serialid, $itemnumber ); return $rq->rows; } @@ -322,11 +318,11 @@ Update Claimdate for issues in @$serialids list with date $date sub UpdateClaimdateIssues { my ( $serialids, $date ) = @_; - my $dbh = C4::Context->dbh; - $date = strftime("%Y-%m-%d",localtime) unless ($date); + my $dbh = C4::Context->dbh; + $date = strftime( "%Y-%m-%d", localtime ) unless ($date); my $query = " UPDATE serial SET claimdate=$date,status=7 - WHERE serialid in (".join (",",@$serialids) .")"; + WHERE serialid in (" . join( ",", @$serialids ) . ")"; my $rq = $dbh->prepare($query); $rq->execute; return $rq->rows; @@ -355,25 +351,27 @@ sub GetSubscription { aqbooksellers.name AS aqbooksellername, biblio.title AS bibliotitle, subscription.biblionumber as bibnum); - if (C4::Context->preference('IndependantBranches') && - C4::Context->userenv && - C4::Context->userenv->{'flags'} != 1 && C4::Context->userenv->{'branch'}){ - $query.=" - , ((subscription.branchcode <>\"".C4::Context->userenv->{'branch'}."\") and subscription.branchcode <>\"\" and subscription.branchcode IS NOT NULL) as cannotedit "; - } - $query .= qq( + if ( C4::Context->preference('IndependantBranches') + && C4::Context->userenv + && C4::Context->userenv->{'flags'} != 1 + && C4::Context->userenv->{'branch'} ) { + $query .= " + , ((subscription.branchcode <>\"" . C4::Context->userenv->{'branch'} . "\") and subscription.branchcode <>\"\" and subscription.branchcode IS NOT NULL) as cannotedit "; + } + $query .= qq( FROM subscription LEFT JOIN subscriptionhistory ON subscription.subscriptionid=subscriptionhistory.subscriptionid LEFT JOIN aqbooksellers ON subscription.aqbooksellerid=aqbooksellers.id LEFT JOIN biblio ON biblio.biblionumber=subscription.biblionumber WHERE subscription.subscriptionid = ? ); -# if (C4::Context->preference('IndependantBranches') && -# C4::Context->userenv && -# C4::Context->userenv->{'flags'} != 1){ -# # $debug and warn "flags: ".C4::Context->userenv->{'flags'}; -# $query.=" AND subscription.branchcode IN ('".C4::Context->userenv->{'branch'}."',\"\")"; -# } + + # if (C4::Context->preference('IndependantBranches') && + # C4::Context->userenv && + # C4::Context->userenv->{'flags'} != 1){ + # # $debug and warn "flags: ".C4::Context->userenv->{'flags'}; + # $query.=" AND subscription.branchcode IN ('".C4::Context->userenv->{'branch'}."',\"\")"; + # } $debug and warn "query : $query\nsubsid :$subscriptionid"; my $sth = $dbh->prepare($query); $sth->execute($subscriptionid); @@ -393,8 +391,8 @@ sub GetSubscription { sub GetFullSubscription { my ($subscriptionid) = @_; - my $dbh = C4::Context->dbh; - my $query = qq| + my $dbh = C4::Context->dbh; + my $query = qq| SELECT serial.serialid, serial.serialseq, serial.planneddate, @@ -406,13 +404,14 @@ sub GetFullSubscription { biblio.title as bibliotitle, subscription.branchcode AS branchcode, subscription.subscriptionid AS subscriptionid |; - if (C4::Context->preference('IndependantBranches') && - C4::Context->userenv && - C4::Context->userenv->{'flags'} != 1 && C4::Context->userenv->{'branch'}){ - $query.=" - , ((subscription.branchcode <>\"".C4::Context->userenv->{'branch'}."\") and subscription.branchcode <>\"\" and subscription.branchcode IS NOT NULL) as cannotedit "; + if ( C4::Context->preference('IndependantBranches') + && C4::Context->userenv + && C4::Context->userenv->{'flags'} != 1 + && C4::Context->userenv->{'branch'} ) { + $query .= " + , ((subscription.branchcode <>\"" . C4::Context->userenv->{'branch'} . "\") and subscription.branchcode <>\"\" and subscription.branchcode IS NOT NULL) as cannotedit "; } - $query.=qq| + $query .= qq| FROM serial LEFT JOIN subscription ON (serial.subscriptionid=subscription.subscriptionid ) @@ -423,13 +422,12 @@ sub GetFullSubscription { IF(serial.publisheddate="00-00-0000",serial.planneddate,serial.publisheddate) DESC, serial.subscriptionid |; - $debug and warn "GetFullSubscription query: $query"; + $debug and warn "GetFullSubscription query: $query"; my $sth = $dbh->prepare($query); $sth->execute($subscriptionid); - return $sth->fetchall_arrayref({}); + return $sth->fetchall_arrayref( {} ); } - =head2 PrepareSerialsData =over 4 @@ -441,8 +439,8 @@ sub GetFullSubscription { =cut -sub PrepareSerialsData{ - my ($lines)=@_; +sub PrepareSerialsData { + my ($lines) = @_; my %tmpresults; my $year; my @res; @@ -452,28 +450,27 @@ sub PrepareSerialsData{ my @loopissues; my $first; my $previousnote = ""; - - foreach my $subs ( @$lines ) { - $subs->{'publisheddate'} = - ( $subs->{'publisheddate'} + + foreach my $subs (@$lines) { + $subs->{'publisheddate'} = ( + $subs->{'publisheddate'} ? format_date( $subs->{'publisheddate'} ) - : "XXX" ); - $subs->{'planneddate'} = format_date( $subs->{'planneddate'} ); + : "XXX" + ); + $subs->{'planneddate'} = format_date( $subs->{'planneddate'} ); $subs->{ "status" . $subs->{'status'} } = 1; - $subs->{ "checked" } = $subs->{'status'} =~/1|3|4|7/; + $subs->{"checked"} = $subs->{'status'} =~ /1|3|4|7/; if ( $subs->{'year'} && $subs->{'year'} ne "" ) { $year = $subs->{'year'}; - } - else { + } else { $year = "manage"; } if ( $tmpresults{$year} ) { push @{ $tmpresults{$year}->{'serials'} }, $subs; - } - else { + } else { $tmpresults{$year} = { - 'year' => $year, + 'year' => $year, 'aqbooksellername' => $subs->{'aqbooksellername'}, 'bibliotitle' => $subs->{'bibliotitle'}, 'serials' => [$subs], @@ -484,7 +481,7 @@ sub PrepareSerialsData{ foreach my $key ( sort { $b cmp $a } keys %tmpresults ) { push @res, $tmpresults{$key}; } - $res[0]->{'first'}=1; + $res[0]->{'first'} = 1; return \@res; } @@ -521,26 +518,28 @@ sub GetSubscriptionsFromBiblionumber { while ( my $subs = $sth->fetchrow_hashref ) { $subs->{startdate} = format_date( $subs->{startdate} ); $subs->{histstartdate} = format_date( $subs->{histstartdate} ); - $subs->{histenddate} = format_date( $subs->{histenddate} ); + $subs->{histenddate} = format_date( $subs->{histenddate} ); $subs->{opacnote} =~ s/\n/\/g; $subs->{missinglist} =~ s/\n/\/g; $subs->{recievedlist} =~ s/\n/\/g; - $subs->{ "periodicity" . $subs->{periodicity} } = 1; + $subs->{ "periodicity" . $subs->{periodicity} } = 1; $subs->{ "numberpattern" . $subs->{numberpattern} } = 1; - $subs->{ "status" . $subs->{'status'} } = 1; - $subs->{'cannotedit'}=(C4::Context->preference('IndependantBranches') && - C4::Context->userenv && - C4::Context->userenv->{flags} % 2 !=1 && - C4::Context->userenv->{branch} && $subs->{branchcode} && - (C4::Context->userenv->{branch} ne $subs->{branchcode})); + $subs->{ "status" . $subs->{'status'} } = 1; + $subs->{'cannotedit'} = + ( C4::Context->preference('IndependantBranches') + && C4::Context->userenv + && C4::Context->userenv->{flags} % 2 != 1 + && C4::Context->userenv->{branch} + && $subs->{branchcode} + && ( C4::Context->userenv->{branch} ne $subs->{branchcode} ) ); + if ( $subs->{enddate} eq '0000-00-00' ) { $subs->{enddate} = ''; - } - else { + } else { $subs->{enddate} = format_date( $subs->{enddate} ); } - $subs->{'abouttoexpire'}=abouttoexpire($subs->{'subscriptionid'}); - $subs->{'subscriptionexpired'}=HasSubscriptionExpired($subs->{'subscriptionid'}); + $subs->{'abouttoexpire'} = abouttoexpire( $subs->{'subscriptionid'} ); + $subs->{'subscriptionexpired'} = HasSubscriptionExpired( $subs->{'subscriptionid'} ); push @res, $subs; } return \@res; @@ -571,14 +570,15 @@ sub GetFullSubscriptionsFromBiblionumber { biblio.title as bibliotitle, subscription.branchcode AS branchcode, subscription.subscriptionid AS subscriptionid|; - if (C4::Context->preference('IndependantBranches') && - C4::Context->userenv && - C4::Context->userenv->{'flags'} != 1 && C4::Context->userenv->{'branch'}){ - $query.=" - , ((subscription.branchcode <>\"".C4::Context->userenv->{'branch'}."\") and subscription.branchcode <>\"\" and subscription.branchcode IS NOT NULL) as cannotedit "; - } - - $query.=qq| + if ( C4::Context->preference('IndependantBranches') + && C4::Context->userenv + && C4::Context->userenv->{'flags'} != 1 + && C4::Context->userenv->{'branch'} ) { + $query .= " + , ((subscription.branchcode <>\"" . C4::Context->userenv->{'branch'} . "\") and subscription.branchcode <>\"\" and subscription.branchcode IS NOT NULL) as cannotedit "; + } + + $query .= qq| FROM serial LEFT JOIN subscription ON (serial.subscriptionid=subscription.subscriptionid) @@ -591,7 +591,7 @@ sub GetFullSubscriptionsFromBiblionumber { |; my $sth = $dbh->prepare($query); $sth->execute($biblionumber); - return $sth->fetchall_arrayref({}); + return $sth->fetchall_arrayref( {} ); } =head2 GetSubscriptions @@ -608,7 +608,8 @@ a table of hashref. Each hash containt the subscription. =cut sub GetSubscriptions { - my ( $string, $issn,$biblionumber) = @_; + my ( $string, $issn, $biblionumber ) = @_; + #return unless $title or $ISSN or $biblionumber; my $dbh = C4::Context->dbh; my $sth; @@ -622,57 +623,59 @@ sub GetSubscriptions { my @bind_params; my $sqlwhere; if ($biblionumber) { - $sqlwhere=" WHERE biblio.biblionumber=?"; - push @bind_params,$biblionumber; + $sqlwhere = " WHERE biblio.biblionumber=?"; + push @bind_params, $biblionumber; } - if ($string){ - my @sqlstrings; + if ($string) { + my @sqlstrings; my @strings_to_search; - @strings_to_search=map {"%$_%"} split (/ /,$string); - foreach my $index qw(biblio.title subscription.callnumber subscription.location subscription.notes subscription.internalnotes){ - push @bind_params,@strings_to_search; - my $tmpstring= "AND $index LIKE ? "x scalar(@strings_to_search); - $debug && warn "$tmpstring"; - $tmpstring=~s/^AND //; - push @sqlstrings,$tmpstring; + @strings_to_search = map { "%$_%" } split( / /, $string ); + foreach my $index qw(biblio.title subscription.callnumber subscription.location subscription.notes subscription.internalnotes) { + push @bind_params, @strings_to_search; + my $tmpstring = "AND $index LIKE ? " x scalar(@strings_to_search); + $debug && warn "$tmpstring"; + $tmpstring =~ s/^AND //; + push @sqlstrings, $tmpstring; } - $sqlwhere.= ($sqlwhere?" AND ":" WHERE ")."(".join(") OR (",@sqlstrings).")"; + $sqlwhere .= ( $sqlwhere ? " AND " : " WHERE " ) . "(" . join( ") OR (", @sqlstrings ) . ")"; } - if ($issn){ - my @sqlstrings; + if ($issn) { + my @sqlstrings; my @strings_to_search; - @strings_to_search=map {"%$_%"} split (/ /,$issn); - foreach my $index qw(biblioitems.issn subscription.callnumber){ - push @bind_params,@strings_to_search; - my $tmpstring= "OR $index LIKE ? "x scalar(@strings_to_search); - $debug && warn "$tmpstring"; - $tmpstring=~s/^OR //; - push @sqlstrings,$tmpstring; + @strings_to_search = map { "%$_%" } split( / /, $issn ); + foreach my $index qw(biblioitems.issn subscription.callnumber) { + push @bind_params, @strings_to_search; + my $tmpstring = "OR $index LIKE ? " x scalar(@strings_to_search); + $debug && warn "$tmpstring"; + $tmpstring =~ s/^OR //; + push @sqlstrings, $tmpstring; } - $sqlwhere.= ($sqlwhere?" AND ":" WHERE ")."(".join(") OR (",@sqlstrings).")"; - } - $sql.="$sqlwhere ORDER BY title"; - $debug and warn "GetSubscriptions query: $sql params : ", join (" ",@bind_params); + $sqlwhere .= ( $sqlwhere ? " AND " : " WHERE " ) . "(" . join( ") OR (", @sqlstrings ) . ")"; + } + $sql .= "$sqlwhere ORDER BY title"; + $debug and warn "GetSubscriptions query: $sql params : ", join( " ", @bind_params ); $sth = $dbh->prepare($sql); $sth->execute(@bind_params); my @results; my $previoustitle = ""; my $odd = 1; + while ( my $line = $sth->fetchrow_hashref ) { if ( $previoustitle eq $line->{title} ) { - $line->{title} = ""; - $line->{issn} = ""; - } - else { + $line->{title} = ""; + $line->{issn} = ""; + } else { $previoustitle = $line->{title}; $odd = -$odd; } $line->{toggle} = 1 if $odd == 1; - $line->{'cannotedit'}=(C4::Context->preference('IndependantBranches') && - C4::Context->userenv && - C4::Context->userenv->{flags} % 2 !=1 && - C4::Context->userenv->{branch} && $line->{branchcode} && - (C4::Context->userenv->{branch} ne $line->{branchcode})); + $line->{'cannotedit'} = + ( C4::Context->preference('IndependantBranches') + && C4::Context->userenv + && C4::Context->userenv->{flags} % 2 != 1 + && C4::Context->userenv->{branch} + && $line->{branchcode} + && ( C4::Context->userenv->{branch} ne $line->{branchcode} ) ); push @results, $line; } return @results; @@ -694,30 +697,29 @@ FIXME: We should return \@serials. =cut sub GetSerials { - my ($subscriptionid,$count) = @_; + my ( $subscriptionid, $count ) = @_; my $dbh = C4::Context->dbh; # status = 2 is "arrived" my $counter = 0; - $count=5 unless ($count); + $count = 5 unless ($count); my @serials; - my $query = - "SELECT serialid,serialseq, status, publisheddate, planneddate,notes, routingnotes + my $query = "SELECT serialid,serialseq, status, publisheddate, planneddate,notes, routingnotes FROM serial WHERE subscriptionid = ? AND status NOT IN (2,4,5) ORDER BY IF(publisheddate<>'0000-00-00',publisheddate,planneddate) DESC"; my $sth = $dbh->prepare($query); $sth->execute($subscriptionid); + while ( my $line = $sth->fetchrow_hashref ) { - $line->{ "status" . $line->{status} } = - 1; # fills a "statusX" value, used for template status select list - $line->{"publisheddate"} = format_date( $line->{"publisheddate"} ); - $line->{"planneddate"} = format_date( $line->{"planneddate"} ); + $line->{ "status" . $line->{status} } = 1; # fills a "statusX" value, used for template status select list + $line->{"publisheddate"} = format_date( $line->{"publisheddate"} ); + $line->{"planneddate"} = format_date( $line->{"planneddate"} ); push @serials, $line; } + # OK, now add the last 5 issues arrives/missing - $query = - "SELECT serialid,serialseq, status, planneddate, publisheddate,notes, routingnotes + $query = "SELECT serialid,serialseq, status, planneddate, publisheddate,notes, routingnotes FROM serial WHERE subscriptionid = ? AND (status in (2,4,5)) @@ -727,15 +729,14 @@ sub GetSerials { $sth->execute($subscriptionid); while ( ( my $line = $sth->fetchrow_hashref ) && $counter < $count ) { $counter++; - $line->{ "status" . $line->{status} } = - 1; # fills a "statusX" value, used for template status select list - $line->{"planneddate"} = format_date( $line->{"planneddate"} ); - $line->{"publisheddate"} = format_date( $line->{"publisheddate"} ); + $line->{ "status" . $line->{status} } = 1; # fills a "statusX" value, used for template status select list + $line->{"planneddate"} = format_date( $line->{"planneddate"} ); + $line->{"publisheddate"} = format_date( $line->{"publisheddate"} ); push @serials, $line; } $query = "SELECT count(*) FROM serial WHERE subscriptionid=?"; - $sth = $dbh->prepare($query); + $sth = $dbh->prepare($query); $sth->execute($subscriptionid); my ($totalissues) = $sth->fetchrow; return ( $totalissues, @serials ); @@ -753,27 +754,29 @@ this number is used to see if a subscription can be deleted (=it must have only =back =cut + sub GetSerials2 { - my ($subscription,$status) = @_; - my $dbh = C4::Context->dbh; + my ( $subscription, $status ) = @_; + my $dbh = C4::Context->dbh; my $query = qq| SELECT serialid,serialseq, status, planneddate, publisheddate,notes, routingnotes FROM serial WHERE subscriptionid=$subscription AND status IN ($status) ORDER BY publisheddate,serialid DESC |; - $debug and warn "GetSerials2 query: $query"; - my $sth=$dbh->prepare($query); + $debug and warn "GetSerials2 query: $query"; + my $sth = $dbh->prepare($query); $sth->execute; my @serials; - while(my $line = $sth->fetchrow_hashref) { - $line->{"status".$line->{status}} = 1; # fills a "statusX" value, used for template status select list - $line->{"planneddate"} = format_date($line->{"planneddate"}); - $line->{"publisheddate"} = format_date($line->{"publisheddate"}); - push @serials,$line; + + while ( my $line = $sth->fetchrow_hashref ) { + $line->{ "status" . $line->{status} } = 1; # fills a "statusX" value, used for template status select list + $line->{"planneddate"} = format_date( $line->{"planneddate"} ); + $line->{"publisheddate"} = format_date( $line->{"publisheddate"} ); + push @serials, $line; } my ($totalissues) = scalar(@serials); - return ($totalissues,@serials); + return ( $totalissues, @serials ); } =head2 GetLatestSerials @@ -804,8 +807,7 @@ sub GetLatestSerials { $sth->execute($subscriptionid); my @serials; while ( my $line = $sth->fetchrow_hashref ) { - $line->{ "status" . $line->{status} } = - 1; # fills a "statusX" value, used for template status select list + $line->{ "status" . $line->{status} } = 1; # fills a "statusX" value, used for template status select list $line->{"planneddate"} = format_date( $line->{"planneddate"} ); push @serials, $line; } @@ -836,8 +838,8 @@ sub GetDistributedTo { my $dbh = C4::Context->dbh; my $distributedto; my $subscriptionid = @_; - my $query = "SELECT distributedto FROM subscription WHERE subscriptionid=?"; - my $sth = $dbh->prepare($query); + my $query = "SELECT distributedto FROM subscription WHERE subscriptionid=?"; + my $sth = $dbh->prepare($query); $sth->execute($subscriptionid); return ($distributedto) = $sth->fetchrow; } @@ -889,56 +891,52 @@ all the input params updated. sub GetNextSeq { my ($val) = @_; - my ( - $calculated, $newlastvalue1, $newlastvalue2, $newlastvalue3, - $newinnerloop1, $newinnerloop2, $newinnerloop3 - ); - my $pattern = $val->{numberpattern}; - my @seasons = ( 'nothing', 'Winter', 'Spring', 'Summer', 'Autumn' ); + my ( $calculated, $newlastvalue1, $newlastvalue2, $newlastvalue3, $newinnerloop1, $newinnerloop2, $newinnerloop3 ); + my $pattern = $val->{numberpattern}; + my @seasons = ( 'nothing', 'Winter', 'Spring', 'Summer', 'Autumn' ); my @southern_seasons = ( '', 'Summer', 'Autumn', 'Winter', 'Spring' ); $calculated = $val->{numberingmethod}; $newlastvalue1 = $val->{lastvalue1}; $newlastvalue2 = $val->{lastvalue2}; $newlastvalue3 = $val->{lastvalue3}; - $newlastvalue1 = $val->{lastvalue1}; - # check if we have to increase the new value. - $newinnerloop1 = $val->{innerloop1} + 1; - $newinnerloop1=0 if ($newinnerloop1 >= $val->{every1}); - $newlastvalue1 += $val->{add1} if ($newinnerloop1<1); # <1 to be true when 0 or empty. - $newlastvalue1=$val->{setto1} if ($newlastvalue1>$val->{whenmorethan1}); # reset counter if needed. - $calculated =~ s/\{X\}/$newlastvalue1/g; - - $newlastvalue2 = $val->{lastvalue2}; - # check if we have to increase the new value. - $newinnerloop2 = $val->{innerloop2} + 1; - $newinnerloop2=0 if ($newinnerloop2 >= $val->{every2}); - $newlastvalue2 += $val->{add2} if ($newinnerloop2<1); # <1 to be true when 0 or empty. - $newlastvalue2=$val->{setto2} if ($newlastvalue2>$val->{whenmorethan2}); # reset counter if needed. - if ( $pattern == 6 ) { - if ( $val->{hemisphere} == 2 ) { - my $newlastvalue2seq = $southern_seasons[$newlastvalue2]; - $calculated =~ s/\{Y\}/$newlastvalue2seq/g; + $newlastvalue1 = $val->{lastvalue1}; + + # check if we have to increase the new value. + $newinnerloop1 = $val->{innerloop1} + 1; + $newinnerloop1 = 0 if ( $newinnerloop1 >= $val->{every1} ); + $newlastvalue1 += $val->{add1} if ( $newinnerloop1 < 1 ); # <1 to be true when 0 or empty. + $newlastvalue1 = $val->{setto1} if ( $newlastvalue1 > $val->{whenmorethan1} ); # reset counter if needed. + $calculated =~ s/\{X\}/$newlastvalue1/g; + + $newlastvalue2 = $val->{lastvalue2}; + + # check if we have to increase the new value. + $newinnerloop2 = $val->{innerloop2} + 1; + $newinnerloop2 = 0 if ( $newinnerloop2 >= $val->{every2} ); + $newlastvalue2 += $val->{add2} if ( $newinnerloop2 < 1 ); # <1 to be true when 0 or empty. + $newlastvalue2 = $val->{setto2} if ( $newlastvalue2 > $val->{whenmorethan2} ); # reset counter if needed. + if ( $pattern == 6 ) { + if ( $val->{hemisphere} == 2 ) { + my $newlastvalue2seq = $southern_seasons[$newlastvalue2]; + $calculated =~ s/\{Y\}/$newlastvalue2seq/g; + } else { + my $newlastvalue2seq = $seasons[$newlastvalue2]; + $calculated =~ s/\{Y\}/$newlastvalue2seq/g; + } + } else { + $calculated =~ s/\{Y\}/$newlastvalue2/g; } - else { - my $newlastvalue2seq = $seasons[$newlastvalue2]; - $calculated =~ s/\{Y\}/$newlastvalue2seq/g; - } - } - else { - $calculated =~ s/\{Y\}/$newlastvalue2/g; - } - - - $newlastvalue3 = $val->{lastvalue3}; - # check if we have to increase the new value. - $newinnerloop3 = $val->{innerloop3} + 1; - $newinnerloop3=0 if ($newinnerloop3 >= $val->{every3}); - $newlastvalue3 += $val->{add3} if ($newinnerloop3<1); # <1 to be true when 0 or empty. - $newlastvalue3=$val->{setto3} if ($newlastvalue3>$val->{whenmorethan3}); # reset counter if needed. - $calculated =~ s/\{Z\}/$newlastvalue3/g; - - return ( $calculated, $newlastvalue1, $newlastvalue2, $newlastvalue3 , - $newinnerloop1, $newinnerloop2, $newinnerloop3); + + $newlastvalue3 = $val->{lastvalue3}; + + # check if we have to increase the new value. + $newinnerloop3 = $val->{innerloop3} + 1; + $newinnerloop3 = 0 if ( $newinnerloop3 >= $val->{every3} ); + $newlastvalue3 += $val->{add3} if ( $newinnerloop3 < 1 ); # <1 to be true when 0 or empty. + $newlastvalue3 = $val->{setto3} if ( $newlastvalue3 > $val->{whenmorethan3} ); # reset counter if needed. + $calculated =~ s/\{Z\}/$newlastvalue3/g; + + return ( $calculated, $newlastvalue1, $newlastvalue2, $newlastvalue3, $newinnerloop1, $newinnerloop2, $newinnerloop3 ); } =head2 GetSeq @@ -956,25 +954,24 @@ the sequence in integer format =cut sub GetSeq { - my ($val) = @_; + my ($val) = @_; my $pattern = $val->{numberpattern}; - my @seasons = ( 'nothing', 'Winter', 'Spring', 'Summer', 'Autumn' ); - my @southern_seasons = ( '', 'Summer', 'Autumn', 'Winter', 'Spring' ); - my $calculated = $val->{numberingmethod}; - my $x = $val->{'lastvalue1'}; + my @seasons = ( 'nothing', 'Winter', 'Spring', 'Summer', 'Autumn' ); + my @southern_seasons = ( '', 'Summer', 'Autumn', 'Winter', 'Spring' ); + my $calculated = $val->{numberingmethod}; + my $x = $val->{'lastvalue1'}; $calculated =~ s/\{X\}/$x/g; my $newlastvalue2 = $val->{'lastvalue2'}; + if ( $pattern == 6 ) { if ( $val->{hemisphere} == 2 ) { my $newlastvalue2seq = $southern_seasons[$newlastvalue2]; $calculated =~ s/\{Y\}/$newlastvalue2seq/g; - } - else { + } else { my $newlastvalue2seq = $seasons[$newlastvalue2]; $calculated =~ s/\{Y\}/$newlastvalue2seq/g; } - } - else { + } else { $calculated =~ s/\{Y\}/$newlastvalue2/g; } my $z = $val->{'lastvalue3'}; @@ -986,7 +983,7 @@ sub GetSeq { $sensddate = GetExpirationDate($subscriptionid) -this function return the expiration date for a subscription given on input args. +this function return the next expiration date for a subscription given on input args. return the enddate @@ -994,41 +991,40 @@ the enddate =cut sub GetExpirationDate { - my ($subscriptionid) = @_; - my $dbh = C4::Context->dbh; - my $subscription = GetSubscription($subscriptionid); - my $enddate = $$subscription{enddate}||$$subscription{histenddate}; + my ( $subscriptionid, $startdate ) = @_; + my $dbh = C4::Context->dbh; + my $subscription = GetSubscription($subscriptionid); + my $enddate; - return $enddate if ($enddate && $enddate ne "0000-00-00"); - - # we don't do the same test if the subscription is based on X numbers or on X weeks/months - $enddate=$$subscription{startdate}; - my @date=split (/-/,$$subscription{startdate}); - return if (scalar(@date)!=3 ||not check_date(@date)); - if (($subscription->{periodicity} % 16) >0){ - if ( $subscription->{numberlength} ) { - #calculate the date of the last issue. - my $length = $subscription->{numberlength}; - for ( my $i = 1 ; $i <= $length ; $i++ ) { - $enddate = GetNextDate( $enddate, $subscription ); - } - } - elsif ( $subscription->{monthlength} ){ - if ($$subscription{startdate}){ - my @enddate = Add_Delta_YM($date[0],$date[1],$date[2],0,$subscription->{monthlength}); - $enddate=sprintf("%04d-%02d-%02d",$enddate[0],$enddate[1],$enddate[2]); - } - } elsif ( $subscription->{weeklength} ){ - if ($$subscription{startdate}){ - my @date=split (/-/,$subscription->{startdate}); - my @enddate = Add_Delta_Days($date[0],$date[1],$date[2],$subscription->{weeklength}*7); - $enddate=sprintf("%04d-%02d-%02d",$enddate[0],$enddate[1],$enddate[2]); - } - } - return $enddate; - } else { - return ; - } + # we don't do the same test if the subscription is based on X numbers or on X weeks/months + $enddate = $startdate || $subscription->{startdate}; + my @date = split( /-/, $enddate ); + return if ( scalar(@date) != 3 || not check_date(@date) ); + if ( ( $subscription->{periodicity} % 16 ) > 0 ) { + + # If Not Irregular + if ( my $length = $subscription->{numberlength} ) { + + #calculate the date of the last issue. + for ( my $i = 1 ; $i <= $length ; $i++ ) { + $enddate = GetNextDate( $enddate, $subscription ); + } + } elsif ( $subscription->{monthlength} ) { + if ( $$subscription{startdate} ) { + my @enddate = Add_Delta_YM( $date[0], $date[1], $date[2], 0, $subscription->{monthlength} ); + $enddate = sprintf( "%04d-%02d-%02d", $enddate[0], $enddate[1], $enddate[2] ); + } + } elsif ( $subscription->{weeklength} ) { + if ( $$subscription{startdate} ) { + my @date = split( /-/, $subscription->{startdate} ); + my @enddate = Add_Delta_Days( $date[0], $date[1], $date[2], $subscription->{weeklength} * 7 ); + $enddate = sprintf( "%04d-%02d-%02d", $enddate[0], $enddate[1], $enddate[2] ); + } + } + return $enddate; + } else { + return; + } } =head2 CountSubscriptionFromBiblionumber @@ -1046,9 +1042,9 @@ the number of subscriptions with biblionumber given on input arg. sub CountSubscriptionFromBiblionumber { my ($biblionumber) = @_; - my $dbh = C4::Context->dbh; - my $query = "SELECT count(*) FROM subscription WHERE biblionumber=?"; - my $sth = $dbh->prepare($query); + my $dbh = C4::Context->dbh; + my $query = "SELECT count(*) FROM subscription WHERE biblionumber=?"; + my $sth = $dbh->prepare($query); $sth->execute($biblionumber); my $subscriptionsnumber = $sth->fetchrow; return $subscriptionsnumber; @@ -1067,10 +1063,7 @@ this function modify the history of a subscription. Put your new values on input =cut sub ModSubscriptionHistory { - my ( - $subscriptionid, $histstartdate, $enddate, $recievedlist, - $missinglist, $opacnote, $librariannote - ) = @_; + my ( $subscriptionid, $histstartdate, $enddate, $recievedlist, $missinglist, $opacnote, $librariannote ) = @_; my $dbh = C4::Context->dbh; my $query = "UPDATE subscriptionhistory SET histstartdate=?,histenddate=?,recievedlist=?,missinglist=?,opacnote=?,librariannote=? @@ -1080,10 +1073,7 @@ sub ModSubscriptionHistory { $recievedlist =~ s/^; //; $missinglist =~ s/^; //; $opacnote =~ s/^; //; - $sth->execute( - $histstartdate, $enddate, $recievedlist, $missinglist, - $opacnote, $librariannote, $subscriptionid - ); + $sth->execute( $histstartdate, $enddate, $recievedlist, $missinglist, $opacnote, $librariannote, $subscriptionid ); return $sth->rows; } @@ -1101,8 +1091,7 @@ Note : if we change from "waited" to something else,then we will have to create =cut sub ModSerialStatus { - my ( $serialid, $serialseq, $planneddate,$publisheddate, $status, $notes ) - = @_; + my ( $serialid, $serialseq, $planneddate, $publisheddate, $status, $notes ) = @_; #It is a usual serial # 1st, get previous status : @@ -1115,22 +1104,18 @@ sub ModSerialStatus { # change status & update subscriptionhistory my $val; if ( $status eq 6 ) { - DelIssue( {'serialid'=>$serialid, 'subscriptionid'=>$subscriptionid,'serialseq'=>$serialseq} ); - } - else { - my $query = -"UPDATE serial SET serialseq=?,publisheddate=?,planneddate=?,status=?,notes=? WHERE serialid = ?"; + DelIssue( { 'serialid' => $serialid, 'subscriptionid' => $subscriptionid, 'serialseq' => $serialseq } ); + } else { + my $query = "UPDATE serial SET serialseq=?,publisheddate=?,planneddate=?,status=?,notes=? WHERE serialid = ?"; $sth = $dbh->prepare($query); - $sth->execute( $serialseq, $publisheddate, $planneddate, $status, - $notes, $serialid ); + $sth->execute( $serialseq, $publisheddate, $planneddate, $status, $notes, $serialid ); $query = "SELECT * FROM subscription WHERE subscriptionid = ?"; - $sth = $dbh->prepare($query); + $sth = $dbh->prepare($query); $sth->execute($subscriptionid); my $val = $sth->fetchrow_hashref; unless ( $val->{manualhistory} ) { - $query = -"SELECT missinglist,recievedlist FROM subscriptionhistory WHERE subscriptionid=?"; - $sth = $dbh->prepare($query); + $query = "SELECT missinglist,recievedlist FROM subscriptionhistory WHERE subscriptionid=?"; + $sth = $dbh->prepare($query); $sth->execute($subscriptionid); my ( $missinglist, $recievedlist ) = $sth->fetchrow; if ( $status eq 2 ) { @@ -1139,16 +1124,15 @@ sub ModSerialStatus { unless ( index( "$recievedlist", "$serialseq" ) >= 0 ); } -# warn "missinglist : $missinglist serialseq :$serialseq, ".index("$missinglist","$serialseq"); + # warn "missinglist : $missinglist serialseq :$serialseq, ".index("$missinglist","$serialseq"); $missinglist .= "; $serialseq" if ( $status eq 4 and not index( "$missinglist", "$serialseq" ) >= 0 ); $missinglist .= "; not issued $serialseq" if ( $status eq 5 and index( "$missinglist", "$serialseq" ) >= 0 ); - $query = -"UPDATE subscriptionhistory SET recievedlist=?, missinglist=? WHERE subscriptionid=?"; - $sth = $dbh->prepare($query); + $query = "UPDATE subscriptionhistory SET recievedlist=?, missinglist=? WHERE subscriptionid=?"; + $sth = $dbh->prepare($query); $recievedlist =~ s/^; //; $missinglist =~ s/^; //; $sth->execute( $recievedlist, $missinglist, $subscriptionid ); @@ -1163,28 +1147,21 @@ sub ModSerialStatus { my $val = $sth->fetchrow_hashref; # next issue number -# warn "Next Seq"; - my ( - $newserialseq, $newlastvalue1, $newlastvalue2, $newlastvalue3, - $newinnerloop1, $newinnerloop2, $newinnerloop3 - ) = GetNextSeq($val); -# warn "Next Seq End"; + # warn "Next Seq"; + my ( $newserialseq, $newlastvalue1, $newlastvalue2, $newlastvalue3, $newinnerloop1, $newinnerloop2, $newinnerloop3 ) = GetNextSeq($val); + + # warn "Next Seq End"; # next date (calculated from actual date & frequency parameters) -# warn "publisheddate :$publisheddate "; + # warn "publisheddate :$publisheddate "; my $nextpublisheddate = GetNextDate( $publisheddate, $val ); - NewIssue( $newserialseq, $subscriptionid, $val->{'biblionumber'}, - 1, $nextpublisheddate, $nextpublisheddate ); - $query = -"UPDATE subscription SET lastvalue1=?, lastvalue2=?, lastvalue3=?, innerloop1=?, innerloop2=?, innerloop3=? + NewIssue( $newserialseq, $subscriptionid, $val->{'biblionumber'}, 1, $nextpublisheddate, $nextpublisheddate ); + $query = "UPDATE subscription SET lastvalue1=?, lastvalue2=?, lastvalue3=?, innerloop1=?, innerloop2=?, innerloop3=? WHERE subscriptionid = ?"; $sth = $dbh->prepare($query); - $sth->execute( - $newlastvalue1, $newlastvalue2, $newlastvalue3, $newinnerloop1, - $newinnerloop2, $newinnerloop3, $subscriptionid - ); + $sth->execute( $newlastvalue1, $newlastvalue2, $newlastvalue3, $newinnerloop1, $newinnerloop2, $newinnerloop3, $subscriptionid ); -# check if an alert must be sent... (= a letter is defined & status became "arrived" + # check if an alert must be sent... (= a letter is defined & status became "arrived" if ( $val->{letter} && $status eq 2 && $oldstatus ne 2 ) { SendAlerts( 'issue', $val->{subscriptionid}, $val->{letter} ); } @@ -1212,20 +1189,22 @@ $nextexepected = { sub GetNextExpected($) { my ($subscriptionid) = @_; - my $dbh = C4::Context->dbh; - my $sth = $dbh->prepare('SELECT serialid, planneddate FROM serial WHERE subscriptionid=? AND status=?'); + my $dbh = C4::Context->dbh; + my $sth = $dbh->prepare('SELECT serialid, planneddate FROM serial WHERE subscriptionid=? AND status=?'); + # Each subscription has only one 'expected' issue, with serial.status==1. $sth->execute( $subscriptionid, 1 ); - my ( $nextissue ) = $sth->fetchrow_hashref; - if(not $nextissue){ - $sth = $dbh->prepare('SELECT serialid,planneddate FROM serial WHERE subscriptionid = ? ORDER BY planneddate DESC LIMIT 1'); - $sth->execute( $subscriptionid ); - $nextissue = $sth->fetchrow_hashref; + my ($nextissue) = $sth->fetchrow_hashref; + if ( not $nextissue ) { + $sth = $dbh->prepare('SELECT serialid,planneddate FROM serial WHERE subscriptionid = ? ORDER BY planneddate DESC LIMIT 1'); + $sth->execute($subscriptionid); + $nextissue = $sth->fetchrow_hashref; } - $nextissue->{planneddate} = C4::Dates->new($nextissue->{planneddate},'iso'); + $nextissue->{planneddate} = C4::Dates->new( $nextissue->{planneddate}, 'iso' ); return $nextissue; - + } + =head2 ModNextExpected =over 4 @@ -1242,12 +1221,14 @@ C<$date> is a C4::Dates object. =cut sub ModNextExpected($$) { - my ($subscriptionid,$date) = @_; + my ( $subscriptionid, $date ) = @_; my $dbh = C4::Context->dbh; + #FIXME: Would expect to only set planneddate, but we set both on new issue creation, so updating it here my $sth = $dbh->prepare('UPDATE serial SET planneddate=?,publisheddate=? WHERE subscriptionid=? AND status=?'); + # Each subscription has only one 'expected' issue, with serial.status==1. - $sth->execute( $date->output('iso'),$date->output('iso'), $subscriptionid, 1); + $sth->execute( $date->output('iso'), $date->output('iso'), $subscriptionid, 1 ); return 0; } @@ -1263,21 +1244,15 @@ this function modify a subscription. Put all new values on input args. =cut sub ModSubscription { - my ( - $auser, $branchcode, $aqbooksellerid, $cost, - $aqbudgetid, $startdate, $periodicity, $firstacquidate, - $dow, $irregularity, $numberpattern, $numberlength, - $weeklength, $monthlength, $add1, $every1, - $whenmorethan1, $setto1, $lastvalue1, $innerloop1, - $add2, $every2, $whenmorethan2, $setto2, - $lastvalue2, $innerloop2, $add3, $every3, - $whenmorethan3, $setto3, $lastvalue3, $innerloop3, - $numberingmethod, $status, $biblionumber, $callnumber, - $notes, $letter, $hemisphere, $manualhistory, - $internalnotes, $serialsadditems, - $staffdisplaycount,$opacdisplaycount, $graceperiod, $location,$enddate,$subscriptionid + my ($auser, $branchcode, $aqbooksellerid, $cost, $aqbudgetid, $startdate, $periodicity, $firstacquidate, + $dow, $irregularity, $numberpattern, $numberlength, $weeklength, $monthlength, $add1, $every1, + $whenmorethan1, $setto1, $lastvalue1, $innerloop1, $add2, $every2, $whenmorethan2, $setto2, + $lastvalue2, $innerloop2, $add3, $every3, $whenmorethan3, $setto3, $lastvalue3, $innerloop3, + $numberingmethod, $status, $biblionumber, $callnumber, $notes, $letter, $hemisphere, $manualhistory, + $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate, $subscriptionid ) = @_; -# warn $irregularity; + + # warn $irregularity; my $dbh = C4::Context->dbh; my $query = "UPDATE subscription SET librarian=?, branchcode=?,aqbooksellerid=?,cost=?,aqbudgetid=?,startdate=?, @@ -1290,27 +1265,27 @@ sub ModSubscription { staffdisplaycount = ?,opacdisplaycount = ?, graceperiod = ?, location = ? ,enddate=? WHERE subscriptionid = ?"; - #warn "query :".$query; + + #warn "query :".$query; my $sth = $dbh->prepare($query); $sth->execute( - $auser, $branchcode, $aqbooksellerid, $cost, - $aqbudgetid, $startdate, $periodicity, $firstacquidate, + $auser, $branchcode, $aqbooksellerid, $cost, + $aqbudgetid, $startdate, $periodicity, $firstacquidate, $dow, "$irregularity", $numberpattern, $numberlength, - $weeklength, $monthlength, $add1, $every1, - $whenmorethan1, $setto1, $lastvalue1, $innerloop1, - $add2, $every2, $whenmorethan2, $setto2, - $lastvalue2, $innerloop2, $add3, $every3, - $whenmorethan3, $setto3, $lastvalue3, $innerloop3, - $numberingmethod, $status, $biblionumber, $callnumber, - $notes, $letter, $hemisphere, ($manualhistory?$manualhistory:0), - $internalnotes, $serialsadditems, - $staffdisplaycount, $opacdisplaycount, $graceperiod, $location,$enddate, - $subscriptionid + $weeklength, $monthlength, $add1, $every1, + $whenmorethan1, $setto1, $lastvalue1, $innerloop1, + $add2, $every2, $whenmorethan2, $setto2, + $lastvalue2, $innerloop2, $add3, $every3, + $whenmorethan3, $setto3, $lastvalue3, $innerloop3, + $numberingmethod, $status, $biblionumber, $callnumber, + $notes, $letter, $hemisphere, ( $manualhistory ? $manualhistory : 0 ), + $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, + $graceperiod, $location, $enddate, $subscriptionid ); - my $rows=$sth->rows; + my $rows = $sth->rows; $sth->finish; - - logaction("SERIAL", "MODIFY", $subscriptionid, "") if C4::Context->preference("SubscriptionLog"); + + logaction( "SERIAL", "MODIFY", $subscriptionid, "" ) if C4::Context->preference("SubscriptionLog"); return $rows; } @@ -1336,19 +1311,12 @@ the id of this new subscription =cut sub NewSubscription { - my ( - $auser, $branchcode, $aqbooksellerid, $cost, - $aqbudgetid, $biblionumber, $startdate, $periodicity, - $dow, $numberlength, $weeklength, $monthlength, - $add1, $every1, $whenmorethan1, $setto1, - $lastvalue1, $innerloop1, $add2, $every2, - $whenmorethan2, $setto2, $lastvalue2, $innerloop2, - $add3, $every3, $whenmorethan3, $setto3, - $lastvalue3, $innerloop3, $numberingmethod, $status, - $notes, $letter, $firstacquidate, $irregularity, - $numberpattern, $callnumber, $hemisphere, $manualhistory, - $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, - $graceperiod, $location,$enddate + my ($auser, $branchcode, $aqbooksellerid, $cost, $aqbudgetid, $biblionumber, $startdate, $periodicity, + $dow, $numberlength, $weeklength, $monthlength, $add1, $every1, $whenmorethan1, $setto1, + $lastvalue1, $innerloop1, $add2, $every2, $whenmorethan2, $setto2, $lastvalue2, $innerloop2, + $add3, $every3, $whenmorethan3, $setto3, $lastvalue3, $innerloop3, $numberingmethod, $status, + $notes, $letter, $firstacquidate, $irregularity, $numberpattern, $callnumber, $hemisphere, $manualhistory, + $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate ) = @_; my $dbh = C4::Context->dbh; @@ -1367,45 +1335,25 @@ sub NewSubscription { |; my $sth = $dbh->prepare($query); $sth->execute( - $auser, $branchcode, - $aqbooksellerid, $cost, - $aqbudgetid, $biblionumber, - $startdate, $periodicity, - $dow, $numberlength, - $weeklength, $monthlength, - $add1, $every1, - $whenmorethan1, $setto1, - $lastvalue1, $innerloop1, - $add2, $every2, - $whenmorethan2, $setto2, - $lastvalue2, $innerloop2, - $add3, $every3, - $whenmorethan3, $setto3, - $lastvalue3, $innerloop3, - $numberingmethod, "$status", - $notes, $letter, - $firstacquidate, $irregularity, - $numberpattern, $callnumber, - $hemisphere, $manualhistory, - $internalnotes, $serialsadditems, - $staffdisplaycount, $opacdisplaycount, - $graceperiod, $location, - $enddate + $auser, $branchcode, $aqbooksellerid, $cost, $aqbudgetid, $biblionumber, $startdate, $periodicity, + $dow, $numberlength, $weeklength, $monthlength, $add1, $every1, $whenmorethan1, $setto1, + $lastvalue1, $innerloop1, $add2, $every2, $whenmorethan2, $setto2, $lastvalue2, $innerloop2, + $add3, $every3, $whenmorethan3, $setto3, $lastvalue3, $innerloop3, $numberingmethod, "$status", + $notes, $letter, $firstacquidate, $irregularity, $numberpattern, $callnumber, $hemisphere, $manualhistory, + $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate ); #then create the 1st waited number my $subscriptionid = $dbh->{'mysql_insertid'}; - $query = qq( + $query = qq( INSERT INTO subscriptionhistory (biblionumber, subscriptionid, histstartdate, opacnote, librariannote) VALUES (?,?,?,?,?) ); $sth = $dbh->prepare($query); - $sth->execute( $biblionumber, $subscriptionid, - $startdate, - $notes,$internalnotes ); + $sth->execute( $biblionumber, $subscriptionid, $startdate, $notes, $internalnotes ); - # reread subscription to get a hash (for calculation of the 1st issue number) + # reread subscription to get a hash (for calculation of the 1st issue number) $query = qq( SELECT * FROM subscription @@ -1417,32 +1365,26 @@ sub NewSubscription { # calculate issue number my $serialseq = GetSeq($val); - $query = qq| + $query = qq| INSERT INTO serial (serialseq,subscriptionid,biblionumber,status, planneddate, publisheddate) VALUES (?,?,?,?,?,?) |; $sth = $dbh->prepare($query); - $sth->execute( - "$serialseq", $subscriptionid, $biblionumber, 1, - $firstacquidate, - $firstacquidate - ); - - logaction("SERIAL", "ADD", $subscriptionid, "") if C4::Context->preference("SubscriptionLog"); - -#set serial flag on biblio if not already set. - my ($null, ($bib)) = GetBiblio($biblionumber); - if( ! $bib->{'serial'} ) { + $sth->execute( "$serialseq", $subscriptionid, $biblionumber, 1, $firstacquidate, $firstacquidate ); + + logaction( "SERIAL", "ADD", $subscriptionid, "" ) if C4::Context->preference("SubscriptionLog"); + + #set serial flag on biblio if not already set. + my ( $null, ($bib) ) = GetBiblio($biblionumber); + if ( !$bib->{'serial'} ) { my $record = GetMarcBiblio($biblionumber); - my ($tag,$subf) = GetMarcFromKohaField('biblio.serial',$bib->{'frameworkcode'}); - if($tag) { - eval { - $record->field($tag)->update( $subf => 1 ); - }; + my ( $tag, $subf ) = GetMarcFromKohaField( 'biblio.serial', $bib->{'frameworkcode'} ); + if ($tag) { + eval { $record->field($tag)->update( $subf => 1 ); }; } - ModBiblio($record,$biblionumber,$bib->{'frameworkcode'}); - } + ModBiblio( $record, $biblionumber, $bib->{'frameworkcode'} ); + } return $subscriptionid; } @@ -1459,30 +1401,30 @@ this function renew a subscription with values given on input args. =cut sub ReNewSubscription { - my ( $subscriptionid, $user, $startdate, $numberlength, $weeklength, - $monthlength, $note ) - = @_; + my ( $subscriptionid, $user, $startdate, $numberlength, $weeklength, $monthlength, $note ) = @_; my $dbh = C4::Context->dbh; my $subscription = GetSubscription($subscriptionid); - my $query = qq| + my $query = qq| SELECT * FROM biblio LEFT JOIN biblioitems ON biblio.biblionumber=biblioitems.biblionumber WHERE biblio.biblionumber=? |; - my $sth = $dbh->prepare($query); - $sth->execute( $subscription->{biblionumber} ); - my $biblio = $sth->fetchrow_hashref; - if (C4::Context->preference("RenewSerialAddsSuggestion")){ + my $sth = $dbh->prepare($query); + $sth->execute( $subscription->{biblionumber} ); + my $biblio = $sth->fetchrow_hashref; - NewSuggestion({ - 'suggestedby' => $user, - 'title' => $subscription->{bibliotitle}, - 'author' => $biblio->{author}, - 'publishercode' => $biblio->{publishercode}, - 'note' => $biblio->{note}, - 'biblionumber' => $subscription->{biblionumber} - }); + if ( C4::Context->preference("RenewSerialAddsSuggestion") ) { + + NewSuggestion( + { 'suggestedby' => $user, + 'title' => $subscription->{bibliotitle}, + 'author' => $biblio->{author}, + 'publishercode' => $biblio->{publishercode}, + 'note' => $biblio->{note}, + 'biblionumber' => $subscription->{biblionumber} + } + ); } # renew subscription @@ -1493,8 +1435,24 @@ sub ReNewSubscription { |; $sth = $dbh->prepare($query); $sth->execute( $startdate, $numberlength, $weeklength, $monthlength, $subscriptionid ); + my $enddate = GetExpirationDate($subscriptionid); + $debug && warn "enddate :$enddate"; + $query = qq| + UPDATE subscription + SET enddate=? + WHERE subscriptionid=? + |; + $sth = $dbh->prepare($query); + $sth->execute( $enddate, $subscriptionid ); + $query = qq| + UPDATE subscriptionhistory + SET histenddate=? + WHERE subscriptionid=? + |; + $sth = $dbh->prepare($query); + $sth->execute( $enddate, $subscriptionid ); - logaction("SERIAL", "RENEW", $subscriptionid, "") if C4::Context->preference("SubscriptionLog"); + logaction( "SERIAL", "RENEW", $subscriptionid, "" ) if C4::Context->preference("SubscriptionLog"); } =head2 NewIssue @@ -1511,11 +1469,9 @@ Note : we have to update the recievedlist and missinglist on subscriptionhistory =cut sub NewIssue { - my ( $serialseq, $subscriptionid, $biblionumber, $status, - $planneddate, $publisheddate, $notes ) - = @_; + my ( $serialseq, $subscriptionid, $biblionumber, $status, $planneddate, $publisheddate, $notes ) = @_; ### FIXME biblionumber CAN be provided by subscriptionid. So Do we STILL NEED IT ? - + my $dbh = C4::Context->dbh; my $query = qq| INSERT INTO serial @@ -1523,9 +1479,8 @@ sub NewIssue { VALUES (?,?,?,?,?,?,?) |; my $sth = $dbh->prepare($query); - $sth->execute( $serialseq, $subscriptionid, $biblionumber, $status, - $publisheddate, $planneddate,$notes ); - my $serialid=$dbh->{'mysql_insertid'}; + $sth->execute( $serialseq, $subscriptionid, $biblionumber, $status, $publisheddate, $planneddate, $notes ); + my $serialid = $dbh->{'mysql_insertid'}; $query = qq| SELECT missinglist,recievedlist FROM subscriptionhistory @@ -1536,13 +1491,13 @@ sub NewIssue { my ( $missinglist, $recievedlist ) = $sth->fetchrow; if ( $status eq 2 ) { - ### TODO Add a feature that improves recognition and description. - ### As such count (serialseq) i.e. : N18,2(N19),N20 - ### Would use substr and index But be careful to previous presence of () - $recievedlist .= "; $serialseq" unless (index($recievedlist,$serialseq)>0); + ### TODO Add a feature that improves recognition and description. + ### As such count (serialseq) i.e. : N18,2(N19),N20 + ### Would use substr and index But be careful to previous presence of () + $recievedlist .= "; $serialseq" unless ( index( $recievedlist, $serialseq ) > 0 ); } if ( $status eq 4 ) { - $missinglist .= "; $serialseq" unless (index($missinglist,$serialseq)>0); + $missinglist .= "; $serialseq" unless ( index( $missinglist, $serialseq ) > 0 ); } $query = qq| UPDATE subscriptionhistory @@ -1573,7 +1528,7 @@ return : sub ItemizeSerials { my ( $serialid, $info ) = @_; - my $now = POSIX::strftime( "%Y-%m-%d",localtime ); + my $now = POSIX::strftime( "%Y-%m-%d", localtime ); my $dbh = C4::Context->dbh; my $query = qq| @@ -1587,31 +1542,21 @@ sub ItemizeSerials { if ( C4::Context->preference("RoutingSerials") ) { # check for existing biblioitem relating to serial issue - my ( $count, @results ) = - GetBiblioItemByBiblioNumber( $data->{'biblionumber'} ); + my ( $count, @results ) = GetBiblioItemByBiblioNumber( $data->{'biblionumber'} ); my $bibitemno = 0; for ( my $i = 0 ; $i < $count ; $i++ ) { - if ( $results[$i]->{'volumeddesc'} eq $data->{'serialseq'} . ' (' - . $data->{'planneddate'} - . ')' ) - { + if ( $results[$i]->{'volumeddesc'} eq $data->{'serialseq'} . ' (' . $data->{'planneddate'} . ')' ) { $bibitemno = $results[$i]->{'biblioitemnumber'}; last; } } if ( $bibitemno == 0 ) { - my $sth = - $dbh->prepare( - "SELECT * FROM biblioitems WHERE biblionumber = ? ORDER BY biblioitemnumber DESC" - ); + my $sth = $dbh->prepare( "SELECT * FROM biblioitems WHERE biblionumber = ? ORDER BY biblioitemnumber DESC" ); $sth->execute( $data->{'biblionumber'} ); my $biblioitem = $sth->fetchrow_hashref; - $biblioitem->{'volumedate'} = - $data->{planneddate} ; - $biblioitem->{'volumeddesc'} = - $data->{serialseq} . ' (' - . format_date( $data->{'planneddate'} ) . ')'; - $biblioitem->{'dewey'} = $info->{itemcallnumber}; + $biblioitem->{'volumedate'} = $data->{planneddate}; + $biblioitem->{'volumeddesc'} = $data->{serialseq} . ' (' . format_date( $data->{'planneddate'} ) . ')'; + $biblioitem->{'dewey'} = $info->{itemcallnumber}; } } @@ -1622,117 +1567,75 @@ sub ItemizeSerials { push @errors, "barcode_not_unique" if ($exists); unless ($exists) { my $marcrecord = MARC::Record->new(); - my ( $tag, $subfield ) = - GetMarcFromKohaField( "items.barcode", $fwk ); - my $newField = - MARC::Field->new( "$tag", '', '', - "$subfield" => $info->{barcode} ); + my ( $tag, $subfield ) = GetMarcFromKohaField( "items.barcode", $fwk ); + my $newField = MARC::Field->new( "$tag", '', '', "$subfield" => $info->{barcode} ); $marcrecord->insert_fields_ordered($newField); if ( $info->{branch} ) { - my ( $tag, $subfield ) = - GetMarcFromKohaField( "items.homebranch", - $fwk ); + my ( $tag, $subfield ) = GetMarcFromKohaField( "items.homebranch", $fwk ); #warn "items.homebranch : $tag , $subfield"; if ( $marcrecord->field($tag) ) { - $marcrecord->field($tag) - ->add_subfields( "$subfield" => $info->{branch} ); - } - else { - my $newField = - MARC::Field->new( "$tag", '', '', - "$subfield" => $info->{branch} ); + $marcrecord->field($tag)->add_subfields( "$subfield" => $info->{branch} ); + } else { + my $newField = MARC::Field->new( "$tag", '', '', "$subfield" => $info->{branch} ); $marcrecord->insert_fields_ordered($newField); } - ( $tag, $subfield ) = - GetMarcFromKohaField( "items.holdingbranch", - $fwk ); + ( $tag, $subfield ) = GetMarcFromKohaField( "items.holdingbranch", $fwk ); #warn "items.holdingbranch : $tag , $subfield"; if ( $marcrecord->field($tag) ) { - $marcrecord->field($tag) - ->add_subfields( "$subfield" => $info->{branch} ); - } - else { - my $newField = - MARC::Field->new( "$tag", '', '', - "$subfield" => $info->{branch} ); + $marcrecord->field($tag)->add_subfields( "$subfield" => $info->{branch} ); + } else { + my $newField = MARC::Field->new( "$tag", '', '', "$subfield" => $info->{branch} ); $marcrecord->insert_fields_ordered($newField); } } if ( $info->{itemcallnumber} ) { - my ( $tag, $subfield ) = - GetMarcFromKohaField( "items.itemcallnumber", - $fwk ); + my ( $tag, $subfield ) = GetMarcFromKohaField( "items.itemcallnumber", $fwk ); if ( $marcrecord->field($tag) ) { - $marcrecord->field($tag) - ->add_subfields( "$subfield" => $info->{itemcallnumber} ); - } - else { - my $newField = - MARC::Field->new( "$tag", '', '', - "$subfield" => $info->{itemcallnumber} ); + $marcrecord->field($tag)->add_subfields( "$subfield" => $info->{itemcallnumber} ); + } else { + my $newField = MARC::Field->new( "$tag", '', '', "$subfield" => $info->{itemcallnumber} ); $marcrecord->insert_fields_ordered($newField); } } if ( $info->{notes} ) { - my ( $tag, $subfield ) = - GetMarcFromKohaField( "items.itemnotes", $fwk ); + my ( $tag, $subfield ) = GetMarcFromKohaField( "items.itemnotes", $fwk ); if ( $marcrecord->field($tag) ) { - $marcrecord->field($tag) - ->add_subfields( "$subfield" => $info->{notes} ); - } - else { - my $newField = - MARC::Field->new( "$tag", '', '', - "$subfield" => $info->{notes} ); + $marcrecord->field($tag)->add_subfields( "$subfield" => $info->{notes} ); + } else { + my $newField = MARC::Field->new( "$tag", '', '', "$subfield" => $info->{notes} ); $marcrecord->insert_fields_ordered($newField); } } if ( $info->{location} ) { - my ( $tag, $subfield ) = - GetMarcFromKohaField( "items.location", $fwk ); + my ( $tag, $subfield ) = GetMarcFromKohaField( "items.location", $fwk ); if ( $marcrecord->field($tag) ) { - $marcrecord->field($tag) - ->add_subfields( "$subfield" => $info->{location} ); - } - else { - my $newField = - MARC::Field->new( "$tag", '', '', - "$subfield" => $info->{location} ); + $marcrecord->field($tag)->add_subfields( "$subfield" => $info->{location} ); + } else { + my $newField = MARC::Field->new( "$tag", '', '', "$subfield" => $info->{location} ); $marcrecord->insert_fields_ordered($newField); } } if ( $info->{status} ) { - my ( $tag, $subfield ) = - GetMarcFromKohaField( "items.notforloan", - $fwk ); + my ( $tag, $subfield ) = GetMarcFromKohaField( "items.notforloan", $fwk ); if ( $marcrecord->field($tag) ) { - $marcrecord->field($tag) - ->add_subfields( "$subfield" => $info->{status} ); - } - else { - my $newField = - MARC::Field->new( "$tag", '', '', - "$subfield" => $info->{status} ); + $marcrecord->field($tag)->add_subfields( "$subfield" => $info->{status} ); + } else { + my $newField = MARC::Field->new( "$tag", '', '', "$subfield" => $info->{status} ); $marcrecord->insert_fields_ordered($newField); } } if ( C4::Context->preference("RoutingSerials") ) { - my ( $tag, $subfield ) = - GetMarcFromKohaField( "items.dateaccessioned", - $fwk ); + my ( $tag, $subfield ) = GetMarcFromKohaField( "items.dateaccessioned", $fwk ); if ( $marcrecord->field($tag) ) { - $marcrecord->field($tag) - ->add_subfields( "$subfield" => $now ); - } - else { - my $newField = - MARC::Field->new( "$tag", '', '', "$subfield" => $now ); + $marcrecord->field($tag)->add_subfields( "$subfield" => $now ); + } else { + my $newField = MARC::Field->new( "$tag", '', '', "$subfield" => $now ); $marcrecord->insert_fields_ordered($newField); } } @@ -1757,28 +1660,30 @@ return : =back =cut + sub HasSubscriptionStrictlyExpired { + # Getting end of subscription date my ($subscriptionid) = @_; my $dbh = C4::Context->dbh; my $subscription = GetSubscription($subscriptionid); - my $expirationdate = GetExpirationDate($subscriptionid); - + my $expirationdate = $subscription->{enddate} || GetExpirationDate($subscriptionid); + # If the expiration date is set - if ($expirationdate != 0) { - my ($endyear, $endmonth, $endday) = split('-', $expirationdate); + if ( $expirationdate != 0 ) { + my ( $endyear, $endmonth, $endday ) = split( '-', $expirationdate ); # Getting today's date - my ($nowyear, $nowmonth, $nowday) = Today(); + my ( $nowyear, $nowmonth, $nowday ) = Today(); # if today's date > expiration date, then the subscription has stricly expired - if (Delta_Days($nowyear, $nowmonth, $nowday, - $endyear, $endmonth, $endday) < 0) { + if ( Delta_Days( $nowyear, $nowmonth, $nowday, $endyear, $endmonth, $endday ) < 0 ) { return 1; } else { return 0; } } else { + # There are some cases where the expiration date is not set # As we can't determine if the subscription has expired on a date-basis, # we return -1; @@ -1807,34 +1712,34 @@ sub HasSubscriptionExpired { my ($subscriptionid) = @_; my $dbh = C4::Context->dbh; my $subscription = GetSubscription($subscriptionid); - if (($subscription->{periodicity} % 16)>0){ - my $expirationdate = GetExpirationDate($subscriptionid); - my $query = qq| + if ( ( $subscription->{periodicity} % 16 ) > 0 ) { + my $expirationdate = $subscription->{enddate}; + my $query = qq| SELECT max(planneddate) FROM serial WHERE subscriptionid=? |; - my $sth = $dbh->prepare($query); - $sth->execute($subscriptionid); - my ($res) = $sth->fetchrow ; - return 0 unless $res; - my @res=split (/-/,$res); - my @endofsubscriptiondate=split(/-/,$expirationdate); - return 2 if (scalar(@res)!=3 || scalar(@endofsubscriptiondate)!=3||not check_date(@res) || not check_date(@endofsubscriptiondate)); - return 1 if ( (@endofsubscriptiondate && Delta_Days($res[0],$res[1],$res[2], - $endofsubscriptiondate[0],$endofsubscriptiondate[1],$endofsubscriptiondate[2]) <= 0) - || (!$res)); - return 0; + my $sth = $dbh->prepare($query); + $sth->execute($subscriptionid); + my ($res) = $sth->fetchrow; + return 0 unless $res; + my @res = split( /-/, $res ); + my @endofsubscriptiondate = split( /-/, $expirationdate ); + return 2 if ( scalar(@res) != 3 || scalar(@endofsubscriptiondate) != 3 || not check_date(@res) || not check_date(@endofsubscriptiondate) ); + return 1 + if ( ( @endofsubscriptiondate && Delta_Days( $res[0], $res[1], $res[2], $endofsubscriptiondate[0], $endofsubscriptiondate[1], $endofsubscriptiondate[2] ) <= 0 ) + || ( !$res ) ); + return 0; } else { - if ($subscription->{'numberlength'}){ - my $countreceived=countissuesfrom($subscriptionid,$subscription->{'startdate'}); - return 1 if ($countreceived >$subscription->{'numberlength'}); - return 0; - } else { - return 0; - } + if ( $subscription->{'numberlength'} ) { + my $countreceived = countissuesfrom( $subscriptionid, $subscription->{'startdate'} ); + return 1 if ( $countreceived > $subscription->{'numberlength'} ); + return 0; + } else { + return 0; + } } - return 0; # Notice that you'll never get here. + return 0; # Notice that you'll never get here. } =head2 SetDistributedto @@ -1876,11 +1781,10 @@ sub DelSubscription { my $dbh = C4::Context->dbh; $subscriptionid = $dbh->quote($subscriptionid); $dbh->do("DELETE FROM subscription WHERE subscriptionid=$subscriptionid"); - $dbh->do( - "DELETE FROM subscriptionhistory WHERE subscriptionid=$subscriptionid"); + $dbh->do("DELETE FROM subscriptionhistory WHERE subscriptionid=$subscriptionid"); $dbh->do("DELETE FROM serial WHERE subscriptionid=$subscriptionid"); - - logaction("SERIAL", "DELETE", $subscriptionid, "") if C4::Context->preference("SubscriptionLog"); + + logaction( "SERIAL", "DELETE", $subscriptionid, "" ) if C4::Context->preference("SubscriptionLog"); } =head2 DelIssue @@ -1895,22 +1799,22 @@ this function delete an issue which has $serialseq and $subscriptionid given on =cut sub DelIssue { - my ( $dataissue) = @_; - my $dbh = C4::Context->dbh; + my ($dataissue) = @_; + my $dbh = C4::Context->dbh; ### TODO Add itemdeletion. Would need to get itemnumbers. Should be in a pref ? - + my $query = qq| DELETE FROM serial WHERE serialid= ? AND subscriptionid= ? |; my $mainsth = $dbh->prepare($query); - $mainsth->execute( $dataissue->{'serialid'}, $dataissue->{'subscriptionid'}); + $mainsth->execute( $dataissue->{'serialid'}, $dataissue->{'subscriptionid'} ); #Delete element from subscription history $query = "SELECT * FROM subscription WHERE subscriptionid = ?"; - my $sth = $dbh->prepare($query); - $sth->execute($dataissue->{'subscriptionid'}); + my $sth = $dbh->prepare($query); + $sth->execute( $dataissue->{'subscriptionid'} ); my $val = $sth->fetchrow_hashref; unless ( $val->{manualhistory} ) { my $query = qq| @@ -1918,19 +1822,16 @@ sub DelIssue { WHERE subscriptionid= ? |; my $sth = $dbh->prepare($query); - $sth->execute($dataissue->{'subscriptionid'}); - my $data = $sth->fetchrow_hashref; - my $serialseq= $dataissue->{'serialseq'}; + $sth->execute( $dataissue->{'subscriptionid'} ); + my $data = $sth->fetchrow_hashref; + my $serialseq = $dataissue->{'serialseq'}; $data->{'missinglist'} =~ s/\b$serialseq\b//; $data->{'recievedlist'} =~ s/\b$serialseq\b//; - my $strsth = "UPDATE subscriptionhistory SET " - . join( ",", - map { join( "=", $_, $dbh->quote( $data->{$_} ) ) } keys %$data ) - . " WHERE subscriptionid=?"; + my $strsth = "UPDATE subscriptionhistory SET " . join( ",", map { join( "=", $_, $dbh->quote( $data->{$_} ) ) } keys %$data ) . " WHERE subscriptionid=?"; $sth = $dbh->prepare($strsth); - $sth->execute($dataissue->{'subscriptionid'}); + $sth->execute( $dataissue->{'subscriptionid'} ); } - + return $mainsth->rows; } @@ -1952,17 +1853,17 @@ name,title,planneddate,serialseq,serial.subscriptionid from tables : subscriptio =cut sub GetLateOrMissingIssues { - my ( $supplierid, $serialid,$order ) = @_; + my ( $supplierid, $serialid, $order ) = @_; my $dbh = C4::Context->dbh; my $sth; my $byserial = ''; if ($serialid) { $byserial = "and serialid = " . $serialid; } - if ($order){ - $order.=", title"; + if ($order) { + $order .= ", title"; } else { - $order="title"; + $order = "title"; } if ($supplierid) { $sth = $dbh->prepare( @@ -1980,8 +1881,7 @@ sub GetLateOrMissingIssues { $byserial ORDER BY $order" ); - } - else { + } else { $sth = $dbh->prepare( "SELECT serialid, aqbooksellerid, name, @@ -2005,9 +1905,9 @@ sub GetLateOrMissingIssues { while ( my $line = $sth->fetchrow_hashref ) { $odd++ unless $line->{title} eq $last_title; $last_title = $line->{title} if ( $line->{title} ); - $line->{planneddate} = format_date( $line->{planneddate} ); - $line->{claimdate} = format_date( $line->{claimdate} ); - $line->{"status".$line->{status}} = 1; + $line->{planneddate} = format_date( $line->{planneddate} ); + $line->{claimdate} = format_date( $line->{claimdate} ); + $line->{ "status" . $line->{status} } = 1; $line->{'odd'} = 1 if $odd % 2; $count++; push @issuelist, $line; @@ -2033,9 +1933,7 @@ called when a missing issue is found from the serials-recieve.pl file sub removeMissingIssue { my ( $sequence, $subscriptionid ) = @_; my $dbh = C4::Context->dbh; - my $sth = - $dbh->prepare( - "SELECT * FROM subscriptionhistory WHERE subscriptionid = ?"); + my $sth = $dbh->prepare("SELECT * FROM subscriptionhistory WHERE subscriptionid = ?"); $sth->execute($subscriptionid); my $data = $sth->fetchrow_hashref; my $missinglist = $data->{'missinglist'}; @@ -2131,7 +2029,7 @@ sub check_routing { my ($subscriptionid) = @_; my $dbh = C4::Context->dbh; my $sth = $dbh->prepare( - "SELECT count(routingid) routingids FROM subscription LEFT JOIN subscriptionroutinglist + "SELECT count(routingid) routingids FROM subscription LEFT JOIN subscriptionroutinglist ON subscription.subscriptionid = subscriptionroutinglist.subscriptionid WHERE subscription.subscriptionid = ? ORDER BY ranking ASC " @@ -2160,23 +2058,16 @@ sub addroutingmember { my ( $borrowernumber, $subscriptionid ) = @_; my $rank; my $dbh = C4::Context->dbh; - my $sth = - $dbh->prepare( - "SELECT max(ranking) rank FROM subscriptionroutinglist WHERE subscriptionid = ?" - ); + my $sth = $dbh->prepare( "SELECT max(ranking) rank FROM subscriptionroutinglist WHERE subscriptionid = ?" ); $sth->execute($subscriptionid); while ( my $line = $sth->fetchrow_hashref ) { if ( $line->{'rank'} > 0 ) { $rank = $line->{'rank'} + 1; - } - else { + } else { $rank = 1; } } - $sth = - $dbh->prepare( - "INSERT INTO subscriptionroutinglist (subscriptionid,borrowernumber,ranking) VALUES (?,?,?)" - ); + $sth = $dbh->prepare( "INSERT INTO subscriptionroutinglist (subscriptionid,borrowernumber,ranking) VALUES (?,?,?)" ); $sth->execute( $subscriptionid, $borrowernumber, $rank ); } @@ -2201,10 +2092,7 @@ it takes the routingid of the member one wants to re-rank and the rank it is to sub reorder_members { my ( $subscriptionid, $routingid, $rank ) = @_; my $dbh = C4::Context->dbh; - my $sth = - $dbh->prepare( - "SELECT * FROM subscriptionroutinglist WHERE subscriptionid = ? ORDER BY ranking ASC" - ); + my $sth = $dbh->prepare( "SELECT * FROM subscriptionroutinglist WHERE subscriptionid = ? ORDER BY ranking ASC" ); $sth->execute($subscriptionid); my @result; while ( my $line = $sth->fetchrow_hashref ) { @@ -2223,18 +2111,12 @@ sub reorder_members { # if index exists in array then move it to new position if ( $key > -1 && $rank > 0 ) { - my $new_rank = $rank - - 1; # $new_rank is what you want the new index to be in the array + my $new_rank = $rank - 1; # $new_rank is what you want the new index to be in the array my $moving_item = splice( @result, $key, 1 ); splice( @result, $new_rank, 0, $moving_item ); } for ( my $j = 0 ; $j < @result ; $j++ ) { - my $sth = - $dbh->prepare( "UPDATE subscriptionroutinglist SET ranking = '" - . ( $j + 1 ) - . "' WHERE routingid = '" - . $result[$j] - . "'" ); + my $sth = $dbh->prepare( "UPDATE subscriptionroutinglist SET ranking = '" . ( $j + 1 ) . "' WHERE routingid = '" . $result[$j] . "'" ); $sth->execute; } } @@ -2254,20 +2136,15 @@ deletes all members from the routing list sub delroutingmember { -# if $routingid exists then deletes that row otherwise deletes all with $subscriptionid + # if $routingid exists then deletes that row otherwise deletes all with $subscriptionid my ( $routingid, $subscriptionid ) = @_; my $dbh = C4::Context->dbh; if ($routingid) { - my $sth = - $dbh->prepare( - "DELETE FROM subscriptionroutinglist WHERE routingid = ?"); + my $sth = $dbh->prepare("DELETE FROM subscriptionroutinglist WHERE routingid = ?"); $sth->execute($routingid); reorder_members( $subscriptionid, $routingid ); - } - else { - my $sth = - $dbh->prepare( - "DELETE FROM subscriptionroutinglist WHERE subscriptionid = ?"); + } else { + my $sth = $dbh->prepare("DELETE FROM subscriptionroutinglist WHERE subscriptionid = ?"); $sth->execute($subscriptionid); } } @@ -2321,18 +2198,18 @@ $result = &countissuesfrom($subscriptionid,$startdate) =cut sub countissuesfrom { - my ($subscriptionid,$startdate) = @_; - my $dbh = C4::Context->dbh; + my ( $subscriptionid, $startdate ) = @_; + my $dbh = C4::Context->dbh; my $query = qq| SELECT count(*) FROM serial WHERE subscriptionid=? AND serial.publisheddate>? |; - my $sth=$dbh->prepare($query); - $sth->execute($subscriptionid, $startdate); - my ($countreceived)=$sth->fetchrow; - return $countreceived; + my $sth = $dbh->prepare($query); + $sth->execute( $subscriptionid, $startdate ); + my ($countreceived) = $sth->fetchrow; + return $countreceived; } =head2 CountIssues @@ -2349,15 +2226,15 @@ $result = &CountIssues($subscriptionid) sub CountIssues { my ($subscriptionid) = @_; my $dbh = C4::Context->dbh; - my $query = qq| + my $query = qq| SELECT count(*) FROM serial WHERE subscriptionid=? |; - my $sth=$dbh->prepare($query); + my $sth = $dbh->prepare($query); $sth->execute($subscriptionid); - my ($countreceived)=$sth->fetchrow; - return $countreceived; + my ($countreceived) = $sth->fetchrow; + return $countreceived; } =head2 abouttoexpire @@ -2379,44 +2256,45 @@ sub abouttoexpire { my ($subscriptionid) = @_; my $dbh = C4::Context->dbh; my $subscription = GetSubscription($subscriptionid); - my $per = $subscription->{'periodicity'}; - if ($per % 16>0){ - my $expirationdate = GetExpirationDate($subscriptionid); - my $sth = - $dbh->prepare( - "select max(planneddate) from serial where subscriptionid=?"); - $sth->execute($subscriptionid); - my ($res) = $sth->fetchrow ; - my @res=split (/-/,$res); - @res=Date::Calc::Today if ($res[0]*$res[1]==0); - my @endofsubscriptiondate=split(/-/,$expirationdate); - my $x; - if ( $per == 1 ) {$x=7;} - if ( $per == 2 ) {$x=7; } - if ( $per == 3 ) {$x=14;} - if ( $per == 4 ) { $x = 21; } - if ( $per == 5 ) { $x = 31; } - if ( $per == 6 ) { $x = 62; } - if ( $per == 7 || $per == 8 ) { $x = 93; } - if ( $per == 9 ) { $x = 190; } - if ( $per == 10 ) { $x = 365; } - if ( $per == 11 ) { $x = 730; } - my @datebeforeend=Add_Delta_Days( $endofsubscriptiondate[0],$endofsubscriptiondate[1],$endofsubscriptiondate[2], - - (3 * $x)) if (@endofsubscriptiondate && $endofsubscriptiondate[0]*$endofsubscriptiondate[1]*$endofsubscriptiondate[2]); - # warn "DATE BEFORE END: $datebeforeend"; - return 1 if ( @res && - (@datebeforeend && - Delta_Days($res[0],$res[1],$res[2], - $datebeforeend[0],$datebeforeend[1],$datebeforeend[2]) <= 0) && - (@endofsubscriptiondate && - Delta_Days($res[0],$res[1],$res[2], - $endofsubscriptiondate[0],$endofsubscriptiondate[1],$endofsubscriptiondate[2]) >= 0) ); - return 0; - } elsif ($subscription->{numberlength}>0) { - return (countissuesfrom($subscriptionid,$subscription->{'startdate'}) >=$subscription->{numberlength}-1); - } else {return 0} -} + my $per = $subscription->{'periodicity'}; + if ( $per % 16 > 0 ) { + my $expirationdate = $subscription->{enddate}; + my $sth = $dbh->prepare("select max(planneddate) from serial where subscriptionid=?"); + $sth->execute($subscriptionid); + my ($res) = $sth->fetchrow; + my @res = split( /-/, $res ); + @res = Date::Calc::Today if ( $res[0] * $res[1] == 0 ); + my @endofsubscriptiondate = split( /-/, $expirationdate ); + my $x; + if ( $per == 1 ) { $x = 7; } + if ( $per == 2 ) { $x = 7; } + if ( $per == 3 ) { $x = 14; } + if ( $per == 4 ) { $x = 21; } + if ( $per == 5 ) { $x = 31; } + if ( $per == 6 ) { $x = 62; } + if ( $per == 7 || $per == 8 ) { $x = 93; } + if ( $per == 9 ) { $x = 190; } + if ( $per == 10 ) { $x = 365; } + if ( $per == 11 ) { $x = 730; } + my @datebeforeend = Add_Delta_Days( $endofsubscriptiondate[0], $endofsubscriptiondate[1], $endofsubscriptiondate[2], -( 3 * $x ) ) + if ( @endofsubscriptiondate && $endofsubscriptiondate[0] * $endofsubscriptiondate[1] * $endofsubscriptiondate[2] ); + # warn "DATE BEFORE END: $datebeforeend"; + return 1 + if ( + @res + && ( @datebeforeend + && Delta_Days( $res[0], $res[1], $res[2], $datebeforeend[0], $datebeforeend[1], $datebeforeend[2] ) <= 0 ) + && ( @endofsubscriptiondate + && Delta_Days( $res[0], $res[1], $res[2], $endofsubscriptiondate[0], $endofsubscriptiondate[1], $endofsubscriptiondate[2] ) >= 0 ) + ); + return 0; + } elsif ( $subscription->{numberlength} > 0 ) { + return ( countissuesfrom( $subscriptionid, $subscription->{'startdate'} ) >= $subscription->{numberlength} - 1 ); + } else { + return 0; + } +} =head2 GetNextDate @@ -2435,14 +2313,15 @@ $resultdate - then next date in the sequence Return 0 if periodicity==0 =cut -sub in_array { # used in next sub down - my ($val,@elements) = @_; - foreach my $elem(@elements) { - if($val == $elem) { + +sub in_array { # used in next sub down + my ( $val, @elements ) = @_; + foreach my $elem (@elements) { + if ( $val == $elem ) { return 1; + } } - } - return 0; + return 0; } sub GetNextDate(@) { @@ -2450,134 +2329,139 @@ sub GetNextDate(@) { my @irreg = split( /\,/, $subscription->{irregularity} ); #date supposed to be in ISO. - - my ( $year, $month, $day ) = split(/-/, $planneddate); - $month=1 unless ($month); - $day=1 unless ($day); + + my ( $year, $month, $day ) = split( /-/, $planneddate ); + $month = 1 unless ($month); + $day = 1 unless ($day); my @resultdate; # warn "DOW $dayofweek"; - if ( $subscription->{periodicity} % 16 == 0 ) { # 'without regularity' || 'irregular' - return 0; - } + if ( $subscription->{periodicity} % 16 == 0 ) { # 'without regularity' || 'irregular' + return 0; + } + # daily : n / week # Since we're interpreting irregularity here as which days of the week to skip an issue, # renaming this pattern from 1/day to " n / week ". - if ( $subscription->{periodicity} == 1 ) { - my $dayofweek = eval{Day_of_Week( $year,$month, $day )}; - if ($@){warn "year month day : $year $month $day $subscription->{subscriptionid} : $@";} - else { - for ( my $i = 0 ; $i < @irreg ; $i++ ) { - $dayofweek = 0 if ( $dayofweek == 7 ); - if ( in_array( ($dayofweek + 1), @irreg ) ) { - ($year,$month,$day) = Add_Delta_Days($year,$month, $day , 1 ); - $dayofweek++; - } - } - @resultdate = Add_Delta_Days($year,$month, $day , 1 ); - } + if ( $subscription->{periodicity} == 1 ) { + my $dayofweek = eval { Day_of_Week( $year, $month, $day ) }; + if ($@) { warn "year month day : $year $month $day $subscription->{subscriptionid} : $@"; } + else { + for ( my $i = 0 ; $i < @irreg ; $i++ ) { + $dayofweek = 0 if ( $dayofweek == 7 ); + if ( in_array( ( $dayofweek + 1 ), @irreg ) ) { + ( $year, $month, $day ) = Add_Delta_Days( $year, $month, $day, 1 ); + $dayofweek++; + } + } + @resultdate = Add_Delta_Days( $year, $month, $day, 1 ); + } } + # 1 week if ( $subscription->{periodicity} == 2 ) { - my ($wkno,$year) = eval {Week_of_Year( $year,$month, $day )}; - if ($@){warn "year month day : $year $month $day $subscription->{subscriptionid} : $@";} - else { - for ( my $i = 0 ; $i < @irreg ; $i++ ) { - #FIXME: if two consecutive irreg, do we only skip one? - if ( $irreg[$i] == (($wkno!=51)?($wkno +1) % 52 :52)) { - ($year,$month,$day) = Add_Delta_Days($year,$month, $day , 7 ); - $wkno=(($wkno!=51)?($wkno +1) % 52 :52); - } - } - @resultdate = Add_Delta_Days( $year,$month, $day, 7); - } + my ( $wkno, $year ) = eval { Week_of_Year( $year, $month, $day ) }; + if ($@) { warn "year month day : $year $month $day $subscription->{subscriptionid} : $@"; } + else { + for ( my $i = 0 ; $i < @irreg ; $i++ ) { + + #FIXME: if two consecutive irreg, do we only skip one? + if ( $irreg[$i] == ( ( $wkno != 51 ) ? ( $wkno + 1 ) % 52 : 52 ) ) { + ( $year, $month, $day ) = Add_Delta_Days( $year, $month, $day, 7 ); + $wkno = ( ( $wkno != 51 ) ? ( $wkno + 1 ) % 52 : 52 ); + } + } + @resultdate = Add_Delta_Days( $year, $month, $day, 7 ); + } } + # 1 / 2 weeks - if ( $subscription->{periodicity} == 3 ) { - my ($wkno,$year) = eval {Week_of_Year( $year,$month, $day )}; - if ($@){warn "year month day : $year $month $day $subscription->{subscriptionid} : $@";} - else { - for ( my $i = 0 ; $i < @irreg ; $i++ ) { - if ( $irreg[$i] == (($wkno!=50)?($wkno +2) % 52 :52)) { - ### BUGFIX was previously +1 ^ - ($year,$month,$day) = Add_Delta_Days($year,$month, $day , 14 ); - $wkno=(($wkno!=50)?($wkno +2) % 52 :52); - } - } - @resultdate = Add_Delta_Days($year,$month, $day , 14 ); - } + if ( $subscription->{periodicity} == 3 ) { + my ( $wkno, $year ) = eval { Week_of_Year( $year, $month, $day ) }; + if ($@) { warn "year month day : $year $month $day $subscription->{subscriptionid} : $@"; } + else { + for ( my $i = 0 ; $i < @irreg ; $i++ ) { + if ( $irreg[$i] == ( ( $wkno != 50 ) ? ( $wkno + 2 ) % 52 : 52 ) ) { + ### BUGFIX was previously +1 ^ + ( $year, $month, $day ) = Add_Delta_Days( $year, $month, $day, 14 ); + $wkno = ( ( $wkno != 50 ) ? ( $wkno + 2 ) % 52 : 52 ); + } + } + @resultdate = Add_Delta_Days( $year, $month, $day, 14 ); + } } + # 1 / 3 weeks if ( $subscription->{periodicity} == 4 ) { - my ($wkno,$year) = eval {Week_of_Year( $year,$month, $day )}; - if ($@){warn "année mois jour : $year $month $day $subscription->{subscriptionid} : $@";} - else { - for ( my $i = 0 ; $i < @irreg ; $i++ ) { - if ( $irreg[$i] == (($wkno!=49)?($wkno +3) % 52 :52)) { - ($year,$month,$day) = Add_Delta_Days($year,$month, $day , 21 ); - $wkno=(($wkno!=49)?($wkno +3) % 52 :52); - } - } - @resultdate = Add_Delta_Days($year,$month, $day , 21 ); - } - } - my $tmpmonth=$month; - if ($year && $month && $day){ - if ( $subscription->{periodicity} == 5 ) { - for ( my $i = 0 ; $i < @irreg ; $i++ ) { - if ( $irreg[$i] == (($tmpmonth!=11)?($tmpmonth +1) % 12 :12)) { - ($year,$month,$day) = Add_Delta_YMD($year,$month, $day ,0,1,0 ); - $tmpmonth=(($tmpmonth!=11)?($tmpmonth +1) % 12 :12); - } - } - @resultdate = Add_Delta_YMD($year,$month, $day ,0,1,0 ); - } - if ( $subscription->{periodicity} == 6 ) { - for ( my $i = 0 ; $i < @irreg ; $i++ ) { - if ( $irreg[$i] == (($tmpmonth!=10)?($tmpmonth +2) % 12 :12)) { - ($year,$month,$day) = Add_Delta_YMD($year,$month, $day ,0,2,0 ); - $tmpmonth=(($tmpmonth!=10)?($tmpmonth + 2) % 12 :12); - } - } - @resultdate = Add_Delta_YMD($year,$month, $day, 0, 2,0 ); - } - if ( $subscription->{periodicity} == 7 ) { - for ( my $i = 0 ; $i < @irreg ; $i++ ) { - if ( $irreg[$i] == (($tmpmonth!=9)?($tmpmonth +3) % 12 :12)) { - ($year,$month,$day) = Add_Delta_YMD($year,$month, $day, 0, 3,0 ); - $tmpmonth=(($tmpmonth!=9)?($tmpmonth + 3) % 12 :12); + my ( $wkno, $year ) = eval { Week_of_Year( $year, $month, $day ) }; + if ($@) { warn "année mois jour : $year $month $day $subscription->{subscriptionid} : $@"; } + else { + for ( my $i = 0 ; $i < @irreg ; $i++ ) { + if ( $irreg[$i] == ( ( $wkno != 49 ) ? ( $wkno + 3 ) % 52 : 52 ) ) { + ( $year, $month, $day ) = Add_Delta_Days( $year, $month, $day, 21 ); + $wkno = ( ( $wkno != 49 ) ? ( $wkno + 3 ) % 52 : 52 ); + } } + @resultdate = Add_Delta_Days( $year, $month, $day, 21 ); } - @resultdate = Add_Delta_YMD($year,$month, $day, 0, 3, 0); } - if ( $subscription->{periodicity} == 8 ) { - for ( my $i = 0 ; $i < @irreg ; $i++ ) { - if ( $irreg[$i] == (($tmpmonth!=9)?($tmpmonth +3) % 12 :12)) { - ($year,$month,$day) = Add_Delta_YMD($year,$month, $day, 0, 3,0 ); - $tmpmonth=(($tmpmonth!=9)?($tmpmonth + 3) % 12 :12); + my $tmpmonth = $month; + if ( $year && $month && $day ) { + if ( $subscription->{periodicity} == 5 ) { + for ( my $i = 0 ; $i < @irreg ; $i++ ) { + if ( $irreg[$i] == ( ( $tmpmonth != 11 ) ? ( $tmpmonth + 1 ) % 12 : 12 ) ) { + ( $year, $month, $day ) = Add_Delta_YMD( $year, $month, $day, 0, 1, 0 ); + $tmpmonth = ( ( $tmpmonth != 11 ) ? ( $tmpmonth + 1 ) % 12 : 12 ); + } } + @resultdate = Add_Delta_YMD( $year, $month, $day, 0, 1, 0 ); } - @resultdate = Add_Delta_YMD($year,$month, $day, 0, 3, 0); - } - if ( $subscription->{periodicity} == 9 ) { - for ( my $i = 0 ; $i < @irreg ; $i++ ) { - if ( $irreg[$i] == (($tmpmonth!=9)?($tmpmonth +3) % 12 :12)) { - ### BUFIX Seems to need more Than One ? - ($year,$month,$day) = Add_Delta_YM($year,$month, $day, 0, 6 ); - $tmpmonth=(($tmpmonth!=6)?($tmpmonth + 6) % 12 :12); + if ( $subscription->{periodicity} == 6 ) { + for ( my $i = 0 ; $i < @irreg ; $i++ ) { + if ( $irreg[$i] == ( ( $tmpmonth != 10 ) ? ( $tmpmonth + 2 ) % 12 : 12 ) ) { + ( $year, $month, $day ) = Add_Delta_YMD( $year, $month, $day, 0, 2, 0 ); + $tmpmonth = ( ( $tmpmonth != 10 ) ? ( $tmpmonth + 2 ) % 12 : 12 ); + } } + @resultdate = Add_Delta_YMD( $year, $month, $day, 0, 2, 0 ); + } + if ( $subscription->{periodicity} == 7 ) { + for ( my $i = 0 ; $i < @irreg ; $i++ ) { + if ( $irreg[$i] == ( ( $tmpmonth != 9 ) ? ( $tmpmonth + 3 ) % 12 : 12 ) ) { + ( $year, $month, $day ) = Add_Delta_YMD( $year, $month, $day, 0, 3, 0 ); + $tmpmonth = ( ( $tmpmonth != 9 ) ? ( $tmpmonth + 3 ) % 12 : 12 ); + } + } + @resultdate = Add_Delta_YMD( $year, $month, $day, 0, 3, 0 ); + } + if ( $subscription->{periodicity} == 8 ) { + for ( my $i = 0 ; $i < @irreg ; $i++ ) { + if ( $irreg[$i] == ( ( $tmpmonth != 9 ) ? ( $tmpmonth + 3 ) % 12 : 12 ) ) { + ( $year, $month, $day ) = Add_Delta_YMD( $year, $month, $day, 0, 3, 0 ); + $tmpmonth = ( ( $tmpmonth != 9 ) ? ( $tmpmonth + 3 ) % 12 : 12 ); + } + } + @resultdate = Add_Delta_YMD( $year, $month, $day, 0, 3, 0 ); + } + if ( $subscription->{periodicity} == 9 ) { + for ( my $i = 0 ; $i < @irreg ; $i++ ) { + if ( $irreg[$i] == ( ( $tmpmonth != 9 ) ? ( $tmpmonth + 3 ) % 12 : 12 ) ) { + ### BUFIX Seems to need more Than One ? + ( $year, $month, $day ) = Add_Delta_YM( $year, $month, $day, 0, 6 ); + $tmpmonth = ( ( $tmpmonth != 6 ) ? ( $tmpmonth + 6 ) % 12 : 12 ); + } + } + @resultdate = Add_Delta_YM( $year, $month, $day, 0, 6 ); + } + if ( $subscription->{periodicity} == 10 ) { + @resultdate = Add_Delta_YM( $year, $month, $day, 1, 0 ); + } + if ( $subscription->{periodicity} == 11 ) { + @resultdate = Add_Delta_YM( $year, $month, $day, 2, 0 ); } - @resultdate = Add_Delta_YM($year,$month, $day, 0, 6); } - if ( $subscription->{periodicity} == 10 ) { - @resultdate = Add_Delta_YM($year,$month, $day, 1, 0 ); - } - if ( $subscription->{periodicity} == 11 ) { - @resultdate = Add_Delta_YM($year,$month, $day, 2, 0 ); - } - } - my $resultdate=sprintf("%04d-%02d-%02d",$resultdate[0],$resultdate[1],$resultdate[2]); - + my $resultdate = sprintf( "%04d-%02d-%02d", $resultdate[0], $resultdate[1], $resultdate[2] ); + return "$resultdate"; } diff --git a/serials/subscription-renew.pl b/serials/subscription-renew.pl index cc7cf018f5..8846826f7d 100755 --- a/serials/subscription-renew.pl +++ b/serials/subscription-renew.pl @@ -89,7 +89,7 @@ if ($subscription->{'cannotedit'}){ $template->param( startdate => format_date( - GetExpirationDate($subscriptionid) + $subscription->{enddate} || POSIX::strftime( "%Y-%m-%d", localtime ) ), numberlength => $subscription->{numberlength}, diff --git a/t/db_dependent/Serials.t b/t/db_dependent/Serials.t index e1d3815e5d..7097642ab1 100644 --- a/t/db_dependent/Serials.t +++ b/t/db_dependent/Serials.t @@ -9,7 +9,7 @@ use YAML; use C4::Serials; use C4::Debug; -use Test::More tests => 4; +use Test::More tests => 5; BEGIN { use_ok('C4::Serials'); @@ -27,3 +27,16 @@ $debug && warn scalar(@subscriptions); @subscriptions = GetSubscriptions( undef,undef ,$$subscriptioninformation{bibnum} ); isa_ok( \@subscriptions, 'ARRAY' ); $debug && warn scalar(@subscriptions); +if ($subscriptioninformation->{periodicity} % 16==0){ + $subscriptioninformation->{periodicity}=7; + ModSubscription(@$subscriptioninformation{qw(librarian, branchcode, aqbooksellerid, cost, aqbudgetid, startdate, periodicity, firstacquidate, + dow, irregularity, numberpattern, numberlength, weeklength, monthlength, add1, every1, + whenmorethan1, setto1, lastvalue1, innerloop1, add2, every2, whenmorethan2, setto2, + lastvalue2, innerloop2, add3, every3, whenmorethan3, setto3, lastvalue3, innerloop3, + numberingmethod, status, biblionumber, callnumber, notes, letter, hemisphere, manualhistory, + internalnotes, serialsadditems, staffdisplaycount, opacdisplaycount, graceperiod, location, enddate, subscriptionid +)}); +} +my $expirationdate = GetExpirationDate(1) ; +ok( $expirationdate, "not NULL" ); +$debug && warn "$expirationdate";