use C4::Search;
use C4::Letters;
use C4::Log; # logaction
+use C4::Debug;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
&GetLatestSerials &ModSerialStatus &GetNextDate &GetSerials2
&ReNewSubscription &GetLateIssues &GetLateOrMissingIssues
&GetSerialInformation &AddItem2Serial
- &PrepareSerialsData
+ &PrepareSerialsData &GetNextExpected &ModNextExpected
&UpdateClaimdateIssues
&GetSuppliersWithLateIssues &getsupplierbyserialid
- &GetDistributedTo &SetDistributedTo
&getroutinglist &delroutingmember &addroutingmember
&reorder_members
&check_routing &updateClaim &removeMissingIssue
while ( my ( $id, $name ) = $sth->fetchrow ) {
$supplierlist{$id} = $name;
}
- if ( C4::Context->preference("RoutingSerials") ) {
- $supplierlist{''} = "All Suppliers";
- }
return %supplierlist;
}
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'}){
my $rq = $dbh->prepare($query);
$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'};
+ $debug and warn "itemnumber :$itemnum->[0], bibnum :".$data->{'biblionumber'};
my $itemprocessed =
- PrepareItemrecordDisplay( $data->{'biblionumber'}, $itemnum );
- $itemprocessed->{'itemnumber'} = $itemnum;
- $itemprocessed->{'itemid'} = $itemnum;
+ 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'} );
+ PrepareItemrecordDisplay( $data->{'biblionumber'}, '', $data );
$itemprocessed->{'itemid'} = "N$serialid";
$itemprocessed->{'serialid'} = $serialid;
$itemprocessed->{'biblionumber'} = $data->{'biblionumber'};
$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 $rq = $dbh->prepare("INSERT INTO `serialitems` SET serialid=? , itemnumber=?");
+ $rq->execute($serialid, $itemnumber);
return $rq->rows;
}
Update Claimdate for issues in @$serialids list with date $date
(Take Today if none)
+
=back
=cut
my $query = qq(
SELECT subscription.*,
subscriptionhistory.*,
+ subscriptionhistory.enddate as histenddate,
aqbudget.bookfundid,
aqbooksellers.name AS aqbooksellername,
biblio.title AS bibliotitle,
# if (C4::Context->preference('IndependantBranches') &&
# C4::Context->userenv &&
# C4::Context->userenv->{'flags'} != 1){
-# # warn "flags: ".C4::Context->userenv->{'flags'};
+# # $debug and warn "flags: ".C4::Context->userenv->{'flags'};
# $query.=" AND subscription.branchcode IN ('".C4::Context->userenv->{'branch'}."',\"\")";
# }
-# warn "query : $query";
+ $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
IF(serial.publisheddate="00-00-0000",serial.planneddate,serial.publisheddate) DESC,
serial.subscriptionid
|;
-# warn $query;
+ $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({});
}
SELECT subscription.*,
branches.branchname,
subscriptionhistory.*,
+ subscriptionhistory.enddate as histenddate,
aqbudget.bookfundid,
aqbooksellers.name AS aqbooksellername,
biblio.title AS bibliotitle
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/\<br\/\>/g;
$subs->{missinglist} =~ s/\n/\<br\/\>/g;
$subs->{recievedlist} =~ s/\n/\<br\/\>/g;
$subs->{ "status" . $subs->{'status'} } = 1;
$subs->{'cannotedit'}=(C4::Context->preference('IndependantBranches') &&
C4::Context->userenv &&
- C4::Context->userenv->{flags} !=1 &&
+ 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' ) {
|;
my $sth = $dbh->prepare($query);
$sth->execute($biblionumber);
- my $subs= $sth->fetchall_arrayref({});
- return $subs;
+ return $sth->fetchall_arrayref({});
}
=head2 GetSubscriptions
WHERE biblio.biblionumber=?
);
$query.=" ORDER BY title";
-# warn "query :$query";
+ $debug and warn "GetSubscriptions query: $query";
$sth = $dbh->prepare($query);
$sth->execute($biblionumber);
}
LEFT JOIN biblioitems ON biblio.biblionumber = biblioitems.biblionumber
WHERE (biblioitems.issn = ? or|. join('and ',map{"biblio.title LIKE \"%$_%\""}split (" ",$title))." )";
$query.=" ORDER BY title";
+ $debug and warn "GetSubscriptions query: $query";
$sth = $dbh->prepare($query);
$sth->execute( $ISSN );
}
WHERE biblioitems.issn LIKE ?
);
$query.=" ORDER BY title";
-# warn "query :$query";
+ $debug and warn "GetSubscriptions query: $query";
$sth = $dbh->prepare($query);
$sth->execute( "%" . $ISSN . "%" );
}
).($title?" and ":""). join('and ',map{"biblio.title LIKE \"%$_%\""} split (" ",$title) );
$query.=" ORDER BY title";
-# warn $query;
+ $debug and warn "GetSubscriptions query: $query";
$sth = $dbh->prepare($query);
$sth->execute;
}
if ( $previoustitle eq $line->{title} ) {
$line->{title} = "";
$line->{issn} = "";
- $line->{toggle} = 1 if $odd == 1;
}
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} !=1 &&
+ C4::Context->userenv->{flags} % 2 !=1 &&
C4::Context->userenv->{branch} && $line->{branchcode} &&
(C4::Context->userenv->{branch} ne $line->{branchcode}));
push @results, $line;
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
WHERE subscriptionid=$subscription AND status IN ($status)
ORDER BY publisheddate,serialid DESC
|;
-# warn $query;
+ $debug and warn "GetSerials2 query: $query";
my $sth=$dbh->prepare($query);
$sth->execute;
my @serials;
FROM serial
WHERE subscriptionid = ?
AND (status =2 or status=4)
- ORDER BY planneddate DESC LIMIT 0,$limit
+ ORDER BY publisheddate DESC LIMIT 0,$limit
";
my $sth = $dbh->prepare($strsth);
$sth->execute($subscriptionid);
return \@serials;
}
-=head2 GetDistributedTo
-
-=over 4
-
-$distributedto=GetDistributedTo($subscriptionid)
-This function select the old previous value of distributedto in the database.
-
-=back
-
-=cut
-
-sub GetDistributedTo {
- my $dbh = C4::Context->dbh;
- my $distributedto;
- my $subscriptionid = @_;
- my $query = "SELECT distributedto FROM subscription WHERE subscriptionid=?";
- my $sth = $dbh->prepare($query);
- $sth->execute($subscriptionid);
- return ($distributedto) = $sth->fetchrow;
-}
-
=head2 GetNextSeq
=over 4
WHERE subscriptionid=?
";
my $sth = $dbh->prepare($query);
- $recievedlist =~ s/^,//g;
- $missinglist =~ s/^,//g;
- $opacnote =~ s/^,//g;
+ $recievedlist =~ s/^; //;
+ $missinglist =~ s/^; //;
+ $opacnote =~ s/^; //;
$sth->execute(
$histstartdate, $enddate, $recievedlist, $missinglist,
$opacnote, $librariannote, $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"
+ $missinglist .= "; $serialseq"
if ( $status eq 4
and not index( "$missinglist", "$serialseq" ) >= 0 );
- $missinglist .= ",not issued $serialseq"
+ $missinglist .= "; not issued $serialseq"
if ( $status eq 5
and index( "$missinglist", "$serialseq" ) >= 0 );
$query =
"UPDATE subscriptionhistory SET recievedlist=?, missinglist=? WHERE subscriptionid=?";
$sth = $dbh->prepare($query);
+ $recievedlist =~ s/^; //;
+ $missinglist =~ s/^; //;
$sth->execute( $recievedlist, $missinglist, $subscriptionid );
}
}
}
}
+=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
$whenmorethan3, $setto3, $lastvalue3, $innerloop3,
$numberingmethod, $status, $biblionumber, $callnumber,
$notes, $letter, $hemisphere, $manualhistory,
- $internalnotes,
- $subscriptionid
+ $internalnotes, $serialsadditems,$subscriptionid,
+ $staffdisplaycount,$opacdisplaycount, $graceperiod, $location
) = @_;
# warn $irregularity;
my $dbh = C4::Context->dbh;
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 = ?
WHERE subscriptionid = ?";
-# warn "query :".$query;
+ #warn "query :".$query;
my $sth = $dbh->prepare($query);
$sth->execute(
$auser, $branchcode, $aqbooksellerid, $cost,
$whenmorethan3, $setto3, $lastvalue3, $innerloop3,
$numberingmethod, $status, $biblionumber, $callnumber,
$notes, $letter, $hemisphere, ($manualhistory?$manualhistory:0),
- $internalnotes,
+ $internalnotes, $serialsadditems,
+ $staffdisplaycount, $opacdisplaycount, $graceperiod, $location,
$subscriptionid
);
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;
}
$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);
Create a new subscription with value given on input args.
$lastvalue3, $innerloop3, $numberingmethod, $status,
$notes, $letter, $firstacquidate, $irregularity,
$numberpattern, $callnumber, $hemisphere, $manualhistory,
- $internalnotes
+ $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount,
+ $graceperiod, $location
) = @_;
my $dbh = C4::Context->dbh;
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)
+ VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
|;
my $sth = $dbh->prepare($query);
$sth->execute(
format_date_in_iso($firstacquidate), $irregularity,
$numberpattern, $callnumber,
$hemisphere, $manualhistory,
- $internalnotes
+ $internalnotes, $serialsadditems,
+ $staffdisplaycount, $opacdisplaycount,
+ $graceperiod, $location,
);
#then create the 1st waited number
$query = qq(
INSERT INTO subscriptionhistory
(biblionumber, subscriptionid, histstartdate, opacnote, librariannote)
- VALUES (?,?,?,?,?,?,?,?)
+ VALUES (?,?,?,?,?)
);
$sth = $dbh->prepare($query);
$sth->execute( $biblionumber, $subscriptionid,
$sth = $dbh->prepare($query);
$sth->execute(
"$serialseq", $subscriptionid, $biblionumber, 1,
- format_date_in_iso($startdate),
- format_date_in_iso($startdate)
+ format_date_in_iso($firstacquidate),
+ format_date_in_iso($firstacquidate)
);
- &logaction(C4::Context->userenv->{'number'},"SERIAL","ADD",$subscriptionid,"")
- if C4::Context->preference("SubscriptionLog");
+ 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;
}
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}
- );
+ if (C4::Context->preference("RenewSerialAddsSuggestion")){
+ NewSuggestion(
+ $user, $subscription->{bibliotitle},
+ $biblio->{author}, $biblio->{publishercode},
+ $biblio->{note}, '',
+ '', '',
+ '', '',
+ $subscription->{biblionumber}
+ );
+ }
# renew subscription
$query = qq|
$sth->execute( format_date_in_iso($startdate),
$numberlength, $weeklength, $monthlength, $subscriptionid );
- &logaction(C4::Context->userenv->{'number'},"SERIAL","RENEW",$subscriptionid,"")
- if C4::Context->preference("SubscriptionLog");
+ logaction("SERIAL", "RENEW", $subscriptionid, "") if C4::Context->preference("SubscriptionLog");
}
=head2 NewIssue
### 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);
+ $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
WHERE subscriptionid=?
|;
$sth = $dbh->prepare($query);
+ $recievedlist =~ s/^; //;
+ $missinglist =~ s/^; //;
$sth->execute( $recievedlist, $missinglist, $subscriptionid );
return $serialid;
}
=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
my $sth = $dbh->prepare($query);
$sth->execute($subscriptionid);
my ($res) = $sth->fetchrow ;
+ return 0 unless $res;
my @res=split (/-/,$res);
-# warn "date expiration :$expirationdate";
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));
} else {
if ($subscription->{'numberlength'}){
my $countreceived=countissuesfrom($subscriptionid,$subscription->{'startdate'});
- return 1 if ($countreceived >$subscription->{'numberlentgh'});
+ return 1 if ($countreceived >$subscription->{'numberlength'});
return 0;
} else {
return 0;
}
}
- return 0;
-}
-
-=head2 SetDistributedto
-
-=over 4
-
-SetDistributedto($distributedto,$subscriptionid);
-This function update the value of distributedto for a subscription given on input arg.
-
-=back
-
-=cut
-
-sub SetDistributedto {
- my ( $distributedto, $subscriptionid ) = @_;
- my $dbh = C4::Context->dbh;
- my $query = qq|
- UPDATE subscription
- SET distributedto=?
- WHERE subscriptionid=?
- |;
- my $sth = $dbh->prepare($query);
- $sth->execute( $distributedto, $subscriptionid );
+ return 0; # Notice that you'll never get here.
}
=head2 DelSubscription
"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
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
$sth->execute($subscriptionid);
my ($res) = $sth->fetchrow ;
# warn "date expiration : ".$expirationdate." date courante ".$res;
- my @res=split /-/,$res;
+ my @res=split (/-/,$res);
@res=Date::Calc::Today if ($res[0]*$res[1]==0);
- my @endofsubscriptiondate=split/-/,$expirationdate;
+ my @endofsubscriptiondate=split(/-/,$expirationdate);
my $x;
if ( $per == 1 ) {$x=7;}
if ( $per == 2 ) {$x=7; }
my @resultdate;
# warn "DOW $dayofweek";
- if ( $subscription->{periodicity} % 16 == 0 ) {
+ if ( $subscription->{periodicity} % 16 == 0 ) { # 'without regularity' || 'irregular'
return 0;
}
- if ( $subscription->{periodicity} == 1 ) {
+ # daily : n / week
+ # Since we're interpreting irregularity here as which days of the week to skip an issue,
+ # renaming this pattern from 1/day to " n / week ".
+ if ( $subscription->{periodicity} == 1 ) {
my $dayofweek = eval{Day_of_Week( $year,$month, $day )};
if ($@){warn "year month day : $year $month $day $subscription->{subscriptionid} : $@";}
else {
@resultdate = Add_Delta_Days($year,$month, $day , 1 );
}
}
+ # 1 week
if ( $subscription->{periodicity} == 2 ) {
my ($wkno,$year) = eval {Week_of_Year( $year,$month, $day )};
if ($@){warn "year month day : $year $month $day $subscription->{subscriptionid} : $@";}
else {
for ( my $i = 0 ; $i < @irreg ; $i++ ) {
+ #FIXME: if two consecutive irreg, do we only skip one?
if ( $irreg[$i] == (($wkno!=51)?($wkno +1) % 52 :52)) {
($year,$month,$day) = Add_Delta_Days($year,$month, $day , 7 );
$wkno=(($wkno!=51)?($wkno +1) % 52 :52);
@resultdate = Add_Delta_Days( $year,$month, $day, 7);
}
}
+ # 1 / 2 weeks
if ( $subscription->{periodicity} == 3 ) {
my ($wkno,$year) = eval {Week_of_Year( $year,$month, $day )};
if ($@){warn "year month day : $year $month $day $subscription->{subscriptionid} : $@";}
@resultdate = Add_Delta_Days($year,$month, $day , 14 );
}
}
+ # 1 / 3 weeks
if ( $subscription->{periodicity} == 4 ) {
my ($wkno,$year) = eval {Week_of_Year( $year,$month, $day )};
if ($@){warn "année mois jour : $year $month $day $subscription->{subscriptionid} : $@";}
1;
__END__
-=back
-
=head1 AUTHOR
Koha Developement team <info@koha.org>
projects / koha.git / blobdiff