X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=serials%2Fserials-collection.pl;h=610de60a48318ecf331fb8d62b38f5923eb5e7f7;hb=1e8423167ec7bcffe9851d237230c27cd2f32a2c;hp=3b0704a3becf0b7738f1dbfbf8eaedc35518c570;hpb=f8e9fb6445dadbdef91e13a253c9c6bcb75e0eec;p=koha.git diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl index 3b0704a3be..610de60a48 100755 --- a/serials/serials-collection.pl +++ b/serials/serials-collection.pl @@ -1,6 +1,7 @@ #!/usr/bin/perl # Copyright 2000-2002 Katipo Communications +# Parts Copyright 2010 Biblibre # # This file is part of Koha. # @@ -13,44 +14,87 @@ # 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., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# 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. -# $Id$ use strict; +use warnings; use CGI; use C4::Auth; use C4::Koha; -use C4::Date; +use C4::Dates qw/format_date/; use C4::Serials; use C4::Letters; use C4::Output; -use C4::Interface::CGI::Output; use C4::Context; +use List::MoreUtils qw/uniq/; my $query = new CGI; -my $op = $query->param('op'); +my $op = $query->param('op') || q{}; my $dbh = C4::Context->dbh; -my $sth; -# my $id; my ($template, $loggedinuser, $cookie); ($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "serials/serials-collection.tmpl", query => $query, type => "intranet", authnotrequired => 0, - flagsrequired => {serials => 1}, + flagsrequired => {serials => '*'}, debug => 1, }); my $biblionumber = $query->param('biblionumber'); my @subscriptionid = $query->param('subscriptionid'); -my $subscriptiondescs ; +@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 + 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 + ); + + } + + print $query->redirect('/cgi-bin/koha/serials/serials-collection.pl?subscriptionid='.$subscriptionid); +} + +my $subscriptioncount; +my ($location, $callnumber); if (@subscriptionid){ my @subscriptioninformation=(); foreach my $subscriptionid (@subscriptionid){ @@ -64,7 +108,7 @@ if (@subscriptionid){ $subs->{ "status" . $subs->{'status'} } = 1; $subs->{startdate} = format_date( $subs->{startdate} ); $subs->{histstartdate} = format_date( $subs->{histstartdate} ); - if ( $subs->{enddate} eq '0000-00-00' ) { + if ( !defined $subs->{enddate} || $subs->{enddate} eq '0000-00-00' ) { $subs->{enddate} = ''; } else { @@ -72,11 +116,15 @@ if (@subscriptionid){ } $subs->{'abouttoexpire'}=abouttoexpire($subs->{'subscriptionid'}); $subs->{'subscriptionexpired'}=HasSubscriptionExpired($subs->{'subscriptionid'}); + $subs->{'subscriptionid'} = $subscriptionid; # FIXME - why was this lost ? + $location = GetAuthorisedValues('LOC', $subs->{'location'}); + $callnumber = $subs->{callnumber}; push @$subscriptiondescs,$subs; my $tmpsubscription= GetFullSubscription($subscriptionid); @subscriptioninformation=(@$tmpsubscription,@subscriptioninformation); } $subscriptions=PrepareSerialsData(\@subscriptioninformation); + $subscriptioncount = CountSubscriptionFromBiblionumber($subscriptiondescs->[0]{'biblionumber'}); } else { $subscriptiondescs = GetSubscriptionsFromBiblionumber($biblionumber) ; my $subscriptioninformation = GetFullSubscriptionsFromBiblionumber($biblionumber); @@ -94,9 +142,13 @@ foreach my $subscription (@$subscriptiondescs){ # 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, @@ -106,7 +158,12 @@ $template->param( bibliotitle => $title, suggestion => C4::Context->preference("suggestion"), virtualshelves => C4::Context->preference("virtualshelves"), + routing => C4::Context->preference("RoutingSerials"), subscr=>$query->param('subscriptionid'), + subscriptioncount => $subscriptioncount, + location => $locationlib, + callnumber => $callnumber, + uc(C4::Context->preference("marcflavour")) => 1 ); output_html_with_http_headers $query, $cookie, $template->output;