see mail on koha-devel : code cleaning on Search.pm + normalizing API + use of biblio...

[koha.git] / bull / subscription-detail.pl

diff --git a/bull/subscription-detail.pl b/bull/subscription-detail.pl
index b57b6b4..f375c6e 100755 (executable)
--- a/bull/subscription-detail.pl
+++ b/bull/subscription-detail.pl
@@ -19,10 +19,10 @@ my $sth;
 my ($template, $loggedinuser, $cookie, $subs);
 my ($subscriptionid,$auser,$librarian,$cost,$aqbooksellerid, $aqbooksellername,$aqbudgetid, $bookfundid, $startdate, $periodicity,
        $dow, $numberlength, $weeklength, $monthlength,
-       $add1,$every1,$whenmorethan1,$setto1,$lastvalue1,
-       $add2,$every2,$whenmorethan2,$setto2,$lastvalue2,
-       $add3,$every3,$whenmorethan3,$setto3,$lastvalue3,
-       $numberingmethod, $status, $biblionumber, $bibliotitle, $notes);
+       $add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
+       $add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
+       $add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
+       $numberingmethod, $status, $biblionumber, $bibliotitle, $notes,$letter);
 
 $subscriptionid = $query->param('subscriptionid');
 
@@ -44,30 +44,41 @@ if ($op eq 'modsubscription') {
        $whenmorethan1 = $query->param('whenmorethan1');
        $setto1 = $query->param('setto1');
        $lastvalue1 = $query->param('lastvalue1');
+       $innerloop1 = $query->param('innerloop1');
        $add2 = $query->param('add2');
        $every2 = $query->param('every2');
        $whenmorethan2 = $query->param('whenmorethan2');
        $setto2 = $query->param('setto2');
        $lastvalue2 = $query->param('lastvalue2');
+       $innerloop2 = $query->param('innerloop2');
        $add3 = $query->param('add3');
        $every3 = $query->param('every3');
        $whenmorethan3 = $query->param('whenmorethan3');
        $setto3 = $query->param('setto3');
        $lastvalue3 = $query->param('lastvalue3');
+       $innerloop3 = $query->param('innerloop3');
        $numberingmethod = $query->param('numberingmethod');
        $status = 1;
        $notes = $query->param('notes');
+       $letter = $query->param('letter');
     
        &modsubscription($auser,$aqbooksellerid,$cost,$aqbudgetid,$startdate,
                                        $periodicity,$dow,$numberlength,$weeklength,$monthlength,
-                                       $add1,$every1,$whenmorethan1,$setto1,$lastvalue1,
-                                       $add2,$every2,$whenmorethan2,$setto2,$lastvalue2,
-                                       $add3,$every3,$whenmorethan3,$setto3,$lastvalue3,
-                                       $numberingmethod, $status, $biblionumber, $notes, $subscriptionid);
+                                       $add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
+                                       $add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
+                                       $add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
+                                       $numberingmethod, $status, $biblionumber, $notes, $letter, $subscriptionid);
 }
 
+if ($op eq 'del') {
+       &delsubscription($subscriptionid);
+       print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=../bull-home.pl\"></html>";
+       exit;
+
+}
 my $subs = &getsubscription($subscriptionid);
-my @serialslist = getserials($subscriptionid);
+my ($totalissues,@serialslist) = getserials($subscriptionid);
+$totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)
 
 ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "bull/subscription-detail.tmpl",
@@ -78,8 +89,7 @@ my @serialslist = getserials($subscriptionid);
                                debug => 1,
                                });
 
-my ($user, $cookie, $sessionID, $flags)
-       = checkauth($query, 0, {catalogue => 1}, "intranet");
+my ($user, $cookie, $sessionID, $flags) = checkauth($query, 0, {catalogue => 1}, "intranet");
 
 $template->param(
        user => $subs->{auser},
@@ -98,6 +108,7 @@ $template->param(
        add1 => $subs->{add1},
        every1 => $subs->{every1},
        whenmorethan1 => $subs->{whenmorethan1},
+       innerloop1 => $subs->{innerloop1},
        setto1 => $subs->{setto1},
        lastvalue1 => $subs->{lastvalue1},
        add2 => $subs->{add2},
@@ -105,18 +116,23 @@ $template->param(
        whenmorethan2 => $subs->{whenmorethan2},
        setto2 => $subs->{setto2},
        lastvalue2 => $subs->{lastvalue2},
+       innerloop2 => $subs->{innerloop2},
        add3 => $subs->{add3},
        every3 => $subs->{every3},
        whenmorethan3 => $subs->{whenmorethan3},
        setto3 => $subs->{setto3},
        lastvalue3 => $subs->{lastvalue3},
+       innerloop3 => $subs->{innerloop3},
        numberingmethod => $subs->{numberingmethod},
        status => $subs->{status},
        biblionumber => $subs->{biblionumber},
        bibliotitle => $subs->{bibliotitle},
        notes => $subs->{notes},
+       letter => $subs->{letter},
+       distributedto => $subs->{distributedto},
        subscriptionid => $subs->{subscriptionid},
        serialslist => \@serialslist,
+       totalissues => $totalissues,
        );
 $template->param(
                        "periodicity$subs->{periodicity}" => 1,