X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;ds=sidebyside;f=serials%2Fserials-collection.pl;h=ad57e0755b26dddcb76fda608914bb026c16a58f;hb=5c52ab34d01471a6e8f88f22c8c53e2f91863bc2;hp=10e18e056642292615ff715e80a273ea921cad10;hpb=a904a9bac745c696d998c28b8eb82961ddde9207;p=srvgit
diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl
index 10e18e0566..ad57e0755b 100755
--- a/serials/serials-collection.pl
+++ b/serials/serials-collection.pl
@@ -34,6 +34,7 @@ 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);
@@ -42,31 +43,33 @@ my ($template, $loggedinuser, $cookie);
query => $query,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {serials => 'receive_serials'},
+ flagsrequired => {serials => '*'},
debug => 1,
});
my $biblionumber = $query->param('biblionumber');
my @subscriptionid = $query->param('subscriptionid');
@subscriptionid= uniq @subscriptionid;
+@subscriptionid= sort @subscriptionid;
my $subscriptiondescs;
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 = ?");
+ 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},
- 3, "" );
+ $status, "" );
}else{
- my $expected = GetNextExpected($subscriptionid);
+ my $subscription = GetSubscription($subscriptionid);
+ my $expected = GetNextExpected($subscriptionid);
my (
$newserialseq, $newlastvalue1, $newlastvalue2, $newlastvalue3,
$newinnerloop1, $newinnerloop2, $newinnerloop3
@@ -81,22 +84,27 @@ if($op eq 'gennext' && @subscriptionid){
## Updating the subscription seq status
my $squery = "UPDATE subscription SET lastvalue1=?, lastvalue2=?, lastvalue3=?, innerloop1=?, innerloop2=?, innerloop3=?
WHERE subscriptionid = ?";
- $sth = $dbh->prepare($squery);
- $sth->execute(
+ 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;
@@ -121,7 +129,9 @@ if (@subscriptionid){
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);
@@ -146,7 +156,6 @@ foreach (@$location) {
chop $subscriptionidlist;
$template->param(
- onesubscription => (scalar(@$subscriptiondescs)==1),
subscriptionidlist => $subscriptionidlist,
biblionumber => $biblionumber,
subscriptions => $subscriptiondescs,
@@ -156,9 +165,14 @@ $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'},
+ dateformatmetric => C4::Context->preference("dateformat") eq "metric" ? 1 : 0,
);
output_html_with_http_headers $query, $cookie, $template->output;