X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=serials%2Fserials-collection.pl;h=ad8317efac7ef72733eec5c731a48376eb481adc;hb=b859739c2a6dc899176276022782ac3af7a0ad0c;hp=8c7c32bfa2566b516ccd454b893e5286c6d39dc6;hpb=b5ee2f201bed91a38ff2c1c527cbf19adc76fabc;p=koha.git diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl index 8c7c32bfa2..ad8317efac 100755 --- a/serials/serials-collection.pl +++ b/serials/serials-collection.pl @@ -5,44 +5,44 @@ # # This file is part of Koha. # -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along -# with Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . use strict; use warnings; -use CGI; +use CGI qw ( -utf8 ); use C4::Auth; use C4::Koha; -use C4::Dates qw/format_date/; use C4::Serials; use C4::Letters; use C4::Output; use C4::Context; + 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) - = get_template_and_user({template_name => "serials/serials-collection.tmpl", +my ($template, $loggedinuser, $cookie) + = get_template_and_user({template_name => "serials/serials-collection.tt", query => $query, type => "intranet", authnotrequired => 0, - flagsrequired => {serials => 'receive_serials'}, + flagsrequired => {serials => '*'}, debug => 1, }); my $biblionumber = $query->param('biblionumber'); @@ -55,74 +55,84 @@ my $subscriptions; if($op eq 'gennext' && @subscriptionid){ my $subscriptionid = $subscriptionid[0]; - my $subscription = GetSubscription($subscriptionid); - - 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 $sth = $dbh->prepare(" + SELECT publisheddate, publisheddatetext, 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}, + $issue->{publisheddatetext}, $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' ) { - $subs->{enddate} = ''; - } - else { - $subs->{enddate} = format_date( $subs->{enddate} ); - } $subs->{'abouttoexpire'}=abouttoexpire($subs->{'subscriptionid'}); $subs->{'subscriptionexpired'}=HasSubscriptionExpired($subs->{'subscriptionid'}); $subs->{'subscriptionid'} = $subscriptionid; # FIXME - why was this lost ? - $location = GetAuthorisedValues('LOC', $subs->{'location'}); + $location = $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); @@ -138,16 +148,8 @@ foreach my $subscription (@$subscriptiondescs){ $biblionumber = $subscription->{'bibnum'} unless ($biblionumber); } -# warn "title : $title yearmax : $yearmax nombre d'elements dans le tableau :".scalar(@$subscriptions); -# use Data::Dumper; warn Dumper($subscriptions); -my $locationlib; -foreach (@$location) { - $locationlib = $_->{'lib'} if $_->{'selected'}; -} - chop $subscriptionidlist; $template->param( - onesubscription => (scalar(@$subscriptiondescs)==1), subscriptionidlist => $subscriptionidlist, biblionumber => $biblionumber, subscriptions => $subscriptiondescs, @@ -157,9 +159,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 => $location, + callnumber => $callnumber, + uc(C4::Context->preference("marcflavour")) => 1, + serialsadditems => $subscriptiondescs->[0]{'serialsadditems'}, ); output_html_with_http_headers $query, $cookie, $template->output;