use strict;
-use C4::Date;
+use C4::Dates qw(format_date format_date_in_iso);
use Date::Calc qw(:all);
use POSIX qw(strftime);
use C4::Suggestions;
use C4::Koha;
use C4::Biblio;
+use C4::Items;
use C4::Search;
use C4::Letters;
use C4::Log; # logaction
-require Exporter;
-
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 );
-};
-
-=head1 NAME
-
-C4::Serials - Give functions for serializing.
-
-=head1 SYNOPSIS
-
- use C4::Serials;
-
-=head1 DESCRIPTION
-
-Give all XYZ functions
-
-=head1 FUNCTIONS
-
-=cut
-
-@ISA = qw(Exporter);
-@EXPORT = qw(
-
+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
&check_routing &updateClaim &removeMissingIssue
&old_newsubscription &old_modsubscription &old_getserials
-);
+ );
+}
=head2 GetSuppliersWithLateIssues
+=head1 NAME
+
+C4::Serials - Give functions for serializing.
+
+=head1 SYNOPSIS
+
+ use C4::Serials;
+
+=head1 DESCRIPTION
+
+Give all XYZ functions
+
+=head1 FUNCTIONS
+
=over 4
%supplierlist = &GetSuppliersWithLateIssues
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 = ?
|;
return $data;
}
-=head2 GetSerialInformation
+=head2 AddItem2Serial
=over 4
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
# # warn "flags: ".C4::Context->userenv->{'flags'};
# $query.=" AND subscription.branchcode IN ('".C4::Context->userenv->{'branch'}."',\"\")";
# }
-# warn "query : $query";
+# warn "query : $query";
my $sth = $dbh->prepare($query);
# warn "subsid :$subscriptionid";
$sth->execute($subscriptionid);
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)
+ (serial.subscriptionid=subscription.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 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
|;
+# warn $query;
my $sth = $dbh->prepare($query);
$sth->execute($subscriptionid);
my $subs = $sth->fetchall_arrayref({});
'bibliotitle' => $subs->{'bibliotitle'},
'serials' => [$subs],
'first' => $first,
- 'branchcode' => $subs->{'branchcode'},
- 'subscriptionid' => $subs->{'subscriptionid'},
+# 'branchcode' => $subs->{'branchcode'},
+# 'subscriptionid' => $subs->{'subscriptionid'},
};
}
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'}."',\"\")";
- }
+# 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;
$subs->{ "periodicity" . $subs->{periodicity} } = 1;
$subs->{ "numberpattern" . $subs->{numberpattern} } = 1;
$subs->{ "status" . $subs->{'status'} } = 1;
+ $subs->{'cannotedit'}=(C4::Context->preference('IndependantBranches') &&
+ C4::Context->userenv &&
+ C4::Context->userenv->{flags} !=1 &&
+ C4::Context->userenv->{branch} && $subs->{branchcode} &&
+ (C4::Context->userenv->{branch} ne $subs->{branchcode}));
if ( $subs->{enddate} eq '0000-00-00' ) {
$subs->{enddate} = '';
}
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)
+ (serial.subscriptionid=subscription.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.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
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);
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'}."',\"''\")";
- }
+ 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))." )";
$query.=" ORDER BY title";
$sth = $dbh->prepare($query);
$sth->execute( $ISSN );
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 ?
+ 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);
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) );
+ 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";
+# warn $query;
$sth = $dbh->prepare($query);
$sth->execute;
}
$odd = -$odd;
$line->{toggle} = 1 if $odd == 1;
}
+ $line->{'cannotedit'}=(C4::Context->preference('IndependantBranches') &&
+ C4::Context->userenv &&
+ C4::Context->userenv->{flags} !=1 &&
+ C4::Context->userenv->{branch} && $line->{branchcode} &&
+ (C4::Context->userenv->{branch} ne $line->{branchcode}));
push @results, $line;
}
return @results;
$count=5 unless ($count);
my @serials;
my $query =
- "SELECT serialid,serialseq, status, publisheddate, planneddate,notes
+ "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";
}
# OK, now add the last 5 issues arrives/missing
$query =
- "SELECT serialid,serialseq, status, planneddate, publisheddate,notes
+ "SELECT serialid,serialseq, status, planneddate, publisheddate,notes, routingnotes
FROM serial
WHERE subscriptionid = ?
AND (status in (2,4,5))
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
$newlastvalue1 = $val->{lastvalue1};
$newlastvalue2 = $val->{lastvalue2};
$newlastvalue3 = $val->{lastvalue3};
-
$newlastvalue1 = $val->{lastvalue1};
# check if we have to increase the new value.
- $newinnerloop1 = $val->{innerloop1}+1;
+ $newinnerloop1 = $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.
$newlastvalue2 = $val->{lastvalue2};
# check if we have to increase the new value.
- $newinnerloop2 = $val->{innerloop2}+1;
+ $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.
$newlastvalue3 = $val->{lastvalue3};
# check if we have to increase the new value.
- $newinnerloop3 = $val->{innerloop3}+1;
+ $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.
my $enddate = $subscription->{startdate};
# we don't do the same test if the subscription is based on X numbers or on X weeks/months
- if ($subscription->{periodicity}){
+ if (($subscription->{periodicity} % 16) >0){
if ( $subscription->{numberlength} ) {
#calculate the date of the last issue.
my $length = $subscription->{numberlength};
$lastvalue3, $innerloop3,
$numberingmethod, "$status",
$notes, $letter,
- $firstacquidate, $irregularity,
+ format_date_in_iso($firstacquidate), $irregularity,
$numberpattern, $callnumber,
$hemisphere, $manualhistory,
$internalnotes
my $subscriptionid = $dbh->{'mysql_insertid'};
$query = qq(
INSERT INTO subscriptionhistory
- (biblionumber, subscriptionid, histstartdate, enddate, missinglist, recievedlist, opacnote, librariannote)
+ (biblionumber, subscriptionid, histstartdate, opacnote, librariannote)
VALUES (?,?,?,?,?,?,?,?)
);
$sth = $dbh->prepare($query);
$sth->execute( $biblionumber, $subscriptionid,
format_date_in_iso($startdate),
- 0, "", "", "", "$notes" );
+ $notes,$internalnotes );
# reread subscription to get a hash (for calculation of the 1st issue number)
$query = qq(
&logaction(C4::Context->userenv->{'number'},"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) {
+ $record->field($tag)->update( $subf => 1 );
+ }
+ ModBiblio($record,$biblionumber,$bib->{'frameworkcode'});
+ }
return $subscriptionid;
}
);
# renew subscription
- my $query = qq|
+ $query = qq|
UPDATE subscription
SET startdate=?,numberlength=?,weeklength=?,monthlength=?
WHERE subscriptionid=?
|;
- my $sth = $dbh->prepare($query);
+ $sth = $dbh->prepare($query);
$sth->execute( format_date_in_iso($startdate),
$numberlength, $weeklength, $monthlength, $subscriptionid );
$marcrecord->insert_fields_ordered($newField);
}
}
- AddItem( $marcrecord, $data->{'biblionumber'} );
+ AddItemFromMarc( $marcrecord, $data->{'biblionumber'} );
return 1;
}
return ( 0, @errors );
my ($subscriptionid) = @_;
my $dbh = C4::Context->dbh;
my $subscription = GetSubscription($subscriptionid);
- if ($subscription->{periodicity}>0){
+ if (($subscription->{periodicity} % 16)>0){
my $expirationdate = GetExpirationDate($subscriptionid);
my $query = qq|
SELECT max(planneddate)
claimdate
FROM serial
LEFT JOIN subscription ON serial.subscriptionid=subscription.subscriptionid
-LEFT JOIN biblio ON serial.biblionumber=biblio.biblionumber
+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))
LEFT JOIN subscription
ON serial.subscriptionid=subscription.subscriptionid
LEFT JOIN biblio
-ON serial.biblionumber=biblio.biblionumber
+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))
-AND biblio.biblionumber = subscription.biblionumber
$byserial
ORDER BY $order"
);
my $dbh = C4::Context->dbh;
my $subscription = GetSubscription($subscriptionid);
my $per = $subscription->{'periodicity'};
- if ($per>0){
+ if ($per % 16>0){
my $expirationdate = GetExpirationDate($subscriptionid);
my $sth =
$dbh->prepare(
my @res=split /-/,$res;
@res=Date::Calc::Today if ($res[0]*$res[1]==0);
my @endofsubscriptiondate=split/-/,$expirationdate;
- my $per = $subscription->{'periodicity'};
my $x;
if ( $per == 1 ) {$x=7;}
if ( $per == 2 ) {$x=7; }
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);
+ - (3 * $x)) if (@endofsubscriptiondate && $endofsubscriptiondate[0]*$endofsubscriptiondate[1]*$endofsubscriptiondate[2]);
# warn "DATE BEFORE END: $datebeforeend";
return 1 if ( @res &&
(@datebeforeend &&
(@endofsubscriptiondate &&
Delta_Days($res[0],$res[1],$res[2],
$endofsubscriptiondate[0],$endofsubscriptiondate[1],$endofsubscriptiondate[2]) >= 0) );
- return 0;
+ return 0;
} elsif ($subscription->{numberlength}>0) {
return (countissuesfrom($subscriptionid,$subscription->{'startdate'}) >=$subscription->{numberlength}-1);
} else {return 0}
my @resultdate;
# warn "DOW $dayofweek";
- if ( $subscription->{periodicity} == 0 ) {
+ if ( $subscription->{periodicity} % 16 == 0 ) {
return 0;
}
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++;
- }
- }
- @resultdate = Add_Delta_Days($year,$month, $day , 1 );
+ my $dayofweek = eval{Day_of_Week( $year,$month, $day )};
+ if ($@){warn "year month day : $year $month $day $subscription->{subscriptionid} : $@";}
+ else {
+ for ( my $i = 0 ; $i < @irreg ; $i++ ) {
+ $dayofweek = 0 if ( $dayofweek == 7 );
+ if ( in_array( ($dayofweek + 1), @irreg ) ) {
+ ($year,$month,$day) = Add_Delta_Days($year,$month, $day , 1 );
+ $dayofweek++;
+ }
+ }
+ @resultdate = Add_Delta_Days($year,$month, $day , 1 );
+ }
}
if ( $subscription->{periodicity} == 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);
- }
- }
- @resultdate = Add_Delta_Days( $year,$month, $day, 7);
+ my ($wkno,$year) = eval {Week_of_Year( $year,$month, $day )};
+ if ($@){warn "year month day : $year $month $day $subscription->{subscriptionid} : $@";}
+ else {
+ for ( my $i = 0 ; $i < @irreg ; $i++ ) {
+ 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);
+ }
}
- 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);
- }
- }
- @resultdate = Add_Delta_Days($year,$month, $day , 14 );
+ if ( $subscription->{periodicity} == 3 ) {
+ my ($wkno,$year) = eval {Week_of_Year( $year,$month, $day )};
+ if ($@){warn "year month day : $year $month $day $subscription->{subscriptionid} : $@";}
+ else {
+ for ( my $i = 0 ; $i < @irreg ; $i++ ) {
+ if ( $irreg[$i] == (($wkno!=50)?($wkno +2) % 52 :52)) {
+ ### BUGFIX was previously +1 ^
+ ($year,$month,$day) = Add_Delta_Days($year,$month, $day , 14 );
+ $wkno=(($wkno!=50)?($wkno +2) % 52 :52);
+ }
+ }
+ @resultdate = Add_Delta_Days($year,$month, $day , 14 );
+ }
}
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);
- }
- }
- @resultdate = Add_Delta_Days($year,$month, $day , 21 );
+ my ($wkno,$year) = eval {Week_of_Year( $year,$month, $day )};
+ if ($@){warn "année mois jour : $year $month $day $subscription->{subscriptionid} : $@";}
+ else {
+ for ( my $i = 0 ; $i < @irreg ; $i++ ) {
+ if ( $irreg[$i] == (($wkno!=49)?($wkno +3) % 52 :52)) {
+ ($year,$month,$day) = Add_Delta_Days($year,$month, $day , 21 );
+ $wkno=(($wkno!=49)?($wkno +3) % 52 :52);
+ }
+ }
+ @resultdate = Add_Delta_Days($year,$month, $day , 21 );
+ }
}
my $tmpmonth=$month;
+ if ($year && $month && $day){
if ( $subscription->{periodicity} == 5 ) {
- for ( my $i = 0 ; $i < @irreg ; $i++ ) {
- if ( $irreg[$i] == (($tmpmonth!=11)?($tmpmonth +1) % 12 :12)) {
- ($year,$month,$day) = Add_Delta_YMD($year,$month, $day ,0,1,0 );
- $tmpmonth=(($tmpmonth!=11)?($tmpmonth +1) % 12 :12);
- }
- }
- @resultdate = Add_Delta_YMD($year,$month, $day ,0,1,0 );
+ for ( my $i = 0 ; $i < @irreg ; $i++ ) {
+ if ( $irreg[$i] == (($tmpmonth!=11)?($tmpmonth +1) % 12 :12)) {
+ ($year,$month,$day) = Add_Delta_YMD($year,$month, $day ,0,1,0 );
+ $tmpmonth=(($tmpmonth!=11)?($tmpmonth +1) % 12 :12);
+ }
+ }
+ @resultdate = Add_Delta_YMD($year,$month, $day ,0,1,0 );
}
if ( $subscription->{periodicity} == 6 ) {
- for ( my $i = 0 ; $i < @irreg ; $i++ ) {
- if ( $irreg[$i] == (($tmpmonth!=10)?($tmpmonth +2) % 12 :12)) {
- ($year,$month,$day) = Add_Delta_YMD($year,$month, $day ,0,2,0 );
- $tmpmonth=(($tmpmonth!=10)?($tmpmonth + 2) % 12 :12);
- }
- }
- @resultdate = Add_Delta_YMD($year,$month, $day, 0, 2,0 );
+ for ( my $i = 0 ; $i < @irreg ; $i++ ) {
+ if ( $irreg[$i] == (($tmpmonth!=10)?($tmpmonth +2) % 12 :12)) {
+ ($year,$month,$day) = Add_Delta_YMD($year,$month, $day ,0,2,0 );
+ $tmpmonth=(($tmpmonth!=10)?($tmpmonth + 2) % 12 :12);
+ }
+ }
+ @resultdate = Add_Delta_YMD($year,$month, $day, 0, 2,0 );
}
if ( $subscription->{periodicity} == 7 ) {
for ( my $i = 0 ; $i < @irreg ; $i++ ) {
if ( $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;
return "$resultdate";
}
return ($data);
}
-END { } # module clean-up code here (global destructor)
-
1;
+__END__
=back
projects / koha_gimpoz / blobdiff