X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FSerials.pm;h=d72e98cc9afd76a6f6b6208476abdb8452b70749;hb=87ff46ba67ec81005a33faa579f03589144ac8d7;hp=93afe6b931708f237c37f9ca0db053344e075fc0;hpb=20f2e15e249021f00ebc20464188119b3845bda3;p=koha.git diff --git a/C4/Serials.pm b/C4/Serials.pm index 93afe6b931..d72e98cc9a 100644 --- a/C4/Serials.pm +++ b/C4/Serials.pm @@ -17,27 +17,51 @@ 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 -# $Id$ - use strict; -use C4::Date; +use C4::Dates qw(format_date); use Date::Calc qw(:all); use POSIX qw(strftime); use C4::Suggestions; use C4::Koha; use C4::Biblio; +use C4::Branch; +use C4::Items; use C4::Search; use C4::Letters; -use C4::Log; # logaction - -require Exporter; +use C4::Log; # logaction +use C4::Debug; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); -# set the version for version checking -$VERSION = do { my @v = '$Revision$' =~ /\d+/g; - shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); -}; +BEGIN { + $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 + HasItems + + ); +} + +=head2 GetSuppliersWithLateIssues =head1 NAME @@ -53,34 +77,6 @@ Give all XYZ functions =head1 FUNCTIONS -=cut - -@ISA = qw(Exporter); -@EXPORT = qw( - - &NewSubscription &ModSubscription &DelSubscription &GetSubscriptions - &GetSubscription &CountSubscriptionFromBiblionumber &GetSubscriptionsFromBiblionumber - &GetFullSubscriptionsFromBiblionumber &GetFullSubscription &ModSubscriptionHistory - &HasSubscriptionExpired &GetExpirationDate &abouttoexpire - - &GetNextSeq &NewIssue &ItemizeSerials &GetSerials - &GetLatestSerials &ModSerialStatus &GetNextDate &GetSerials2 - &ReNewSubscription &GetLateIssues &GetLateOrMissingIssues - &GetSerialInformation &AddItem2Serial - &PrepareSerialsData - - &UpdateClaimdateIssues - &GetSuppliersWithLateIssues &getsupplierbyserialid - &GetDistributedTo &SetDistributedTo - &getroutinglist &delroutingmember &addroutingmember - &reorder_members - &check_routing &updateClaim &removeMissingIssue - - &old_newsubscription &old_modsubscription &old_getserials -); - -=head2 GetSuppliersWithLateIssues - =over 4 %supplierlist = &GetSuppliersWithLateIssues @@ -89,6 +85,8 @@ this function get all suppliers with late issues. return : the supplierlist into a hash. this hash containts id & name of the supplier +Only valid suppliers are returned. Late subscriptions lacking a supplier are +ignored. =back @@ -99,7 +97,7 @@ sub GetSuppliersWithLateIssues { my $query = qq| SELECT DISTINCT id, name FROM subscription - LEFT JOIN serial ON serial.subscriptionid=subscription.subscriptionid + LEFT JOIN serial ON serial.subscriptionid=subscription.subscriptionid LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id WHERE subscription.subscriptionid = serial.subscriptionid AND (planneddate < now() OR serial.STATUS = 3 OR serial.STATUS = 4) @@ -109,11 +107,9 @@ sub GetSuppliersWithLateIssues { $sth->execute; my %supplierlist; while ( my ( $id, $name ) = $sth->fetchrow ) { + next if !defined $id; $supplierlist{$id} = $name; } - if ( C4::Context->preference("RoutingSerials") ) { - $supplierlist{''} = "All Suppliers"; - } return %supplierlist; } @@ -140,24 +136,23 @@ sub GetLateIssues { if ($supplierid) { my $query = qq| SELECT name,title,planneddate,serialseq,serial.subscriptionid - FROM subscription, serial, biblio + FROM subscription + LEFT JOIN serial ON subscription.subscriptionid = serial.subscriptionid + LEFT JOIN biblio ON biblio.biblionumber = subscription.biblionumber LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id - WHERE subscription.subscriptionid = serial.subscriptionid - AND ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3) + WHERE ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3) AND subscription.aqbooksellerid=$supplierid - AND biblio.biblionumber = subscription.biblionumber ORDER BY title |; $sth = $dbh->prepare($query); - } - else { + } else { my $query = qq| SELECT name,title,planneddate,serialseq,serial.subscriptionid - FROM subscription, serial, biblio + FROM subscription + LEFT JOIN serial ON subscription.subscriptionid = serial.subscriptionid + LEFT JOIN biblio ON biblio.biblionumber = subscription.biblionumber LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id - WHERE subscription.subscriptionid = serial.subscriptionid - AND ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3) - AND biblio.biblionumber = subscription.biblionumber + WHERE ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3) ORDER BY title |; $sth = $dbh->prepare($query); @@ -245,7 +240,15 @@ sub GetSerialInformation { my ($serialid) = @_; my $dbh = C4::Context->dbh; my $query = qq| - SELECT serial.*, serial.notes as sernotes, serial.status as serstatus,subscription.*,subscription.subscriptionid as subsid + 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| FROM serial LEFT JOIN subscription ON subscription.subscriptionid=serial.subscriptionid WHERE serialid = ? |; @@ -253,26 +256,26 @@ sub GetSerialInformation { $rq->execute($serialid); my $data = $rq->fetchrow_hashref; - if ( C4::Context->preference("serialsadditems") ) { - if ( $data->{'itemnumber'} ) { - my @itemnumbers = split /,/, $data->{'itemnumber'}; - foreach my $itemnum (@itemnumbers) { + # create item information if we have serialsadditems for this subscription + if ( $data->{'serialsadditems'} ) { + my $queryitem = $dbh->prepare("SELECT itemnumber from serialitems where serialid=?"); + $queryitem->execute($serialid); + 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 -# warn "itemnumber :$itemnum, bibnum :".$data->{'biblionumber'}; - my $itemprocessed = - PrepareItemrecordDisplay( $data->{'biblionumber'}, $itemnum ); - $itemprocessed->{'itemnumber'} = $itemnum; - $itemprocessed->{'itemid'} = $itemnum; + $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'} ); + } else { + my $itemprocessed = PrepareItemrecordDisplay( $data->{'biblionumber'}, '', $data ); $itemprocessed->{'itemid'} = "N$serialid"; $itemprocessed->{'serialid'} = $serialid; $itemprocessed->{'biblionumber'} = $data->{'biblionumber'}; @@ -281,32 +284,27 @@ 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; } -=head2 GetSerialInformation +=head2 AddItem2Serial =over 4 $data = AddItem2Serial($serialid,$itemnumber); Adds an itemnumber to Serial record + =back =cut sub AddItem2Serial { my ( $serialid, $itemnumber ) = @_; - my $dbh = C4::Context->dbh; - my $query = qq| - UPDATE serial SET itemnumber=IF(itemnumber IS NULL, $itemnumber, CONCAT(itemnumber,",",$itemnumber)) - WHERE serialid = ? - |; - my $rq = $dbh->prepare($query); - $rq->execute($serialid); + my $dbh = C4::Context->dbh; + my $rq = $dbh->prepare("INSERT INTO `serialitems` SET serialid=? , itemnumber=?"); + $rq->execute( $serialid, $itemnumber ); return $rq->rows; } @@ -318,18 +316,18 @@ UpdateClaimdateIssues($serialids,[$date]); Update Claimdate for issues in @$serialids list with date $date (Take Today if none) + =back =cut 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,29 +353,34 @@ sub GetSubscription { my $query = qq( SELECT subscription.*, subscriptionhistory.*, - aqbudget.bookfundid, aqbooksellers.name AS aqbooksellername, biblio.title AS bibliotitle, - subscription.biblionumber as bibnum + 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( FROM subscription LEFT JOIN subscriptionhistory ON subscription.subscriptionid=subscriptionhistory.subscriptionid - LEFT JOIN aqbudget ON subscription.aqbudgetid=aqbudget.aqbudgetid 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){ -# warn "flags: ".C4::Context->userenv->{'flags'}; - $query.=" AND subscription.branchcode IN ('".C4::Context->userenv->{'branch'}."',\"\")"; - } -# warn "query : $query"; + + # 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); -# warn "subsid :$subscriptionid"; $sth->execute($subscriptionid); - my $subs = $sth->fetchrow_hashref; - return $subs; + return $sth->fetchrow_hashref; } =head2 GetFullSubscription @@ -393,8 +396,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, @@ -402,35 +405,34 @@ sub GetFullSubscription { serial.status, serial.notes as notes, year(IF(serial.publisheddate="00-00-0000",serial.planneddate,serial.publisheddate)) as year, - aqbudget.bookfundid,aqbooksellers.name as aqbooksellername, + aqbooksellers.name as aqbooksellername, biblio.title as bibliotitle, subscription.branchcode AS branchcode, - subscription.subscriptionid AS subscriptionid + 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| FROM serial LEFT JOIN subscription ON - (serial.subscriptionid=subscription.subscriptionid AND subscription.biblionumber=serial.biblionumber) - LEFT JOIN aqbudget ON subscription.aqbudgetid=aqbudget.aqbudgetid + (serial.subscriptionid=subscription.subscriptionid ) LEFT JOIN aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id LEFT JOIN biblio on biblio.biblionumber=subscription.biblionumber - WHERE serial.subscriptionid = ? |; - if (C4::Context->preference('IndependantBranches') && - C4::Context->userenv && - C4::Context->userenv->{'flags'} != 1){ - $query.=" - AND subscription.branchcode IN ('".C4::Context->userenv->{'branch'}."',\"''\")"; - } - $query .=qq| + WHERE serial.subscriptionid = ? ORDER BY year DESC, IF(serial.publisheddate="00-00-0000",serial.planneddate,serial.publisheddate) DESC, serial.subscriptionid |; + $debug and warn "GetFullSubscription query: $query"; my $sth = $dbh->prepare($query); $sth->execute($subscriptionid); - my $subs = $sth->fetchall_arrayref({}); - return $subs; + return $sth->fetchall_arrayref( {} ); } - =head2 PrepareSerialsData =over 4 @@ -442,8 +444,8 @@ sub GetFullSubscription { =cut -sub PrepareSerialsData{ - my ($lines)=@_; +sub PrepareSerialsData { + my ($lines) = @_; my %tmpresults; my $year; my @res; @@ -453,45 +455,39 @@ 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->{'branchname'} = GetBranchName( $subs->{'branchcode'} ); + $subs->{'planneddate'} = format_date( $subs->{'planneddate'} ); $subs->{ "status" . $subs->{'status'} } = 1; + $subs->{"checked"} = $subs->{'status'} =~ /1|3|4|7/; -# $subs->{'notes'} = $subs->{'notes'} eq $previousnote?"":$subs->{notes}; 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, - - # 'startdate'=>format_date($subs->{'startdate'}), + 'year' => $year, 'aqbooksellername' => $subs->{'aqbooksellername'}, 'bibliotitle' => $subs->{'bibliotitle'}, 'serials' => [$subs], 'first' => $first, - 'branchcode' => $subs->{'branchcode'}, - 'subscriptionid' => $subs->{'subscriptionid'}, }; } - - # $previousnote=$subs->{notes}; } foreach my $key ( sort { $b cmp $a } keys %tmpresults ) { push @res, $tmpresults{$key}; } - $res[0]->{'first'}=1; + $res[0]->{'first'} = 1; return \@res; } @@ -513,42 +509,43 @@ sub GetSubscriptionsFromBiblionumber { SELECT subscription.*, branches.branchname, subscriptionhistory.*, - aqbudget.bookfundid, aqbooksellers.name AS aqbooksellername, biblio.title AS bibliotitle FROM subscription LEFT JOIN subscriptionhistory ON subscription.subscriptionid=subscriptionhistory.subscriptionid - LEFT JOIN aqbudget ON subscription.aqbudgetid=aqbudget.aqbudgetid LEFT JOIN aqbooksellers ON subscription.aqbooksellerid=aqbooksellers.id LEFT JOIN biblio ON biblio.biblionumber=subscription.biblionumber LEFT JOIN branches ON branches.branchcode=subscription.branchcode WHERE subscription.biblionumber = ? ); - if (C4::Context->preference('IndependantBranches') && - C4::Context->userenv && - C4::Context->userenv->{'flags'} != 1){ - $query.=" AND subscription.branchcode IN ('".C4::Context->userenv->{'branch'}."',\"\")"; - } my $sth = $dbh->prepare($query); $sth->execute($biblionumber); my @res; 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->{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->{ "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; @@ -576,32 +573,31 @@ sub GetFullSubscriptionsFromBiblionumber { serial.status, serial.notes as notes, year(IF(serial.publisheddate="00-00-0000",serial.planneddate,serial.publisheddate)) as year, - aqbudget.bookfundid,aqbooksellers.name as aqbooksellername, biblio.title as bibliotitle, subscription.branchcode AS branchcode, - subscription.subscriptionid AS subscriptionid + 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| FROM serial LEFT JOIN subscription ON - (serial.subscriptionid=subscription.subscriptionid AND subscription.biblionumber=serial.biblionumber) - LEFT JOIN aqbudget ON subscription.aqbudgetid=aqbudget.aqbudgetid + (serial.subscriptionid=subscription.subscriptionid) LEFT JOIN aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id LEFT JOIN biblio on biblio.biblionumber=subscription.biblionumber - WHERE subscription.biblionumber = ? |; - if (C4::Context->preference('IndependantBranches') && - C4::Context->userenv && - C4::Context->userenv->{'flags'} != 1){ - $query.=" - AND subscription.branchcode IN ('".C4::Context->userenv->{'branch'}."',\"''\")"; - } - $query .=qq| + WHERE subscription.biblionumber = ? ORDER BY year DESC, IF(serial.publisheddate="00-00-0000",serial.planneddate,serial.publisheddate) DESC, serial.subscriptionid |; my $sth = $dbh->prepare($query); $sth->execute($biblionumber); - my $subs= $sth->fetchall_arrayref({}); - return $subs; + return $sth->fetchall_arrayref( {} ); } =head2 GetSubscriptions @@ -618,100 +614,74 @@ a table of hashref. Each hash containt the subscription. =cut sub GetSubscriptions { - my ( $title, $ISSN, $biblionumber ) = @_; + my ( $string, $issn, $biblionumber ) = @_; + #return unless $title or $ISSN or $biblionumber; my $dbh = C4::Context->dbh; my $sth; - if ($biblionumber) { - my $query = qq( - SELECT subscription.*,biblio.title,biblioitems.issn,biblio.biblionumber + my $sql = qq( + SELECT subscription.*, subscriptionhistory.*, biblio.title,biblioitems.issn,biblio.biblionumber FROM subscription + LEFT JOIN subscriptionhistory USING(subscriptionid) LEFT JOIN biblio ON biblio.biblionumber = subscription.biblionumber LEFT JOIN biblioitems ON biblio.biblionumber = biblioitems.biblionumber - WHERE biblio.biblionumber=? - ); - if (C4::Context->preference('IndependantBranches') && - C4::Context->userenv && - C4::Context->userenv->{'flags'} != 1){ - $query.=" AND subscription.branchcode IN ('".C4::Context->userenv->{'branch'}."',\"''\")"; - } - $query.=" ORDER BY title"; -# warn "query :$query"; - $sth = $dbh->prepare($query); - $sth->execute($biblionumber); + ); + my @bind_params; + my $sqlwhere; + if ($biblionumber) { + $sqlwhere = " WHERE biblio.biblionumber=?"; + push @bind_params, $biblionumber; } - else { - if ( $ISSN and $title ) { - my $query = qq| - SELECT subscription.*,biblio.title,biblioitems.issn,biblio.biblionumber - FROM subscription - LEFT JOIN biblio ON biblio.biblionumber = subscription.biblionumber - LEFT JOIN biblioitems ON biblio.biblionumber = biblioitems.biblionumber - WHERE (biblioitems.issn = ? or|. join('and ',map{"biblio.title LIKE \"%$_%\""}split (" ",$title))." )"; - - if (C4::Context->preference('IndependantBranches') && - C4::Context->userenv && - C4::Context->userenv->{'flags'} != 1){ - $query.=" AND subscription.branchcode IN ('".C4::Context->userenv->{'branch'}."',\"''\")"; - } - $query.=" ORDER BY title"; - $sth = $dbh->prepare($query); - $sth->execute( $ISSN ); + 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; } - else { - if ($ISSN) { - my $query = qq( - SELECT subscription.*,biblio.title,biblioitems.issn,,biblio.biblionumber - FROM subscription - LEFT JOIN biblio ON biblio.biblionumber = subscription.biblionumber - LEFT JOIN biblioitems ON biblio.biblionumber = biblioitems.biblionumber - WHERE biblioitems.issn LIKE ? - ); - if (C4::Context->preference('IndependantBranches') && - C4::Context->userenv && - C4::Context->userenv->{'flags'} != 1){ - $query.=" AND subscription.branchcode IN ('".C4::Context->userenv->{'branch'}."',\"''\")"; - } - $query.=" ORDER BY title"; -# warn "query :$query"; - $sth = $dbh->prepare($query); - $sth->execute( "%" . $ISSN . "%" ); - } - else { - my $query = qq( - SELECT subscription.*,biblio.title,biblioitems.issn,biblio.biblionumber - FROM subscription - LEFT JOIN biblio ON biblio.biblionumber = subscription.biblionumber - LEFT JOIN biblioitems ON biblio.biblionumber = biblioitems.biblionumber - WHERE 1 - ).($title?" and ":""). join('and ',map{"biblio.title LIKE \"%$_%\""} split (" ",$title) ); - - warn $query; - if (C4::Context->preference('IndependantBranches') && - C4::Context->userenv && - C4::Context->userenv->{'flags'} != 1){ - $query.=" AND subscription.branchcode IN ('".C4::Context->userenv->{'branch'}."',\"''\")"; - } - $query.=" ORDER BY title"; - $sth = $dbh->prepare($query); - $sth->execute; - } + $sqlwhere .= ( $sqlwhere ? " AND " : " WHERE " ) . "(" . join( ") OR (", @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; } + $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} = ""; - $line->{toggle} = 1 if $odd == 1; - } - else { + $line->{title} = ""; + $line->{issn} = ""; + } else { $previoustitle = $line->{title}; $odd = -$odd; - $line->{toggle} = 1 if $odd == 1; } + $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} ) ); push @results, $line; } return @results; @@ -726,35 +696,36 @@ this function get every serial not arrived for a given subscription as well as the number of issues registered in the database (all types) this number is used to see if a subscription can be deleted (=it must have only 1 issue) +FIXME: We should return \@serials. + =back =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 + 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 + $query = "SELECT serialid,serialseq, status, planneddate, publisheddate,notes, routingnotes FROM serial WHERE subscriptionid = ? AND (status in (2,4,5)) @@ -764,15 +735,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 ); @@ -790,27 +760,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 + SELECT serialid,serialseq, status, planneddate, publisheddate,notes, routingnotes FROM serial WHERE subscriptionid=$subscription AND status IN ($status) ORDER BY publisheddate,serialid DESC |; -# warn $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 @@ -841,8 +813,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; } @@ -873,8 +844,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; } @@ -926,57 +897,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}; - $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; + # 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 { - $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 @@ -994,25 +960,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'}; @@ -1024,7 +989,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 @@ -1032,50 +997,40 @@ the enddate =cut sub GetExpirationDate { - my ($subscriptionid) = @_; - my $dbh = C4::Context->dbh; - my $subscription = GetSubscription($subscriptionid); - my $enddate = $subscription->{startdate}; - -# we don't do the same test if the subscription is based on X numbers or on X weeks/months -# warn "SUBSCRIPTIONID :$subscriptionid"; -# use Data::Dumper; warn Dumper($subscription); - -# warn "dateCHECKRESERV :".$subscription->{startdate}; - if ($subscription->{periodicity}){ - if ( $subscription->{numberlength} ) { - #calculate the date of the last issue. - my $length = $subscription->{numberlength}; - # warn "ENDDATE ".$enddate; - for ( my $i = 1 ; $i <= $length ; $i++ ) { - $enddate = GetNextDate( $enddate, $subscription ); - # warn "AFTER ENDDATE ".$enddate; - } - } - elsif ( $subscription->{monthlength} ){ - my @date=split (/-/,$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} ){ - my @date=split (/-/,$subscription->{startdate}); - # warn "dateCHECKRESERV :".$subscription->{startdate}; - #### An other way to do it - # if ( $subscription->{weeklength} ){ - # my ($weeknb,$year)=Week_of_Year(@startdate); - # $weeknb += $subscription->{weeklength}; - # my $weeknbcalc= $weeknb % 52; - # $year += int($weeknb/52); - # # warn "year : $year weeknb :$weeknb weeknbcalc $weeknbcalc"; - # @endofsubscriptiondate=Monday_of_Week($weeknbcalc,$year); - # } - 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]); - } - # warn "date de fin :$enddate"; - return $enddate; + my ( $subscriptionid, $startdate ) = @_; + my $dbh = C4::Context->dbh; + my $subscription = GetSubscription($subscriptionid); + my $enddate; + + # 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 0; - } + return; + } } =head2 CountSubscriptionFromBiblionumber @@ -1093,9 +1048,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; @@ -1114,23 +1069,17 @@ 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=?,enddate=?,recievedlist=?,missinglist=?,opacnote=?,librariannote=? + SET histstartdate=?,histenddate=?,recievedlist=?,missinglist=?,opacnote=?,librariannote=? WHERE subscriptionid=? "; my $sth = $dbh->prepare($query); - $recievedlist =~ s/^,//g; - $missinglist =~ s/^,//g; - $opacnote =~ s/^,//g; - $sth->execute( - $histstartdate, $enddate, $recievedlist, $missinglist, - $opacnote, $librariannote, $subscriptionid - ); + $recievedlist =~ s/^; //; + $missinglist =~ s/^; //; + $opacnote =~ s/^; //; + $sth->execute( $histstartdate, $enddate, $recievedlist, $missinglist, $opacnote, $librariannote, $subscriptionid ); return $sth->rows; } @@ -1148,8 +1097,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 : @@ -1162,41 +1110,37 @@ sub ModSerialStatus { # change status & update subscriptionhistory my $val; if ( $status eq 6 ) { - DelIssue( $serialseq, $subscriptionid ); - } - 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 ) { -# warn "receivedlist : $recievedlist serialseq :$serialseq, ".index("$recievedlist","$serialseq"); - $recievedlist .= ",$serialseq" + $recievedlist .= "; $serialseq" unless ( index( "$recievedlist", "$serialseq" ) >= 0 ); } -# warn "missinglist : $missinglist serialseq :$serialseq, ".index("$missinglist","$serialseq"); - $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" + $missinglist .= "; $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 ); } } @@ -1209,34 +1153,92 @@ 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} ); } } } +=head2 GetNextExpected + +=over 4 + +$nextexpected = GetNextExpected($subscriptionid) + +Get the planneddate for the current expected issue of the subscription. + +returns a hashref: + +$nextexepected = { + serialid => int + planneddate => C4::Dates object + } + +=back + +=cut + +sub GetNextExpected($) { + my ($subscriptionid) = @_; + 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; + } + $nextissue->{planneddate} = C4::Dates->new( $nextissue->{planneddate}, 'iso' ); + return $nextissue; + +} + +=head2 ModNextExpected + +=over 4 + +ModNextExpected($subscriptionid,$date) + +Update the planneddate for the current expected issue of the subscription. +This will modify all future prediction results. + +C<$date> is a C4::Dates object. + +=back + +=cut + +sub ModNextExpected($$) { + 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 ); + return 0; + +} + =head2 ModSubscription =over 4 @@ -1248,21 +1250,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, - $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=?, @@ -1270,29 +1266,32 @@ sub ModSubscription { 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=? + numberingmethod=?, status=?, biblionumber=?, callnumber=?, notes=?, + letter=?, hemisphere=?,manualhistory=?,internalnotes=?,serialsadditems=?, + 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, - $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(C4::Context->userenv->{'number'},"SERIAL","MODIFY",$subscriptionid,"") - if C4::Context->preference("SubscriptionLog"); + + logaction( "SERIAL", "MODIFY", $subscriptionid, "" ) if C4::Context->preference("SubscriptionLog"); return $rows; } @@ -1305,7 +1304,8 @@ $subscriptionid = &NewSubscription($auser,branchcode,$aqbooksellerid,$cost,$aqbu $add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1, $add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2, $add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3, - $numberingmethod, $status, $notes) + $numberingmethod, $status, $notes, $serialsadditems, + $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate); Create a new subscription with value given on input args. @@ -1317,18 +1317,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 + 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; @@ -1341,47 +1335,31 @@ sub NewSubscription { add2,every2,whenmorethan2,setto2,lastvalue2,innerloop2, add3,every3,whenmorethan3,setto3,lastvalue3,innerloop3, numberingmethod, status, notes, letter,firstacquidate,irregularity, - numberpattern, callnumber, hemisphere,manualhistory,internalnotes) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + numberpattern, callnumber, hemisphere,manualhistory,internalnotes,serialsadditems, + staffdisplaycount,opacdisplaycount,graceperiod,location,enddate) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) |; my $sth = $dbh->prepare($query); $sth->execute( - $auser, $branchcode, - $aqbooksellerid, $cost, - $aqbudgetid, $biblionumber, - format_date_in_iso($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 + $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, enddate, missinglist, recievedlist, opacnote, librariannote) - VALUES (?,?,?,?,?,?,?,?) + (biblionumber, subscriptionid, histstartdate, opacnote, librariannote) + VALUES (?,?,?,?,?) ); $sth = $dbh->prepare($query); - $sth->execute( $biblionumber, $subscriptionid, - format_date_in_iso($startdate), - 0, "", "", "", "$notes" ); + $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 @@ -1393,21 +1371,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, - format_date_in_iso($startdate), - format_date_in_iso($startdate) - ); - - &logaction(C4::Context->userenv->{'number'},"SERIAL","ADD",$subscriptionid,"") - if C4::Context->preference("SubscriptionLog"); - + $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 ); }; + } + ModBiblio( $record, $biblionumber, $bib->{'frameworkcode'} ); + } return $subscriptionid; } @@ -1424,41 +1407,58 @@ 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,biblioitems - WHERE biblio.biblionumber=biblioitems.biblionumber - AND biblio.biblionumber=? + 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; - NewSuggestion( - $user, $subscription->{bibliotitle}, - $biblio->{author}, $biblio->{publishercode}, - $biblio->{note}, '', - '', '', - '', '', - $subscription->{biblionumber} - ); + my $sth = $dbh->prepare($query); + $sth->execute( $subscription->{biblionumber} ); + my $biblio = $sth->fetchrow_hashref; + + 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 - my $query = qq| + $query = qq| UPDATE subscription SET startdate=?,numberlength=?,weeklength=?,monthlength=? WHERE subscriptionid=? |; - my $sth = $dbh->prepare($query); - $sth->execute( format_date_in_iso($startdate), - $numberlength, $weeklength, $monthlength, $subscriptionid ); - - &logaction(C4::Context->userenv->{'number'},"SERIAL","RENEW",$subscriptionid,"") - if C4::Context->preference("SubscriptionLog"); + $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"); } =head2 NewIssue @@ -1475,11 +1475,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 @@ -1487,9 +1485,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 @@ -1500,13 +1497,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 @@ -1514,6 +1511,8 @@ sub NewIssue { WHERE subscriptionid=? |; $sth = $dbh->prepare($query); + $recievedlist =~ s/^; //; + $missinglist =~ s/^; //; $sth->execute( $recievedlist, $missinglist, $subscriptionid ); return $serialid; } @@ -1535,7 +1534,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| @@ -1549,41 +1548,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 ) { - - # warn "need to add new biblioitem so copy last one and make minor changes"; - 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'} = - format_date_in_iso( $data->{planneddate} ); - $biblioitem->{'volumeddesc'} = - $data->{serialseq} . ' (' - . format_date( $data->{'planneddate'} ) . ')'; - $biblioitem->{'dewey'} = $info->{itemcallnumber}; - - #FIXME HDL : I don't understand why you need to call newbiblioitem, as the biblioitem should already be somewhere. - # so I comment it, we can speak of it when you want - # newbiblioitems has been removed from Biblio.pm, as it has a deprecated API now -# if ( $info->{barcode} ) -# { # only make biblioitem if we are going to make item also -# $bibitemno = newbiblioitem($biblioitem); -# } + $biblioitem->{'volumedate'} = $data->{planneddate}; + $biblioitem->{'volumeddesc'} = $data->{serialseq} . ' (' . format_date( $data->{'planneddate'} ) . ')'; + $biblioitem->{'dewey'} = $info->{itemcallnumber}; } } @@ -1594,141 +1573,142 @@ 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 ); - #warn "items.itemcallnumber : $tag , $subfield"; 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 ); - # warn "items.itemnotes : $tag , $subfield"; 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 ); - # warn "items.location : $tag , $subfield"; 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 ); - # warn "items.notforloan : $tag , $subfield"; 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); } } - AddItem( $marcrecord, $data->{'biblionumber'} ); + AddItemFromMarc( $marcrecord, $data->{'biblionumber'} ); return 1; } return ( 0, @errors ); } } +=head2 HasSubscriptionStrictlyExpired + +=over 4 + +1 or 0 = HasSubscriptionStrictlyExpired($subscriptionid) + +the subscription has stricly expired when today > the end subscription date + +return : +1 if true, 0 if false, -1 if the expiration date is not set. + +=back + +=cut + +sub HasSubscriptionStrictlyExpired { + + # Getting end of subscription date + my ($subscriptionid) = @_; + my $dbh = C4::Context->dbh; + my $subscription = GetSubscription($subscriptionid); + my $expirationdate = $subscription->{enddate} || GetExpirationDate($subscriptionid); + + # If the expiration date is set + if ( $expirationdate != 0 ) { + my ( $endyear, $endmonth, $endday ) = split( '-', $expirationdate ); + + # Getting today's date + 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 ) { + 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; + return -1; + } +} + =head2 HasSubscriptionExpired =over 4 -1 or 0 = HasSubscriptionExpired($subscriptionid) +$has_expired = HasSubscriptionExpired($subscriptionid) the subscription has expired when the next issue to arrive is out of subscription limit. return : -1 if true, 0 if false. +0 if the subscription has not expired +1 if the subscription has expired +2 if has subscription does not have a valid expiration date set =back @@ -1738,33 +1718,34 @@ sub HasSubscriptionExpired { my ($subscriptionid) = @_; my $dbh = C4::Context->dbh; my $subscription = GetSubscription($subscriptionid); - if ($subscription->{periodicity}>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 ; - my @res=split (/-/,$res); -# warn "date expiration :$expirationdate"; - my @endofsubscriptiondate=split(/-/,$expirationdate); - 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->{'numberlentgh'}); - 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; + return 0; # Notice that you'll never get here. } =head2 SetDistributedto @@ -1806,12 +1787,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(C4::Context->userenv->{'number'},"SERIAL","DELETE",$subscriptionid,"") - if C4::Context->preference("SubscriptionLog"); + + logaction( "SERIAL", "DELETE", $subscriptionid, "" ) if C4::Context->preference("SubscriptionLog"); } =head2 DelIssue @@ -1826,20 +1805,22 @@ this function delete an issue which has $serialseq and $subscriptionid given on =cut sub DelIssue { - my ( $serialseq, $subscriptionid ) = @_; - 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 serialseq= ? + WHERE serialid= ? AND subscriptionid= ? |; my $mainsth = $dbh->prepare($query); - $mainsth->execute( $serialseq, $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($subscriptionid); + my $sth = $dbh->prepare($query); + $sth->execute( $dataissue->{'subscriptionid'} ); my $val = $sth->fetchrow_hashref; unless ( $val->{manualhistory} ) { my $query = qq| @@ -1847,19 +1828,16 @@ sub DelIssue { WHERE subscriptionid= ? |; my $sth = $dbh->prepare($query); - $sth->execute($subscriptionid); - my $data = $sth->fetchrow_hashref; - $data->{'missinglist'} =~ s/$serialseq//; - $data->{'recievedlist'} =~ s/$serialseq//; - my $strsth = "UPDATE subscriptionhistory SET " - . join( ",", - map { join( "=", $_, $dbh->quote( $data->{$_} ) ) } keys %$data ) - . " WHERE subscriptionid=?"; + $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=?"; $sth = $dbh->prepare($strsth); - $sth->execute($subscriptionid); + $sth->execute( $dataissue->{'subscriptionid'} ); } - ### TODO Add itemdeletion. Should be in a pref ? - + return $mainsth->rows; } @@ -1881,66 +1859,48 @@ 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( -"SELECT - serialid, - aqbooksellerid, - name, - biblio.title, - planneddate, - serialseq, - serial.status, - serial.subscriptionid, - claimdate -FROM serial -LEFT JOIN subscription ON serial.subscriptionid=subscription.subscriptionid -LEFT JOIN biblio ON serial.biblionumber=biblio.biblionumber -LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id -WHERE subscription.subscriptionid = serial.subscriptionid -AND (serial.STATUS = 4 OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3)) -AND subscription.aqbooksellerid=$supplierid -$byserial -ORDER BY $order" + "SELECT + serialid, aqbooksellerid, name, + biblio.title, planneddate, serialseq, + serial.status, serial.subscriptionid, claimdate + FROM serial + LEFT JOIN subscription ON serial.subscriptionid=subscription.subscriptionid + LEFT JOIN biblio ON subscription.biblionumber=biblio.biblionumber + LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id + WHERE subscription.subscriptionid = serial.subscriptionid + AND (serial.STATUS = 4 OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3 OR serial.STATUS = 7)) + AND subscription.aqbooksellerid=$supplierid + $byserial + ORDER BY $order" ); - } - else { + } else { $sth = $dbh->prepare( -"SELECT - serialid, - aqbooksellerid, - name, - biblio.title, - planneddate, - serialseq, - serial.status, - serial.subscriptionid, - claimdate -FROM serial -LEFT JOIN subscription -ON serial.subscriptionid=subscription.subscriptionid -LEFT JOIN biblio -ON serial.biblionumber=biblio.biblionumber -LEFT JOIN aqbooksellers -ON subscription.aqbooksellerid = aqbooksellers.id -WHERE - subscription.subscriptionid = serial.subscriptionid -AND (serial.STATUS = 4 OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3)) -AND biblio.biblionumber = subscription.biblionumber -$byserial -ORDER BY $order" + "SELECT + serialid, aqbooksellerid, name, + biblio.title, planneddate, serialseq, + serial.status, serial.subscriptionid, claimdate + FROM serial + LEFT JOIN subscription ON serial.subscriptionid=subscription.subscriptionid + LEFT JOIN biblio ON subscription.biblionumber=biblio.biblionumber + LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id + WHERE subscription.subscriptionid = serial.subscriptionid + AND (serial.STATUS = 4 OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3 OR serial.STATUS = 7)) + $byserial + ORDER BY $order" ); } $sth->execute; @@ -1951,9 +1911,9 @@ ORDER BY $order" 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; @@ -1979,9 +1939,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'}; @@ -1997,8 +1955,8 @@ sub removeMissingIssue { $missinglist =~ s/\|$//g; my $sth2 = $dbh->prepare( "UPDATE subscriptionhistory - SET missinglist = ? - WHERE subscriptionid = ?" + SET missinglist = ? + WHERE subscriptionid = ?" ); $sth2->execute( $missinglist, $subscriptionid ); } @@ -2023,8 +1981,8 @@ sub updateClaim { my $dbh = C4::Context->dbh; my $sth = $dbh->prepare( "UPDATE serial SET claimdate = now() - WHERE serialid = ? - " + WHERE serialid = ? + " ); $sth->execute($serialid); } @@ -2049,10 +2007,10 @@ sub getsupplierbyserialid { my $dbh = C4::Context->dbh; my $sth = $dbh->prepare( "SELECT serialid, serial.subscriptionid, aqbooksellerid - FROM serial, subscription - WHERE serial.subscriptionid = subscription.subscriptionid - AND serialid = ? - " + FROM serial + LEFT JOIN subscription ON serial.subscriptionid = subscription.subscriptionid + WHERE serialid = ? + " ); $sth->execute($serialid); my $line = $sth->fetchrow_hashref; @@ -2068,6 +2026,7 @@ sub getsupplierbyserialid { this function checks to see if a serial has a routing list and returns the count of routingid used to show either an 'add' or 'edit' link + =back =cut @@ -2076,9 +2035,9 @@ sub check_routing { my ($subscriptionid) = @_; my $dbh = C4::Context->dbh; my $sth = $dbh->prepare( -"SELECT count(routingid) routingids FROM subscriptionroutinglist, subscription - WHERE subscription.subscriptionid = subscriptionroutinglist.subscriptionid - AND subscription.subscriptionid = ? ORDER BY ranking ASC + "SELECT count(routingid) routingids FROM subscription LEFT JOIN subscriptionroutinglist + ON subscription.subscriptionid = subscriptionroutinglist.subscriptionid + WHERE subscription.subscriptionid = ? ORDER BY ranking ASC " ); $sth->execute($subscriptionid); @@ -2105,23 +2064,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 ); } @@ -2146,10 +2098,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 ) { @@ -2168,18 +2117,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; } } @@ -2199,20 +2142,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); } } @@ -2238,10 +2176,10 @@ sub getroutinglist { my ($subscriptionid) = @_; my $dbh = C4::Context->dbh; my $sth = $dbh->prepare( - "SELECT routingid, borrowernumber, - ranking, biblionumber FROM subscriptionroutinglist, subscription - WHERE subscription.subscriptionid = subscriptionroutinglist.subscriptionid - AND subscription.subscriptionid = ? ORDER BY ranking ASC + "SELECT routingid, borrowernumber, ranking, biblionumber + FROM subscription + LEFT JOIN subscriptionroutinglist ON subscription.subscriptionid = subscriptionroutinglist.subscriptionid + WHERE subscription.subscriptionid = ? ORDER BY ranking ASC " ); $sth->execute($subscriptionid); @@ -2266,302 +2204,128 @@ $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 abouttoexpire +=head2 CountIssues =over 4 -$result = &abouttoexpire($subscriptionid) - -this function alerts you to the penultimate issue for a serial subscription +$result = &CountIssues($subscriptionid) -returns 1 - if this is the penultimate issue -returns 0 - if not =back =cut -sub abouttoexpire { +sub CountIssues { my ($subscriptionid) = @_; my $dbh = C4::Context->dbh; - my $subscription = GetSubscription($subscriptionid); - my $per = $subscription->{'periodicity'}; - if ($per>0){ - my $expirationdate = GetExpirationDate($subscriptionid); - my $sth = - $dbh->prepare( - "select max(planneddate) from serial where subscriptionid=?"); - $sth->execute($subscriptionid); - my ($res) = $sth->fetchrow ; -# warn "date expiration : ".$expirationdate." date courante ".$res; - my @res=split /-/,$res; - my @endofsubscriptiondate=split/-/,$expirationdate; - my $per = $subscription->{'periodicity'}; - 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); - # 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 old_newsubscription - -=over 4 - -($subscriptionid) = &old_newsubscription($auser,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber, - $startdate,$periodicity,$firstacquidate,$dow,$irregularity,$numberpattern,$numberlength,$weeklength,$monthlength, - $add1,$every1,$whenmorethan1,$setto1,$lastvalue1, - $add2,$every2,$whenmorethan2,$setto2,$lastvalue2, - $add3,$every3,$whenmorethan3,$setto3,$lastvalue3, - $numberingmethod, $status, $callnumber, $notes, $hemisphere) - -this function is similar to the NewSubscription subroutine but has a few different -values passed in -$firstacquidate - date of first serial issue to arrive -$irregularity - the issues not expected separated by a '|' -- eg. monthly issue but not expecting issue for june and july would have $irregularity of '6|7' -$numberpattern - the number for an array of labels to reconstruct the javascript correctly in the - subscription-add.tmpl file -$callnumber - display the callnumber of the serial -$hemisphere - either 2 = southern hemisphere or 1 = northern hemisphere - used for quarterly serials - -return : -the $subscriptionid number of the new subscription - -=back - -=cut - -sub old_newsubscription { - my ( - $auser, $aqbooksellerid, $cost, $aqbudgetid, - $biblionumber, $startdate, $periodicity, $firstacquidate, - $dow, $irregularity, $numberpattern, $numberlength, - $weeklength, $monthlength, $add1, $every1, - $whenmorethan1, $setto1, $lastvalue1, $add2, - $every2, $whenmorethan2, $setto2, $lastvalue2, - $add3, $every3, $whenmorethan3, $setto3, - $lastvalue3, $numberingmethod, $status, $callnumber, - $notes, $hemisphere - ) = @_; - my $dbh = C4::Context->dbh; - - #save subscription - my $sth = $dbh->prepare( -"insert into subscription (librarian,aqbooksellerid,cost,aqbudgetid,biblionumber, - startdate,periodicity,firstacquidate,dow,irregularity,numberpattern,numberlength,weeklength,monthlength, - add1,every1,whenmorethan1,setto1,lastvalue1, - add2,every2,whenmorethan2,setto2,lastvalue2, - add3,every3,whenmorethan3,setto3,lastvalue3, - numberingmethod, status, callnumber, notes, hemisphere) values - (?,?,?,?,?,?,?,?,?,?,?, - ?,?,?,?,?,?,?,?,?,?,?, - ?,?,?,?,?,?,?,?,?,?,?,?)" - ); - $sth->execute( - $auser, $aqbooksellerid, - $cost, $aqbudgetid, - $biblionumber, format_date_in_iso($startdate), - $periodicity, format_date_in_iso($firstacquidate), - $dow, $irregularity, - $numberpattern, $numberlength, - $weeklength, $monthlength, - $add1, $every1, - $whenmorethan1, $setto1, - $lastvalue1, $add2, - $every2, $whenmorethan2, - $setto2, $lastvalue2, - $add3, $every3, - $whenmorethan3, $setto3, - $lastvalue3, $numberingmethod, - $status, $callnumber, - $notes, $hemisphere - ); - - #then create the 1st waited number - my $subscriptionid = $dbh->{'mysql_insertid'}; - my $enddate = GetExpirationDate($subscriptionid); - - $sth = - $dbh->prepare( -"insert into subscriptionhistory (biblionumber, subscriptionid, histstartdate, enddate, missinglist, recievedlist, opacnote, librariannote) values (?,?,?,?,?,?,?,?)" - ); - $sth->execute( - $biblionumber, $subscriptionid, - format_date_in_iso($startdate), - format_date_in_iso($enddate), - "", "", "", $notes - ); - - # reread subscription to get a hash (for calculation of the 1st issue number) - $sth = - $dbh->prepare("select * from subscription where subscriptionid = ? "); + my $query = qq| + SELECT count(*) + FROM serial + WHERE subscriptionid=? + |; + my $sth = $dbh->prepare($query); $sth->execute($subscriptionid); - my $val = $sth->fetchrow_hashref; - - # calculate issue number - my $serialseq = GetSeq($val); - $sth = - $dbh->prepare( -"insert into serial (serialseq,subscriptionid,biblionumber,status, planneddate) values (?,?,?,?,?)" - ); - $sth->execute( $serialseq, $subscriptionid, $val->{'biblionumber'}, - 1, format_date_in_iso($startdate) ); - return $subscriptionid; + my ($countreceived) = $sth->fetchrow; + return $countreceived; } -=head2 old_modsubscription +=head2 HasItems =over 4 -($subscriptionid) = &old_modsubscription($auser,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber, - $startdate,$periodicity,$firstacquidate,$dow,$irregularity,$numberpattern,$numberlength,$weeklength,$monthlength, - $add1,$every1,$whenmorethan1,$setto1,$lastvalue1, - $add2,$every2,$whenmorethan2,$setto2,$lastvalue2, - $add3,$every3,$whenmorethan3,$setto3,$lastvalue3, - $numberingmethod, $status, $callnumber, $notes, $hemisphere, $subscriptionid) - -this function is similar to the ModSubscription subroutine but has a few different -values passed in -$firstacquidate - date of first serial issue to arrive -$irregularity - the issues not expected separated by a '|' -- eg. monthly issue but not expecting issue for june and july would have $irregularity of '6|7' -$numberpattern - the number for an array of labels to reconstruct the javascript correctly in the - subscription-add.tmpl file -$callnumber - display the callnumber of the serial -$hemisphere - either 2 = southern hemisphere or 1 = northern hemisphere - used for quarterly serials +$result = &HasItems($subscriptionid) + =back =cut -sub old_modsubscription { - my ( - $auser, $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, - $hemisphere, $subscriptionid - ) = @_; - my $dbh = C4::Context->dbh; - my $sth = $dbh->prepare( -"update subscription set librarian=?, 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=?, hemisphere=? where subscriptionid = ?" - ); - $sth->execute( - $auser, $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, - $hemisphere, $subscriptionid - ); - $sth->finish; - - $sth = - $dbh->prepare("select * from subscription where subscriptionid = ? "); +sub HasItems { + my ($subscriptionid) = @_; + my $dbh = C4::Context->dbh; + my $query = qq| + SELECT COUNT(serialitems.itemnumber) + FROM serial + LEFT JOIN serialitems USING(serialid) + WHERE subscriptionid=? AND serialitems.serialid NOT NULL + |; + my $sth=$dbh->prepare($query); $sth->execute($subscriptionid); - my $val = $sth->fetchrow_hashref; - - # calculate issue number - my $serialseq = Get_Seq($val); - $sth = - $dbh->prepare("UPDATE serial SET serialseq = ? WHERE subscriptionid = ?"); - $sth->execute( $serialseq, $subscriptionid ); - - my $enddate = subscriptionexpirationdate($subscriptionid); - $sth = $dbh->prepare("update subscriptionhistory set enddate=?"); - $sth->execute( format_date_in_iso($enddate) ); + my ($countitems)=$sth->fetchrow; + return $countitems; } -=head2 old_getserials +=head2 abouttoexpire =over 4 -($totalissues,@serials) = &old_getserials($subscriptionid) +$result = &abouttoexpire($subscriptionid) -this function get a hashref of serials and the total count of them +this function alerts you to the penultimate issue for a serial subscription -return : -$totalissues - number of serial lines -the serials into a table. Each line of this table containts a ref to a hash which it containts -serialid, serialseq, status,planneddate,notes,routingnotes from tables : serial where status is not 2, 4, or 5 +returns 1 - if this is the penultimate issue +returns 0 - if not =back =cut -sub old_getserials { +sub abouttoexpire { my ($subscriptionid) = @_; - my $dbh = C4::Context->dbh; - - # status = 2 is "arrived" - my $sth = - $dbh->prepare( -"select serialid,serialseq, status, planneddate,notes,routingnotes from serial where subscriptionid = ? and status <>2 and status <>4 and status <>5" - ); - $sth->execute($subscriptionid); - my @serials; - my $num = 1; - 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->{"num"} = $num; - $num++; - push @serials, $line; + my $dbh = C4::Context->dbh; + my $subscription = GetSubscription($subscriptionid); + 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; } - $sth = $dbh->prepare("select count(*) from serial where subscriptionid=?"); - $sth->execute($subscriptionid); - my ($totalissues) = $sth->fetchrow; - return ( $totalissues, @serials ); } =head2 GetNextDate @@ -2581,14 +2345,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(@) { @@ -2596,113 +2361,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} == 0 ) { - 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 = Day_of_Week( $year,$month, $day ); - 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++; + 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 ); } - @resultdate = Add_Delta_Days($year,$month, $day , 1 ); } + + # 1 week if ( $subscription->{periodicity} == 2 ) { - my ($wkno,$year) = Week_of_Year( $year,$month, $day ); - for ( my $i = 0 ; $i < @irreg ; $i++ ) { - 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); + 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 ); } - @resultdate = Add_Delta_Days( $year,$month, $day, 7); } + + # 1 / 2 weeks if ( $subscription->{periodicity} == 3 ) { - my ($wkno,$year) = Week_of_Year( $year,$month, $day ); - 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); + 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 ); } - @resultdate = Add_Delta_Days($year,$month, $day , 14 ); } + + # 1 / 3 weeks if ( $subscription->{periodicity} == 4 ) { - my ($wkno,$year) = Week_of_Year( $year,$month, $day ); - 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); + 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_Days($year,$month, $day , 21 ); } - my $tmpmonth=$month; - 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); + 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,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); + 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 ); } - @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); + 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 ); } - @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); + 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 ); } - @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} == 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]); -# warn "dateNEXTSEQ : ".$resultdate; + my $resultdate = sprintf( "%04d-%02d-%02d", $resultdate[0], $resultdate[1], $resultdate[2] ); + return "$resultdate"; } @@ -2722,8 +2513,8 @@ sub itemdata { my ($barcode) = @_; my $dbh = C4::Context->dbh; my $sth = $dbh->prepare( - "Select * from items,biblioitems where barcode=? - and items.biblioitemnumber=biblioitems.biblioitemnumber" + "Select * from items LEFT JOIN biblioitems ON items.biblioitemnumber=biblioitems.biblioitemnumber + WHERE barcode=?" ); $sth->execute($barcode); my $data = $sth->fetchrow_hashref; @@ -2731,11 +2522,8 @@ sub itemdata { return ($data); } -END { } # module clean-up code here (global destructor) - 1; - -=back +__END__ =head1 AUTHOR