X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=serials%2Fserials-collection.pl;h=ba97163f55b491e08084b292b592dec2a5119574;hb=c9dd8b8bc3d07d1f4fc132759758f337e3d23196;hp=8c7c32bfa2566b516ccd454b893e5286c6d39dc6;hpb=f098258e8cf2d616c6bbc35e44c6a1df47be8517;p=koha_fer
diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl
index 8c7c32bfa2..ba97163f55 100755
--- a/serials/serials-collection.pl
+++ b/serials/serials-collection.pl
@@ -34,15 +34,15 @@ use List::MoreUtils qw/uniq/;
my $query = new CGI;
my $op = $query->param('op') || q{};
+my $nbissues=$query->param('nbissues');
my $dbh = C4::Context->dbh;
-my ($template, $loggedinuser, $cookie);
-($template, $loggedinuser, $cookie)
+my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "serials/serials-collection.tmpl",
query => $query,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {serials => 'receive_serials'},
+ flagsrequired => {serials => '*'},
debug => 1,
});
my $biblionumber = $query->param('biblionumber');
@@ -55,56 +55,62 @@ my $subscriptions;
if($op eq 'gennext' && @subscriptionid){
my $subscriptionid = $subscriptionid[0];
- my $subscription = GetSubscription($subscriptionid);
-
- my $sth = $dbh->prepare("SELECT publisheddate, serialid, serialseq, planneddate
+ my $sth = $dbh->prepare("SELECT publisheddate, serialid, serialseq, planneddate
FROM serial WHERE status = 1 AND subscriptionid = ?");
- $sth->execute($subscriptionid);
-
- # modify actual expected issue, to generate the next
- if ( my $issue = $sth->fetchrow_hashref ) {
- ModSerialStatus( $issue->{serialid}, $issue->{serialseq},
- $issue->{planneddate}, $issue->{publisheddate},
- 3, "" );
- }else{
- my $expected = GetNextExpected($subscriptionid);
- my (
- $newserialseq, $newlastvalue1, $newlastvalue2, $newlastvalue3,
- $newinnerloop1, $newinnerloop2, $newinnerloop3
- ) = GetNextSeq($subscription);
-
- ## We generate the next publication date
- my $nextpublisheddate = GetNextDate( $expected->{planneddate}->output('iso'), $subscription );
- ## Creating the new issue
- NewIssue( $newserialseq, $subscriptionid, $subscription->{'biblionumber'},
- 1, $nextpublisheddate, $nextpublisheddate );
-
- ## Updating the subscription seq status
- my $squery = "UPDATE subscription SET lastvalue1=?, lastvalue2=?, lastvalue3=?, innerloop1=?, innerloop2=?, innerloop3=?
- WHERE subscriptionid = ?";
- $sth = $dbh->prepare($squery);
- $sth->execute(
- $newlastvalue1, $newlastvalue2, $newlastvalue3, $newinnerloop1,
- $newinnerloop2, $newinnerloop3, $subscriptionid
- );
-
- }
-
+ my $status = defined( $nbissues ) ? 2 : 3;
+ $nbissues ||= 1;
+ for ( my $i = 0; $i < $nbissues; $i++ ){
+ $sth->execute($subscriptionid);
+ # modify actual expected issue, to generate the next
+ if ( my $issue = $sth->fetchrow_hashref ) {
+ ModSerialStatus( $issue->{serialid}, $issue->{serialseq},
+ $issue->{planneddate}, $issue->{publisheddate},
+ $status, "" );
+ } else {
+ require C4::Serials::Numberpattern;
+ my $subscription = GetSubscription($subscriptionid);
+ my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscription->{numberpattern});
+ my $expected = GetNextExpected($subscriptionid);
+ my (
+ $newserialseq, $newlastvalue1, $newlastvalue2, $newlastvalue3,
+ $newinnerloop1, $newinnerloop2, $newinnerloop3
+ ) = GetNextSeq($subscription, $pattern, $expected->{publisheddate});
+
+ ## We generate the next publication date
+ my $nextpublisheddate = GetNextDate($subscription, $expected->{publisheddate}, 1);
+ ## Creating the new issue
+ NewIssue( $newserialseq, $subscriptionid, $subscription->{'biblionumber'},
+ 1, $nextpublisheddate, $nextpublisheddate );
+
+ ## Updating the subscription seq status
+ my $squery = "UPDATE subscription SET lastvalue1=?, lastvalue2=?, lastvalue3=?, innerloop1=?, innerloop2=?, innerloop3=?
+ WHERE subscriptionid = ?";
+ my $seqsth = $dbh->prepare($squery);
+ $seqsth->execute(
+ $newlastvalue1, $newlastvalue2, $newlastvalue3, $newinnerloop1,
+ $newinnerloop2, $newinnerloop3, $subscriptionid
+ );
+
+ }
+ last if $nbissues == 1;
+ last if HasSubscriptionExpired($subscriptionid) > 0;
+ }
print $query->redirect('/cgi-bin/koha/serials/serials-collection.pl?subscriptionid='.$subscriptionid);
}
+my $subscriptioncount;
my ($location, $callnumber);
if (@subscriptionid){
my @subscriptioninformation=();
+ my $closed = 0;
foreach my $subscriptionid (@subscriptionid){
my $subs= GetSubscription($subscriptionid);
+ $closed = 1 if $subs->{closed};
+
$subs->{opacnote} =~ s/\n/\
/g;
$subs->{missinglist} =~ s/\n/\
/g;
$subs->{recievedlist} =~ s/\n/\
/g;
##these are display information
- $subs->{ "periodicity" . $subs->{periodicity} } = 1;
- $subs->{ "numberpattern" . $subs->{numberpattern} } = 1;
- $subs->{ "status" . $subs->{'status'} } = 1;
$subs->{startdate} = format_date( $subs->{startdate} );
$subs->{histstartdate} = format_date( $subs->{histstartdate} );
if ( !defined $subs->{enddate} || $subs->{enddate} eq '0000-00-00' ) {
@@ -118,11 +124,18 @@ if (@subscriptionid){
$subs->{'subscriptionid'} = $subscriptionid; # FIXME - why was this lost ?
$location = GetAuthorisedValues('LOC', $subs->{'location'});
$callnumber = $subs->{callnumber};
+ my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subs->{periodicity});
+ my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subs->{numberpattern});
+ $subs->{frequency} = $frequency;
+ $subs->{numberpattern} = $numberpattern;
+ $subs->{'hasRouting'} = check_routing($subscriptionid);
push @$subscriptiondescs,$subs;
my $tmpsubscription= GetFullSubscription($subscriptionid);
@subscriptioninformation=(@$tmpsubscription,@subscriptioninformation);
}
+ $template->param(closed => $closed);
$subscriptions=PrepareSerialsData(\@subscriptioninformation);
+ $subscriptioncount = CountSubscriptionFromBiblionumber($subscriptiondescs->[0]{'biblionumber'});
} else {
$subscriptiondescs = GetSubscriptionsFromBiblionumber($biblionumber) ;
my $subscriptioninformation = GetFullSubscriptionsFromBiblionumber($biblionumber);
@@ -145,9 +158,9 @@ foreach (@$location) {
$locationlib = $_->{'lib'} if $_->{'selected'};
}
+
chop $subscriptionidlist;
$template->param(
- onesubscription => (scalar(@$subscriptiondescs)==1),
subscriptionidlist => $subscriptionidlist,
biblionumber => $biblionumber,
subscriptions => $subscriptiondescs,
@@ -157,9 +170,13 @@ $template->param(
bibliotitle => $title,
suggestion => C4::Context->preference("suggestion"),
virtualshelves => C4::Context->preference("virtualshelves"),
+ routing => C4::Context->preference("RoutingSerials"),
subscr=>$query->param('subscriptionid'),
- location => $locationlib,
- callnumber => $callnumber,
+ subscriptioncount => $subscriptioncount,
+ location => $locationlib,
+ callnumber => $callnumber,
+ uc(C4::Context->preference("marcflavour")) => 1,
+ serialsadditems => $subscriptiondescs->[0]{'serialsadditems'},
);
output_html_with_http_headers $query, $cookie, $template->output;