Attachment #62049 for bug #17047

View | Details | Raw Unified | Return to bug 17047
Collapse All | Expand All




    my (
        $nextseq,       $newlastvalue1, $newlastvalue2, $newlastvalue3,
        $newinnerloop1, $newinnerloop2, $newinnerloop3
    ) = GetNextSeq( $subscription, $pattern, $frequency, $planneddate );

$subscription is a hashref containing all the attributes of the table
'subscription'.
$pattern is a hashref containing all the attributes of the table
'subscription_numberpatterns'.
$frequency is a hashref containing all the attributes of the table 'subscription_frequencies'
$planneddate is a date string in iso format.
This function get the next issue for the subscription given on input arg

=cut

sub GetNextSeq {
    my ($subscription, $pattern, $frequency, $planneddate) = @_;

    return unless ($subscription and $pattern);


        if(@irreg > 0) {
            my $irregularities = {};
            $irregularities->{$_} = 1 foreach(@irreg);
            my $issueno = GetFictiveIssueNumber($subscription, $planneddate, $frequency) + 1;
            while($irregularities->{$issueno}) {
                $count++;
                $issueno++;


            #calculate the date of the last issue.
            for ( my $i = 1 ; $i <= $length ; $i++ ) {
                $enddate = GetNextDate( $subscription, $enddate, $frequency );
            }
        } elsif ( $subscription->{monthlength} ) {
            if ( $$subscription{startdate} ) {

    if ( !$otherIssueExpected && $oldstatus == EXPECTED && $status != EXPECTED ) {
        my $subscription = GetSubscription($subscriptionid);
        my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscription->{numberpattern});
        my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subscription->{periodicity});

        # next issue number
        my (
            $newserialseq,  $newlastvalue1, $newlastvalue2, $newlastvalue3,
            $newinnerloop1, $newinnerloop2, $newinnerloop3
          )
          = GetNextSeq( $subscription, $pattern, $frequency, $publisheddate );

        # next date (calculated from actual date & frequency parameters)
        my $nextpublisheddate = GetNextDate($subscription, $publisheddate, $frequency, 1);
        my $nextpubdate = $nextpublisheddate;
        $query = "UPDATE subscription SET lastvalue1=?, lastvalue2=?, lastvalue3=?, innerloop1=?, innerloop2=?, innerloop3=?
                    WHERE  subscriptionid = ?";

        my $expirationdate = GetExpirationDate($subscriptionid);

        my ($res) = $dbh->selectrow_array('select max(planneddate) from serial where subscriptionid = ?', undef, $subscriptionid);
        my $nextdate = GetNextDate($subscription, $res, $frequency);

        # only compare dates if both dates exist.
        if ($nextdate and $expirationdate) {


=head2 GetFictiveIssueNumber

$issueno = GetFictiveIssueNumber($subscription, $publishedate, $frequency);

Get the position of the issue published at $publisheddate, considering the
first issue (at firstacquidate) is at position 1, the next is at position 2, etc...

=cut

sub GetFictiveIssueNumber {
    my ($subscription, $publisheddate, $frequency) = @_;

    my $frequency = GetSubscriptionFrequency($subscription->{'periodicity'});
    my $unit = $frequency->{unit} ? lc $frequency->{'unit'} : undef;
    my $issueno = 0;



=head2 GetNextDate

$resultdate = GetNextDate($publisheddate,$subscription,$freqdata,$updatecount)

this function it takes the publisheddate and will return the next issue's date
and will skip dates if there exists an irregularity.
$publisheddate has to be an ISO date
$subscription is a hashref containing at least 'firstacquidate', 'irregularity', and 'countissuesperunit'
$frequency is a hashref containing frequency informations
$updatecount is a boolean value which, when set to true, update the 'countissuesperunit' in database
- eg if periodicity is monthly and $publisheddate is 2007-02-10 but if March and April is to be
skipped then the returned date will be 2007-05-10

=cut

sub GetNextDate {
    my ( $subscription, $publisheddate, $freqdata, $updatecount ) = @_;

    return unless $subscription and $publisheddate;

    my $freqdata = GetSubscriptionFrequency($subscription->{'periodicity'});

    if ($freqdata->{'unit'}) {
        my ( $year, $month, $day ) = split /-/, $publisheddate;


        # Get the 'fictive' next issue number
        # It is used to check if next issue is an irregular issue.
        my $issueno = GetFictiveIssueNumber($subscription, $publisheddate, $freqdata) + 1;

        # Then get the next date
        my $unit = lc $freqdata->{'unit'};

Lines 40-45 sub manaRequest { Link Here

(-)a/Koha/SharedContent.pm (+20 lines)
40	return $result if ( $response->code =~ /^2..$/ );	40	return $result if ( $response->code =~ /^2..$/ );
41	}	41	}
42		42
		43	sub manaNewUserPatchRequest {
		44	my $resource = shift;
		45	my $id = shift;
		46
		47	my $url = "$MANA_IP/$resource/$id.json/newUser";
		48	my $request = HTTP::Request->new( PATCH => $url );
		49
		50	return manaRequest($request);
		51	}
		52
43	sub manaPostRequest {	53	sub manaPostRequest {
44	my $resource = shift;	54	my $resource = shift;
45	my $content = shift;	55	my $content = shift;
Lines 54-59 sub manaPostRequest { Link Here
54	return manaRequest($request);	64	return manaRequest($request);
55	}	65	}
56		66
		67	sub manaGetRequestWithId {
		68	my $resource = shift;
		69	my $id = shift;
		70
		71	my $url = "$MANA_IP/$resource/$id.json";
		72	my $request = HTTP::Request->new( GET => $url );
		73
		74	return manaRequest($request);
		75	}
		76
57	sub manaGetRequest {	77	sub manaGetRequest {
58	my $resource = shift;	78	my $resource = shift;
59	my $parameters = shift;	79	my $parameters = shift;





=cut

sub get_search_info {
    my $searched_sub_id = shift;
    my $biblio = Koha::Biblios->find( { 'biblionumber' => $searched_sub_id } );
    my $biblioitem =
      Koha::Biblioitems->find( { 'biblionumber' => $searched_sub_id } );

    my $sub_mana_info = {
        'title'         => $biblio->title,
        'issn'          => $biblioitem->issn,
        'ean'           => $biblioitem->ean,
        'publishercode' => $biblioitem->publishercode
    };
    return $sub_mana_info;
}

sub get_sharable_info {
    my $shared_sub_id = shift;
    my $subscription  = Koha::Subscriptions->find($shared_sub_id);

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/mana-subscription-search-result.tt (+1 lines)
	1	[% INCLUDE 'mana-subscription-search-result.inc' %]

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt (-23 / +191 lines)
1	[% USE KohaDates %]	1	[% USE KohaDates %]
2	[% USE Branches %]	2	[% USE Branches %]
		3	[% USE Koha %]
3		4
4	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Koha &rsaquo; Serials &rsaquo; [% IF ( modify ) %][% bibliotitle \|html %] &rsaquo; Modify subscription[% ELSE %]New subscription[% END %]</title>	6	<title>Koha &rsaquo; Serials &rsaquo; [% IF ( modify ) %][% bibliotitle \|html %] &rsaquo; Modify subscription[% ELSE %]New subscription[% END %]</title>
Lines 11-21 fieldset.rows li.radio { width: 100%; } /* override staff-global.css */ Link Here
11	width: 300px; /* not enough for IE7 apparently */	12	width: 300px; /* not enough for IE7 apparently */
12	}	13	}
13	</style>	14	</style>
		15	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
		16	[% INCLUDE 'datatables.inc' %]
14	<script type="text/javascript">	17	<script type="text/javascript">
15	//<![CDATA[	18	//<![CDATA[
16		19
17	var globalnumpatterndata;	20	var globalnumpatterndata;
18	var globalfreqdata;	21	var globalfreqdata;
		22	var mananumpatterndata;
		23	var manafreqdata;
		24	var manaid;
19	var advancedpatternlocked;	25	var advancedpatternlocked;
20	var patternneedtobetested = 0;	26	var patternneedtobetested = 0;
21	[% IF ( irregularity ) %]patternneedtobetested = 1;[% END %]	27	[% IF ( irregularity ) %]patternneedtobetested = 1;[% END %]
Lines 98-128 function Check_page2(){ Link Here
98	}	104	}
99		105
100	function frequencyload(){	106	function frequencyload(){
101	$.getJSON("subscription-frequency.pl",{"frequency_id":document.f.frequency.value,ajax:'true'},	107	if ($("#frequency option:selected").val() === "mana"){
102	function(freqdata){	108	globalfreqdata=manafreqdata;
103	globalfreqdata=freqdata;	109	$("input[name='sfdescription']").val(manafreqdata.description);
104	if ( globalfreqdata.unit && globalfreqdata.unit.length == 0 ) {	110	$("input[name='unit']").val(manafreqdata.unit);
105	var option = $("#subtype option[value='issues']");	111	$("input[name='unitsperissue']").val(manafreqdata.unitsperissue);
106	$(option).attr('selected', 'selected');	112	$("input[name='issuesperunit']").val(manafreqdata.issuesperunit);
107	$("#subtype option[value!='issues']").prop('disabled', true)	113	if ($( "#numberpattern option:selected" ).val() === "mana" ) {
108	} else {	114	$("input[name='mana_id']").val(manaid);
109	$("#subtype option").prop('disabled', false)
110	}
111	}	115	}
112	)	116	} else {
		117	$.getJSON("subscription-frequency.pl",{"frequency_id":document.f.frequency.value,ajax:'true'},
		118	function(freqdata){
		119	globalfreqdata=freqdata;
		120	if ( globalfreqdata.unit && globalfreqdata.unit.length == 0 ) {
		121	var option = $("#subtype option[value='issues']");
		122	$(option).attr('selected', 'selected');
		123	$("#subtype option[value!='issues']").prop('disabled', true);
		124	} else {
		125	$("#subtype option").prop('disabled', false);
		126	}
		127	}
		128	);
		129	$("input[name='mana_id']").val("");
		130	}
113	}	131	}
114		132
115	function numberpatternload(){	133	function numberpatternload(){
116	$.getJSON("subscription-numberpattern.pl",{"numberpattern_id":document.f.numbering_pattern.value,ajax:'true'},	134	if($("#numberpattern option:selected" ).val() === "mana"){
117	function(numpatterndata){	135	globalnumpatterndata=mananumpatterndata;
118	globalnumpatterndata=numpatterndata;	136	$("input[name='sndescription']").val(mananumpatterndata.description);
119	if (globalnumpatterndata==undefined){	137	if($("#frequency option:selected" ).val() === "mana"){
120	return false;	138	$("input[name='mana_id']").val(manaid);
121	}	139	}
122	displaymoreoptions();	140	if (globalnumpatterndata==undefined){
123	restoreAdvancedPattern();	141	return false;
124	}	142	}
125	);	143	displaymoreoptions();
		144	restoreAdvancedPattern();
		145	} else {
		146	$.getJSON("subscription-numberpattern.pl",{"numberpattern_id":document.f.numbering_pattern.value,ajax:'true'},
		147	function(numpatterndata){
		148	globalnumpatterndata=numpatterndata;
		149	if (globalnumpatterndata==undefined){
		150	return false;
		151	}
		152	displaymoreoptions();
		153	restoreAdvancedPattern();
		154	}
		155	);
		156	$("input[name='mana_id']").val("");
		157	}
126	}	158	}
127		159
128	function displaymoreoptions() {	160	function displaymoreoptions() {
Lines 285-291 function testPredictionPattern() { Link Here
285	'lastvalue1', 'lastvalue2', 'lastvalue3', 'add1', 'add2', 'add3',	317	'lastvalue1', 'lastvalue2', 'lastvalue3', 'add1', 'add2', 'add3',
286	'every1', 'every2', 'every3', 'innerloop1', 'innerloop2', 'innerloop3',	318	'every1', 'every2', 'every3', 'innerloop1', 'innerloop2', 'innerloop3',
287	'setto1', 'setto2', 'setto3', 'numbering1', 'numbering2', 'numbering3',	319	'setto1', 'setto2', 'setto3', 'numbering1', 'numbering2', 'numbering3',
288	'whenmorethan1', 'whenmorethan2', 'whenmorethan3', 'locale'	320	'whenmorethan1', 'whenmorethan2', 'whenmorethan3', 'locale', 'sfdescription',
		321	'unitsperissue', 'issuesperunit', 'unit'
289	];	322	];
290	for(i in ajaxParams) {	323	for(i in ajaxParams) {
291	var param = ajaxParams[i];	324	var param = ajaxParams[i];
Lines 372-379 function show_page_2() { Link Here
372	displaymoreoptions();	405	displaymoreoptions();
373	}	406	}
374		407
		408	function mana_search() {
		409	$.ajax({
		410	type: "POST",
		411	url: "/cgi-bin/koha/svc/mana/search",
		412	data: {biblionumber : $("#biblionumber").val()},
		413	dataType: "html",
		414	})
		415	.done( function( result ) {
		416	$("#mana_search_result .modal-body").html(result);
		417	$("#mana_search_result_label").text("Results from Mana");
		418	$("#mana_results_datatable").dataTable($.extend(true, {}, dataTablesDefaults, {
		419	"sPaginationType": "four_button",
		420	"aoColumnDefs": [
		421	{ 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
		422	{ "sType": "title-string", "aTargets" : [ "title-string" ] },
		423	{ 'sType': "anti-the", 'aTargets' : [ 'anti-the'] }
		424	]
		425	}));
		426	if($("td.dataTables_empty").length == 0){
		427	$("#mana_search").show();
		428	}
		429	}).fail(function(result){
		430	});
		431	}
		432
		433	function mana_use(mana_id){
		434	$("tr").removeClass("selected");
		435	$("#row"+mana_id).addClass("selected");
		436	$.ajax( {
		437	type: "POST",
		438	url: "/cgi-bin/koha/svc/mana/use",
		439	data: {id : mana_id},
		440	dataType: "json",
		441	})
		442	.done(function(result){
		443	var select = document.getElementById('numberpattern');
		444	for(i = 0; i < select.length; i++){
		445	if(select[i].value === "mana"){
		446	select.remove(i);
		447	}
		448	}
		449	var optionnumpattern = document.createElement("option");
		450	optionnumpattern.text = result.label + " (mana)";
		451	optionnumpattern.selected = true;
		452	optionnumpattern.value="mana";
		453	select.add(optionnumpattern);
		454
		455	mananumpatterndata = {
		456	id:"mana",
		457	add1:result.add1,
		458	add2:result.add2,
		459	add3:result.add3,
		460	description:result.sndescription,
		461	displayorder:result.displayorder,
		462	every1:result.every1,
		463	every2:result.every2,
		464	every3:result.every3,
		465	label:result.label,
		466	label1:result.label1,
		467	label2:result.label2,
		468	label3:result.label3,
		469	numbering1:result.numbering1,
		470	numbering2:result.numbering2,
		471	numbering3:result.numbering3,
472	numberingmethod:result.numberingmethod,
473	setto1:result.setto1,
474	setto2:result.setto2,
475	setto3:result.setto3,
476	whenmorethan1:result.whenmorethan1,
477	whenmorethan2:result.whenmorethan2,
478	whenmorethan3:result.whenmorethan3,
479	};
480	select = document.getElementById("frequency");
481	for(i = 0; i < select.length; i++){
482	if(select[i].value === "mana"){
483	select.remove(i);
484	}
485	}
486	var optionfreq = document.createElement("option");
487	optionfreq.text = result.sfdescription + " (mana)";
488	optionfreq.selected = true;
489	optionfreq.value="mana";
490	select.add(optionfreq);
491	manafreqdata = {
492	id:"mana",
493	description:result.sfdescription,
494	displayorder:result.displayorder,
495	issuesperunit:result.issuesperunit,
496	unit:result.unit,
497	unitsperissue:result.unitsperissue,
498	};
499	manaid = result.id;
500	$("input[name='mana_id']").val(manaid);
501	$("#mana_search_result").modal("hide");
502	frequencyload();
503	numberpatternload();
504	}).fail( function( result ){
505	});
506	}
507
508	function removeDisabledAttr() {
509	$('select:disabled').removeAttr('disabled');
510	}
511
375		512
376	$(document).ready(function() {	513	$(document).ready(function() {
		514	$("#mana_search_result").modal("hide");
377	$("#aqbooksellerid").on('keypress', function(e) {	515	$("#aqbooksellerid").on('keypress', function(e) {
378	if (e.keyCode == 13) {	516	if (e.keyCode == 13) {
379	e.preventDefault();	517	e.preventDefault();
Lines 456-461 $(document).ready(function() { Link Here
456	}	594	}
457	[% END %]	595	[% END %]
458		596
		597	$("#mana_search").hide();
		598
459	show_page_1();	599	show_page_1();
460	$("#subscription_add_form").on("submit",function(){	600	$("#subscription_add_form").on("submit",function(){
461	return Check_page2();	601	return Check_page2();
Lines 477-483 $(document).ready(function() { Link Here
477	}	617	}
478	});	618	});
479	$("#subscription_add_next").on("click",function(){	619	$("#subscription_add_next").on("click",function(){
480	if ( Check_page1() ){	620	if ( Check_page1() ) {
		621	[% IF Koha.Preference('Mana') %]
		622	mana_search();
		623	[% END %]
481	show_page_2();	624	show_page_2();
482	}	625	}
483	});	626	});
Lines 701-706 $(document).ready(function() { Link Here
701		844
702	<div id="page_2">	845	<div id="page_2">
703	<div class="yui-u first">	846	<div class="yui-u first">
		847	<div id="mana_search" class="dialog message">
		848	<p>Frequency and Numbering pattern have been already proposed for this subscription on Mana. To show results, click <a style="cursor:pointer" data-toggle="modal" data-target="#mana_search_result">Here</a></p>
		849	</div>
704	<div id="subscription_form_planning">	850	<div id="subscription_form_planning">
705	<fieldset class="rows">	851	<fieldset class="rows">
706	<legend>Serials planning</legend>	852	<legend>Serials planning</legend>
Lines 965-974 $(document).ready(function() { Link Here
965	</div>	1111	</div>
966	[% END %]	1112	[% END %]
967		1113
		1114	<input type="hidden" id="mana_id" name="mana_id" value=""/>
		1115	<input type="hidden" id="sndescription" name="sndescription" value=""/>
		1116	<input type="hidden" id="sfdescription" name="sfdescription" value=""/>
		1117	<input type="hidden" id="unit" name="unit" value=""/>
		1118	<input type="hidden" id="unitsperissue" name="unitsperissue" value=""/>
		1119	<input type="hidden" id="issuesperunit" name="issuesperunit" value=""/>
968	<fieldset class="action">	1120	<fieldset class="action">
969	<input type="button" id="subscription_add_previous" value="<< Previous" style="float:left;"/>	1121	<input type="button" id="subscription_add_previous" value="<< Previous" style="float:left;"/>
970	<input id="testpatternbutton" type="button" value="Test prediction pattern" />	1122	<input id="testpatternbutton" type="button" value="Test prediction pattern" />
971	<input type="submit" value="Save subscription" style="float:right;" accesskey="w" />	1123	<input type="submit" onclick="removeDisabledAttr()" value="Save subscription" style="float:right;" accesskey="w"/>
972	</fieldset>	1124	</fieldset>
973	</div>	1125	</div>
974	</div>	1126	</div>
Lines 981-984 $(document).ready(function() { Link Here
981	</div>	1133	</div>
982	</div>	1134	</div>
983		1135
		1136	<div id="mana_search_result" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="mana_search_result_label" style="width: 90%; left:5%; margin-left: auto; display: none;">
		1137	<div class="modal-dialog">
		1138	<div class="modal-content">
		1139	<div class="modal-header">
		1140	<h3 id="mana_search_result_label"></h3>
		1141	</div>
		1142	<div class="modal-body">
		1143	</div>
		1144	<div class="modal-footer">
		1145	<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
		1146	</div>
		1147	</div>
		1148	</div>
		1149	</div>
		1150
		1151
984	[% INCLUDE 'intranet-bottom.inc' %]	1152	[% INCLUDE 'intranet-bottom.inc' %]

Lines 33-38 use C4::Debug; Link Here

(-)a/misc/cronjobs/serialsUpdate.pl (-1 / +3 lines)
33	use C4::Serials;	33	use C4::Serials;
34	use C4::Log;	34	use C4::Log;
35	use Koha::DateUtils;	35	use Koha::DateUtils;
		36	use C4::Serials::Frequency;
36		37
37	use Date::Calc qw/Date_to_Days check_date/;	38	use Date::Calc qw/Date_to_Days check_date/;
38	use Getopt::Long;	39	use Getopt::Long;
Lines 118-124 while ( my $issue = $sth->fetchrow_hashref ) { Link Here
118	my $publisheddate = $issue->{publisheddate};	119	my $publisheddate = $issue->{publisheddate};
119		120
120	if ( $subscription && $publisheddate && $publisheddate ne "0000-00-00" ) {	121	if ( $subscription && $publisheddate && $publisheddate ne "0000-00-00" ) {
121	my $nextpublisheddate = GetNextDate( $subscription, $publisheddate );	122	my $freqdata = GetSubscriptionFrequency($subscription->{'periodicity'});
		123	my $nextpublisheddate = GetNextDate( $subscription, $publisheddate, $freqdata );
122	my $today = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });	124	my $today = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });
123		125
124	if ( $nextpublisheddate && $today ) {	126	if ( $nextpublisheddate && $today ) {




            require C4::Serials::Numberpattern;
            my $subscription = GetSubscription($subscriptionid);
            my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscription->{numberpattern});
            my $frequency = C4::Serials::Frequency::GetSubscriptionFrequencies($subscription->{periodicity});
            my $expected = GetNextExpected($subscriptionid);
            my (
                 $newserialseq,  $newlastvalue1, $newlastvalue2, $newlastvalue3,
                 $newinnerloop1, $newinnerloop2, $newinnerloop3
            ) = GetNextSeq($subscription, $pattern, $frequency, $expected->{publisheddate});

             ## We generate the next publication date
             my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subscription->{periodicity});
             my $nextpublisheddate = GetNextDate($subscription, $expected->{publisheddate}, $frequency, 1);
             ## Creating the new issue
             NewIssue( $newserialseq, $subscriptionid, $subscription->{'biblionumber'},
                     1, $nextpublisheddate, $nextpublisheddate );




my $sublength = $input->param('sublength');
my $custompattern = $input->param('custompattern');


my $frequency;
if ( $frequencyid eq 'mana' ) {
    $frequency = {
        'id'            => undef,
        'displayorder'  => undef,
        'description'   => scalar $input->param('sfdescription') // '',
        'unitsperissue' => scalar $input->param('unitsperissue') // '',
        'issuesperunit' => scalar $input->param('issuesperunit') // '',
        'unit'          => scalar $input->param('unit') // ''
    };
}
else {
    $frequency = GetSubscriptionFrequency($frequencyid);
}

my %pattern = (
    numberingmethod => scalar $input->param('numberingmethod') // '',

    innerloop2      => scalar $input->param('innerloop2') // '',
    innerloop3      => scalar $input->param('innerloop3') // '',
    irregularity    => '',
    periodicity     => $frequencyid,
    countissuesperunit  => 1,
    firstacquidate  => $firstacquidate,
);

my $issuenumber;
if(defined $subscriptionid) {
    ($issuenumber) = C4::Serials::GetFictiveIssueNumber(\%subscription, $date, $frequency);
} else {
    $issuenumber = 1;
}

    my %line;

    if(defined $date){
        $date = GetNextDate(\%subscription, $date, $frequency);
    }
    if(defined $date){
        $line{'publicationdate'} = $date;

        last;
    }

    ($calculated, $subscription{'lastvalue1'}, $subscription{'lastvalue2'}, $subscription{'lastvalue3'}, $subscription{'innerloop1'}, $subscription{'innerloop2'}, $subscription{'innerloop3'}) = GetNextSeq(\%subscription, \%pattern, $frequency);
    $issuenumber++;
    $line{'number'} = $calculated;
    $line{'issuenumber'} = $issuenumber;

Lines 34-39 use Koha::AdditionalField; Link Here

(-)a/serials/subscription-add.pl (-7 / +84 lines)
34	use Koha::DateUtils;	34	use Koha::DateUtils;
35	use Carp;	35	use Carp;
36		36
		37	use Koha::Subscription::Numberpattern;
		38	use Koha::Subscription::Frequency;
		39	use Koha::SharedContent;
		40
37	#use Smart::Comments;	41	#use Smart::Comments;
38		42
39	our $query = CGI->new;	43	our $query = CGI->new;
Lines 282-296 sub _guess_enddate { Link Here
282	return $enddate;	286	return $enddate;
283	}	287	}
284		288
		289	sub manage_subscription_numbering_pattern_id {
		290	my $numberpattern;
		291	if ( $query->param('numbering_pattern') eq 'mana' ) {
		292	my $subscription_np = Koha::Subscription::Numberpattern->new()->set(
		293	{
		294	label => $query->param('patternname'),
		295	description => $query->param('sndescription'),
		296	numberingmethod => $query->param('numberingmethod'),
		297	label1 => $query->param('label1'),
		298	add1 => $query->param('add1'),
		299	every1 => $query->param('every1'),
		300	whenmorethan1 => $query->param('whenmorethan1'),
		301	setto1 => $query->param('setto1'),
		302	numbering1 => $query->param('numbering1'),
		303	label2 => $query->param('label2'),
		304	add2 => $query->param('add2'),
		305	every2 => $query->param('every2'),
		306	whenmorethan2 => $query->param('whenmorethan2'),
		307	setto2 => $query->param('setto2'),
		308	numbering2 => $query->param('numbering2'),
		309	label3 => $query->param('label3'),
		310	add3 => $query->param('add3'),
		311	every3 => $query->param('every3'),
		312	whenmorethan3 => $query->param('whenmorethan3'),
		313	setto3 => $query->param('setto3'),
		314	numbering3 => $query->param('numbering3'),
		315	}
		316	)->store();
		317	$numberpattern = $subscription_np->id;
		318	}
		319	else {
		320	$numberpattern = $query->param('numbering_pattern');
		321	}
		322	return $numberpattern;
		323	}
		324
		325	sub manage_subscription_frequencies_id {
		326	my $periodicity;
		327	if ( $query->param('frequency') eq 'mana' ) {
		328	my $subscription_freq = Koha::Subscription::Frequency->new()->set(
		329	{
		330	description => $query->param('sfdescription'),
		331	unit => $query->param('unit'),
		332	unitsperissue => $query->param('unitsperissue'),
		333	issuesperunit => $query->param('issuesperunit'),
		334	}
		335	)->store();
		336	$periodicity = $subscription_freq->id;
		337	}
		338	else {
		339	$periodicity = $query->param('frequency');
		340	}
		341	return $periodicity;
		342	}
		343
285	sub redirect_add_subscription {	344	sub redirect_add_subscription {
		345	my $periodicity = manage_subscription_frequencies_id();
		346	my $numberpattern = manage_subscription_numbering_pattern_id();
		347
286	my $auser = $query->param('user');	348	my $auser = $query->param('user');
287	my $branchcode = $query->param('branchcode');	349	my $branchcode = $query->param('branchcode');
288	my $aqbooksellerid = $query->param('aqbooksellerid');	350	my $aqbooksellerid = $query->param('aqbooksellerid');
289	my $cost = $query->param('cost');	351	my $cost = $query->param('cost');
290	my $aqbudgetid = $query->param('aqbudgetid');	352	my $aqbudgetid = $query->param('aqbudgetid');
291	my $periodicity = $query->param('frequency');
292	my @irregularity = $query->multi_param('irregularity');	353	my @irregularity = $query->multi_param('irregularity');
293	my $numberpattern = $query->param('numbering_pattern');
294	my $locale = $query->param('locale');	354	my $locale = $query->param('locale');
295	my $graceperiod = $query->param('graceperiod') \|\| 0;	355	my $graceperiod = $query->param('graceperiod') \|\| 0;
296		356
Lines 320-325 sub redirect_add_subscription { Link Here
320	my $previousitemtype = $query->param('previousitemtype');	380	my $previousitemtype = $query->param('previousitemtype');
321	my $skip_serialseq = $query->param('skip_serialseq');	381	my $skip_serialseq = $query->param('skip_serialseq');
322		382
		383	my $mana_id;
		384	if ( $query->param('mana_id') ne "" ) {
		385	$mana_id = $query->param('mana_id');
		386	Koha::SharedContent::manaNewUserPatchRequest("subscription",$mana_id);
		387	}
		388	else {
		389	$mana_id = undef;
		390	}
		391
323	my $startdate = output_pref( { str => scalar $query->param('startdate'), dateonly => 1, dateformat => 'iso' } );	392	my $startdate = output_pref( { str => scalar $query->param('startdate'), dateonly => 1, dateformat => 'iso' } );
324	my $enddate = output_pref( { str => scalar $query->param('enddate'), dateonly => 1, dateformat => 'iso' } );	393	my $enddate = output_pref( { str => scalar $query->param('enddate'), dateonly => 1, dateformat => 'iso' } );
325	my $firstacquidate = output_pref( { str => scalar $query->param('firstacquidate'), dateonly => 1, dateformat => 'iso' } );	394	my $firstacquidate = output_pref( { str => scalar $query->param('firstacquidate'), dateonly => 1, dateformat => 'iso' } );
Lines 331-337 sub redirect_add_subscription { Link Here
331	$enddate = _guess_enddate($startdate, $periodicity, $numberlength, $weeklength, $monthlength)	400	$enddate = _guess_enddate($startdate, $periodicity, $numberlength, $weeklength, $monthlength)
332	}	401	}
333	}	402	}
334
335	my $subscriptionid = NewSubscription(	403	my $subscriptionid = NewSubscription(
336	$auser, $branchcode, $aqbooksellerid, $cost, $aqbudgetid, $biblionumber,	404	$auser, $branchcode, $aqbooksellerid, $cost, $aqbudgetid, $biblionumber,
337	$startdate, $periodicity, $numberlength, $weeklength,	405	$startdate, $periodicity, $numberlength, $weeklength,
Lines 340-346 sub redirect_add_subscription { Link Here
340	join(";",@irregularity), $numberpattern, $locale, $callnumber,	408	join(";",@irregularity), $numberpattern, $locale, $callnumber,
341	$manualhistory, $internalnotes, $serialsadditems,	409	$manualhistory, $internalnotes, $serialsadditems,
342	$staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate,	410	$staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate,
343	$skip_serialseq	411	$skip_serialseq, $mana_id
344	);	412	);
345		413
346	my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );	414	my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );
Lines 370-382 sub redirect_mod_subscription { Link Here
370	? output_pref( { str => $nextacquidate, dateonly => 1, dateformat => 'iso' } )	438	? output_pref( { str => $nextacquidate, dateonly => 1, dateformat => 'iso' } )
371	: $firstacquidate;	439	: $firstacquidate;
372		440
373	my $periodicity = $query->param('frequency');	441	my $periodicity = manage_subscription_frequencies_id();
		442	my $numberpattern = manage_subscription_numbering_pattern_id();
374		443
375	my $subtype = $query->param('subtype');	444	my $subtype = $query->param('subtype');
376	my $sublength = $query->param('sublength');	445	my $sublength = $query->param('sublength');
377	my ($numberlength, $weeklength, $monthlength)	446	my ($numberlength, $weeklength, $monthlength)
378	= _get_sub_length( $subtype, $sublength );	447	= _get_sub_length( $subtype, $sublength );
379	my $numberpattern = $query->param('numbering_pattern');
380	my $locale = $query->param('locale');	448	my $locale = $query->param('locale');
381	my $lastvalue1 = $query->param('lastvalue1');	449	my $lastvalue1 = $query->param('lastvalue1');
382	my $innerloop1 = $query->param('innerloop1');	450	my $innerloop1 = $query->param('innerloop1');
Lines 399-404 sub redirect_mod_subscription { Link Here
399	my $previousitemtype = $query->param('previousitemtype');	467	my $previousitemtype = $query->param('previousitemtype');
400	my $skip_serialseq = $query->param('skip_serialseq');	468	my $skip_serialseq = $query->param('skip_serialseq');
401		469
		470	my $mana_id;
		471	if ( defined( $query->param('mana_id') ) ) {
		472	$mana_id = $query->param('mana_id');
		473	Koha::SharedContent::manaNewUserPatchRequest("subscription",$mana_id);
		474	}
		475	else {
		476	$mana_id = undef;
		477	}
		478
402	# Guess end date	479	# Guess end date
403	if(!defined $enddate \|\| $enddate eq '') {	480	if(!defined $enddate \|\| $enddate eq '') {
404	if($subtype eq "issues") {	481	if($subtype eq "issues") {
Lines 424-430 sub redirect_mod_subscription { Link Here
424	$status, $biblionumber, $callnumber, $notes, $letter,	501	$status, $biblionumber, $callnumber, $notes, $letter,
425	$manualhistory, $internalnotes, $serialsadditems, $staffdisplaycount,	502	$manualhistory, $internalnotes, $serialsadditems, $staffdisplaycount,
426	$opacdisplaycount, $graceperiod, $location, $enddate, $subscriptionid,	503	$opacdisplaycount, $graceperiod, $location, $enddate, $subscriptionid,
427	$skip_serialseq, $itemtype, $previousitemtype	504	$skip_serialseq, $itemtype, $previousitemtype, $mana_id
428	);	505	);
429		506
430	my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );	507	my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );




#!/usr/bin/perl

# Copyright 2016 BibLibre Morgane Alonso
#
# 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 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.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.
#

use strict;
use warnings;

use Koha::SharedContent;
use Koha::Subscription;
use C4::Auth qw(check_cookie_auth), qw(get_template_and_user);
use C4::Output qw( output_with_http_headers );

use CGI;
use JSON;

my $input = new CGI;

my ( $auth_status, $sessionID ) =
  check_cookie_auth( $input->cookie('CGISESSID'),
    { serials => 'create_subscription' } );

if ( $auth_status ne "ok" ) {
    exit 0;
}

my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
    {
        template_name   => "serials/mana-subscription-search-result.tt",
        query           => $input,
        type            => "intranet",
        authnotrequired => 0,

        # flagsrequired   => { serials => $permission },
        flagsrequired => { serials => 'create_subscription' },
        debug         => 1,
    }
);

my $biblionumber = $input->param('biblionumber');

my $sub_mana_info = Koha::Subscription::get_search_info($biblionumber);
my $result =
  Koha::SharedContent::manaGetRequest( "subscription", $sub_mana_info );
$template->param( subscriptions => $result->{data} );

output_with_http_headers $input, $cookie, $template->output, 'json';




#!/usr/bin/perl

# Copyright 2016 BibLibre Morgane Alonso
#
# 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 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.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.
#

use strict;
use warnings;

use Koha::SharedContent;
use C4::Auth qw(check_cookie_auth);

use CGI;
use JSON;


my $input = new CGI;
binmode STDOUT, ":encoding(UTF-8)";
print $input->header( -type => 'text/plain', -charset => 'UTF-8' );

my ( $auth_status, $sessionID ) =
  check_cookie_auth( $input->cookie('CGISESSID'),
    { serials => 'create_subscription' } );

if ( $auth_status ne "ok" ) {
    exit 0;
}

my $result = Koha::SharedContent::manaGetRequestWithId("subscription", $input->param('id') );

my $subscription;
$subscription = $result->{data};

print(to_json($subscription));

Lines 271-277 my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscrip Link Here

(-)a/t/db_dependent/Serials.t (-1 / +2 lines)
271	( $total_issues, @serials ) = C4::Serials::GetSerials( $subscriptionid );	271	( $total_issues, @serials ) = C4::Serials::GetSerials( $subscriptionid );
272	my $publisheddate = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });	272	my $publisheddate = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });
273	( $total_issues, @serials ) = C4::Serials::GetSerials( $subscriptionid );	273	( $total_issues, @serials ) = C4::Serials::GetSerials( $subscriptionid );
274	my $nextpublisheddate = C4::Serials::GetNextDate($subscription, $publisheddate, 1);	274	my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subscription->{periodicity});
		275	my $nextpublisheddate = C4::Serials::GetNextDate($subscription, $publisheddate, $frequency, 1);
275	my @statuses = qw( 2 2 3 3 3 3 3 4 4 41 42 43 44 5 );	276	my @statuses = qw( 2 2 3 3 3 3 3 4 4 41 42 43 44 5 );
276	# Add 14 serials	277	# Add 14 serials
277	my $counter = 0;	278	my $counter = 0;




#!/usr/bin/perl

use C4::Context;
use Test::More tests => 18;
use Modern::Perl;

my $dbh = C4::Context->dbh;
$dbh->{RaiseError} = 1;
$dbh->{AutoCommit} = 0;

use C4::Serials::Frequency;
use C4::Serials;

# TEST CASE - 1 issue per day, no irregularities
my $frequency = {
    description   => "One issue per day",
    unit          => 'day',
    issuesperunit => 1,
    unitsperissue => 1,
};

my $subscription = {
    firstacquidate     => '1970-01-01',
    irregularity       => '',
    countissuesperunit => 1,
};
my $issueNumber;

$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-01', $frequency );
is( $issueNumber, '1' );

$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-02', $frequency );
is( $issueNumber, '2' );
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-03', $frequency );
is( $issueNumber, '3' );

# TEST CASE - 2 issues per day, no irregularity
$frequency = {
    description   => "Two issues per day",
    unit          => 'day',
    issuesperunit => 2,
    unitsperissue => 1,
};
$subscription = {
    firstacquidate     => '1970-01-01',
    irregularity       => '',
    countissuesperunit => 1,
};
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-01', $frequency );
is( $issueNumber, '1' );
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-02', $frequency );
is( $issueNumber, '3' );
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-03', $frequency );
is( $issueNumber, '5' );

$subscription->{countissuesperunit} = 2;
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-01', $frequency );
is( $issueNumber, '2' );
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-02', $frequency );
is( $issueNumber, '4' );
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-03', $frequency );
is( $issueNumber, '6' );

# TEST CASE - 1 issue every 2 days, no irregularity
$frequency = {
    description   => "one issue every two days",
    unit          => 'day',
    issuesperunit => 1,
    unitsperissue => 2,
};
$subscription = {
    firstacquidate     => '1970-01-01',
    irregularity       => '',
    countissuesperunit => 1,
};
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-01', $frequency );
is( $issueNumber, 1 );
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-02', $frequency );
is( $issueNumber, 1 );
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-03', $frequency );
is( $issueNumber, 2 );
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-04', $frequency );
is( $issueNumber, 2 );
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-05', $frequency );
is( $issueNumber, 3 );

# TEST CASE - 1 issue per week, no irregularity
$frequency = {
    description   => "one issue per week",
    unit          => 'week',
    issuesperunit => 1,
    unitsperissue => 1,
};
$subscription = {
    firstacquidate     => '1970-01-01',
    irregularity       => '',
    countissuesperunit => 1,
};
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-01', $frequency );
is( $issueNumber, 1 );
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-02', $frequency );
is( $issueNumber, 1 );
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-08', $frequency );
is( $issueNumber, 2 );
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-15', $frequency );
is( $issueNumber, 3 );

$dbh->rollback;




    issuesperunit => 1,
    unitsperissue => 1,
};
my $id = AddSubscriptionFrequency($frequency);

my $subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
my $publisheddate = $subscription->{firstacquidate};

$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-02');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-03');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-04');

# TEST CASE - 1 issue per day, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '2;4',  # Skip the second and fourth issues
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-03');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-05');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-06');

# TEST CASE - 2 issues per day, no irregularity
$frequency = {
    description => "Two issues per day",
    unit => 'day',
    issuesperunit => 2,
    unitsperissue => 1,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-02');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-02');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-03');

# TEST CASE - 2 issues per day, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '3;5;6',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-02');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-04');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-04');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-05');

# TEST CASE - 1 issue every 2 days, no irregularity
$frequency = {
    description => "one issue every two days",
    unit => 'day',
    issuesperunit => 1,
    unitsperissue => 2,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-03');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-05');

# TEST CASE - 1 issue every 2 days, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '3',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-03');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-07');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-09');

# TEST CASE - 1 issue per week, no irregularity
$frequency = {
    description => "one issue per week",
    unit => 'week',
    issuesperunit => 1,
    unitsperissue => 1,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-08');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-15');

# TEST CASE - 1 issue per week, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '3',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-08');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-22');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-29');

# TEST CASE - 1 issue every 2 weeks, no irregularity
$frequency = {
    description => "one issue every 2 weeks",
    unit => 'week',
    issuesperunit => 1,
    unitsperissue => 2,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-15');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-29');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-02-12');

# TEST CASE - 1 issue every 2 weeks, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '3',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-15');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-02-12');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-02-26');

# TEST CASE - 2 issues per week, no irregularity
$frequency = {
    description => "two issues per week",
    unit => 'week',
    issuesperunit => 2,
    unitsperissue => 1,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-03');
# when more than 1 issue per week, date is automatically set to the same day of
# week as firstacquidate
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-08');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-10');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-15');

# TEST CASE - 2 issues per week, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '3;5;6',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-03');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-10');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-22');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-24');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-29');

# TEST CASE - 6 issues per week, no irregularity
$frequency = {
    description => "six issues per week",
    unit => 'week',
    issuesperunit => 6,
    unitsperissue => 1,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-06',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-07');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-08');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-09');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-10');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-11');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-13');

# TEST CASE - 6 issues per week, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-06',
    irregularity => '3;5;6',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-07');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-09');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-13');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-14');

# TEST CASE - 1 issue per month, no irregularity
$frequency = {
    description => "1 issue per month",
    unit => 'month',
    issuesperunit => 1,
    unitsperissue => 1,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-02-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-03-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-04-01');

# TEST CASE - 1 issue per month, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '2;4',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-03-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-05-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-06-01');

# TEST CASE - 1 issue every 2 months, no irregularity
$frequency = {
    description => "1 issue every 2 months",
    unit => 'month',
    issuesperunit => 1,
    unitsperissue => 2,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-03-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-05-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-07-01');

# TEST CASE - 1 issue every 2 months, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '2;3',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-07-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-09-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-11-01');

# TEST CASE - 2 issues per month, no irregularity
$frequency = {
    description => "2 issues per month",
    unit => 'month',
    issuesperunit => 2,
    unitsperissue => 1,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-16', 'January has 31 days');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-02-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-02-15', 'February has only 28 days');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-03-01');

# TEST CASE - 2 issues per month, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '3;5;6',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-16', 'January has 31 days');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-02-15', 'February has only 28 days');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-04-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-04-16', 'April has 30 days');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-05-01');

# TEST CASE - 1 issue per year, no irregularity
$frequency = {
    description => "1 issue per year",
    unit => 'year',
    issuesperunit => 1,
    unitsperissue => 1,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1971-01-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1972-01-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1973-01-01');

# TEST CASE - 1 issue per year, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '2;4',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1972-01-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1974-01-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1975-01-01');

# TEST CASE - 1 issue every 2 years, no irregularity
$frequency = {
    description => "1 issue every 2 years",
    unit => 'year',
    issuesperunit => 1,
    unitsperissue => 2,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1972-01-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1974-01-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1976-01-01');

# TEST CASE - 1 issue every 2 years, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '2;4',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1974-01-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1978-01-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1980-01-01');

# TEST CASE - 2 issues per year, no irregularity
$frequency = {
    description => "1 issue every 2 years",
    unit => 'year',
    issuesperunit => 2,
    unitsperissue => 1,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-07-02');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1971-01-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1971-07-02');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1972-01-01');

# TEST CASE - 2 issues per year, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '3;5;6',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-07-02');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1971-07-02');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1973-01-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1973-07-02');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1974-01-01');

# TEST CASE - Irregular
$frequency = {
    description => "Irregular",
    unit => undef,
    issuesperunit => 1,
    unitsperissue => 1,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
# GetNextDate always return undef if subscription is irregular
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, undef);

# GetNextDate returns undef if one of two first parameters is undef
$publisheddate = GetNextDate($subscription, undef, $frequency);
is($publisheddate, undef);
$publisheddate = GetNextDate(undef, $subscription->{firstacquidate}, $frequency);
is($publisheddate, undef);
$publisheddate = GetNextDate(undef, undef, $frequency);
is($publisheddate, undef);

$dbh->rollback;




};
my $publisheddate = $subscription->{firstacquidate};

my $seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: 2');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: 4');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: 2');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: 3');

# TEST CASE 2 - 1 variable, use 'dayname' numbering, from 1 to 7


$publisheddate = $subscription->{firstacquidate};

$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: Tuesday');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: Friday');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: Sunday');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: Monday');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: Tuesday');

# TEST CASE 3 - 1 variable, use 'monthname' numbering, from 0 to 11 by step of 2


$publisheddate = $subscription->{firstacquidate};

$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: March');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: September');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: January');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: March');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: May');

# TEST CASE 4 - 1 variable, use 'season' numbering, from 0 to 3


$publisheddate = $subscription->{firstacquidate};

$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: Summer');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: Spring');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: Fall');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: Winter');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: Spring');

# TEST CASE 5 - 2 variables, from 1 to 12, and from 1 to 4


$publisheddate = $subscription->{firstacquidate};

$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Y: 1, X: 2');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Y: 2, X: 1');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Y: 2, X: 3');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Y: 2, X: 4');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Y: 3, X: 1');

# TEST CASE 6 - 3 variables, from 1 to 12, from 1 to 8, and from 1 to 4


$publisheddate = $subscription->{firstacquidate};

$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Z: 1, Y: 1, X: 2');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Z: 1, Y: 2, X: 1');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Z: 1, Y: 2, X: 3');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Z: 1, Y: 2, X: 4');
for (1..100) {
    $publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
    $seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
}
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Z: 4, Y: 4, X: 1');
# 110th is here
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Z: 4, Y: 4, X: 3');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Z: 4, Y: 4, X: 4');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Z: 4, Y: 5, X: 1');


$dbh->rollback;

sub _next_seq {
    my ($subscription, $pattern, $frequency, $publisheddate) = @_;
    my $seq;
    ($seq, $subscription->{lastvalue1}, $subscription->{lastvalue2},
        $subscription->{lastvalue3}, $subscription->{innerloop1},
        $subscription->{innerloop2}, $subscription->{innerloop3}) =
            GetNextSeq($subscription, $pattern, $frequency, $publisheddate);
    return $seq;
}
- 

Return to bug 17047

Lines 869-887 sub GetDistributedTo { Link Here

(-)a/C4/Serials.pm (-15 / +16 lines)
869	my (	869	my (
870	$nextseq, $newlastvalue1, $newlastvalue2, $newlastvalue3,	870	$nextseq, $newlastvalue1, $newlastvalue2, $newlastvalue3,
871	$newinnerloop1, $newinnerloop2, $newinnerloop3	871	$newinnerloop1, $newinnerloop2, $newinnerloop3
872	) = GetNextSeq( $subscription, $pattern, $planneddate );	872	) = GetNextSeq( $subscription, $pattern, $frequency, $planneddate );
873		873
874	$subscription is a hashref containing all the attributes of the table	874	$subscription is a hashref containing all the attributes of the table
875	'subscription'.	875	'subscription'.
876	$pattern is a hashref containing all the attributes of the table	876	$pattern is a hashref containing all the attributes of the table
877	'subscription_numberpatterns'.	877	'subscription_numberpatterns'.
		878	$frequency is a hashref containing all the attributes of the table 'subscription_frequencies'
878	$planneddate is a date string in iso format.	879	$planneddate is a date string in iso format.
879	This function get the next issue for the subscription given on input arg	880	This function get the next issue for the subscription given on input arg
880		881
881	=cut	882	=cut
882		883
883	sub GetNextSeq {	884	sub GetNextSeq {
884	my ($subscription, $pattern, $planneddate) = @_;	885	my ($subscription, $pattern, $frequency, $planneddate) = @_;
885		886
886	return unless ($subscription and $pattern);	887	return unless ($subscription and $pattern);
887		888
Lines 894-900 sub GetNextSeq { Link Here
894	if(@irreg > 0) {	895	if(@irreg > 0) {
895	my $irregularities = {};	896	my $irregularities = {};
896	$irregularities->{$_} = 1 foreach(@irreg);	897	$irregularities->{$_} = 1 foreach(@irreg);
897	my $issueno = GetFictiveIssueNumber($subscription, $planneddate) + 1;	898	my $issueno = GetFictiveIssueNumber($subscription, $planneddate, $frequency) + 1;
898	while($irregularities->{$issueno}) {	899	while($irregularities->{$issueno}) {
899	$count++;	900	$count++;
900	$issueno++;	901	$issueno++;
Lines 1037-1043 sub GetExpirationDate { Link Here
1037		1038
1038	#calculate the date of the last issue.	1039	#calculate the date of the last issue.
1039	for ( my $i = 1 ; $i <= $length ; $i++ ) {	1040	for ( my $i = 1 ; $i <= $length ; $i++ ) {
1040	$enddate = GetNextDate( $subscription, $enddate );	1041	$enddate = GetNextDate( $subscription, $enddate, $frequency );
1041	}	1042	}
1042	} elsif ( $subscription->{monthlength} ) {	1043	} elsif ( $subscription->{monthlength} ) {
1043	if ( $$subscription{startdate} ) {	1044	if ( $$subscription{startdate} ) {
Lines 1189-1204 sub ModSerialStatus { Link Here
1189	if ( !$otherIssueExpected && $oldstatus == EXPECTED && $status != EXPECTED ) {	1190	if ( !$otherIssueExpected && $oldstatus == EXPECTED && $status != EXPECTED ) {
1190	my $subscription = GetSubscription($subscriptionid);	1191	my $subscription = GetSubscription($subscriptionid);
1191	my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscription->{numberpattern});	1192	my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscription->{numberpattern});
		1193	my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subscription->{periodicity});
1192		1194
1193	# next issue number	1195	# next issue number
1194	my (	1196	my (
1195	$newserialseq, $newlastvalue1, $newlastvalue2, $newlastvalue3,	1197	$newserialseq, $newlastvalue1, $newlastvalue2, $newlastvalue3,
1196	$newinnerloop1, $newinnerloop2, $newinnerloop3	1198	$newinnerloop1, $newinnerloop2, $newinnerloop3
1197	)	1199	)
1198	= GetNextSeq( $subscription, $pattern, $publisheddate );	1200	= GetNextSeq( $subscription, $pattern, $frequency, $publisheddate );
1199		1201
1200	# next date (calculated from actual date & frequency parameters)	1202	# next date (calculated from actual date & frequency parameters)
1201	my $nextpublisheddate = GetNextDate($subscription, $publisheddate, 1);	1203	my $nextpublisheddate = GetNextDate($subscription, $publisheddate, $frequency, 1);
1202	my $nextpubdate = $nextpublisheddate;	1204	my $nextpubdate = $nextpublisheddate;
1203	$query = "UPDATE subscription SET lastvalue1=?, lastvalue2=?, lastvalue3=?, innerloop1=?, innerloop2=?, innerloop3=?	1205	$query = "UPDATE subscription SET lastvalue1=?, lastvalue2=?, lastvalue3=?, innerloop1=?, innerloop2=?, innerloop3=?
1204	WHERE subscriptionid = ?";	1206	WHERE subscriptionid = ?";
Lines 2191-2197 sub abouttoexpire { Link Here
2191	my $expirationdate = GetExpirationDate($subscriptionid);	2193	my $expirationdate = GetExpirationDate($subscriptionid);
2192		2194
2193	my ($res) = $dbh->selectrow_array('select max(planneddate) from serial where subscriptionid = ?', undef, $subscriptionid);	2195	my ($res) = $dbh->selectrow_array('select max(planneddate) from serial where subscriptionid = ?', undef, $subscriptionid);
2194	my $nextdate = GetNextDate($subscription, $res);	2196	my $nextdate = GetNextDate($subscription, $res, $frequency);
2195		2197
2196	# only compare dates if both dates exist.	2198	# only compare dates if both dates exist.
2197	if ($nextdate and $expirationdate) {	2199	if ($nextdate and $expirationdate) {
Lines 2257-2263 sub GetSubscriptionsFromBorrower { Link Here
2257		2259
2258	=head2 GetFictiveIssueNumber	2260	=head2 GetFictiveIssueNumber
2259		2261
2260	$issueno = GetFictiveIssueNumber($subscription, $publishedate);	2262	$issueno = GetFictiveIssueNumber($subscription, $publishedate, $frequency);
2261		2263
2262	Get the position of the issue published at $publisheddate, considering the	2264	Get the position of the issue published at $publisheddate, considering the
2263	first issue (at firstacquidate) is at position 1, the next is at position 2, etc...	2265	first issue (at firstacquidate) is at position 1, the next is at position 2, etc...
Lines 2271-2279 date, and $publisheddate. Link Here
2271	=cut	2273	=cut
2272		2274
2273	sub GetFictiveIssueNumber {	2275	sub GetFictiveIssueNumber {
2274	my ($subscription, $publisheddate) = @_;	2276	my ($subscription, $publisheddate, $frequency) = @_;
2275		2277
2276	my $frequency = GetSubscriptionFrequency($subscription->{'periodicity'});
2277	my $unit = $frequency->{unit} ? lc $frequency->{'unit'} : undef;	2278	my $unit = $frequency->{unit} ? lc $frequency->{'unit'} : undef;
2278	my $issueno = 0;	2279	my $issueno = 0;
2279		2280
Lines 2391-2402 sub _get_next_date_year { Link Here
2391		2392
2392	=head2 GetNextDate	2393	=head2 GetNextDate
2393		2394
2394	$resultdate = GetNextDate($publisheddate,$subscription)	2395	$resultdate = GetNextDate($publisheddate,$subscription,$freqdata,$updatecount)
2395		2396
2396	this function it takes the publisheddate and will return the next issue's date	2397	this function it takes the publisheddate and will return the next issue's date
2397	and will skip dates if there exists an irregularity.	2398	and will skip dates if there exists an irregularity.
2398	$publisheddate has to be an ISO date	2399	$publisheddate has to be an ISO date
2399	$subscription is a hashref containing at least 'periodicity', 'firstacquidate', 'irregularity', and 'countissuesperunit'	2400	$subscription is a hashref containing at least 'firstacquidate', 'irregularity', and 'countissuesperunit'
		2401	$frequency is a hashref containing frequency informations
2400	$updatecount is a boolean value which, when set to true, update the 'countissuesperunit' in database	2402	$updatecount is a boolean value which, when set to true, update the 'countissuesperunit' in database
2401	- eg if periodicity is monthly and $publisheddate is 2007-02-10 but if March and April is to be	2403	- eg if periodicity is monthly and $publisheddate is 2007-02-10 but if March and April is to be
2402	skipped then the returned date will be 2007-05-10	2404	skipped then the returned date will be 2007-05-10
Lines 2409-2419 Return undef if subscription is irregular Link Here
2409	=cut	2411	=cut
2410		2412
2411	sub GetNextDate {	2413	sub GetNextDate {
2412	my ( $subscription, $publisheddate, $updatecount ) = @_;	2414	my ( $subscription, $publisheddate, $freqdata, $updatecount ) = @_;
2413		2415
2414	return unless $subscription and $publisheddate;	2416	return unless $subscription and $publisheddate;
2415		2417
2416	my $freqdata = GetSubscriptionFrequency($subscription->{'periodicity'});
2417		2418
2418	if ($freqdata->{'unit'}) {	2419	if ($freqdata->{'unit'}) {
2419	my ( $year, $month, $day ) = split /-/, $publisheddate;	2420	my ( $year, $month, $day ) = split /-/, $publisheddate;
Lines 2433-2439 sub GetNextDate { Link Here
2433		2434
2434	# Get the 'fictive' next issue number	2435	# Get the 'fictive' next issue number
2435	# It is used to check if next issue is an irregular issue.	2436	# It is used to check if next issue is an irregular issue.
2436	my $issueno = GetFictiveIssueNumber($subscription, $publisheddate) + 1;	2437	my $issueno = GetFictiveIssueNumber($subscription, $publisheddate, $freqdata) + 1;
2437		2438
2438	# Then get the next date	2439	# Then get the next date
2439	my $unit = lc $freqdata->{'unit'};	2440	my $unit = lc $freqdata->{'unit'};

Lines 45-50 Koha::Subscription - Koha Subscription Object class Link Here

(-)a/Koha/Subscription.pm (+15 lines)
45		45
46	=cut	46	=cut
47		47
		48	sub get_search_info {
		49	my $searched_sub_id = shift;
		50	my $biblio = Koha::Biblios->find( { 'biblionumber' => $searched_sub_id } );
		51	my $biblioitem =
		52	Koha::Biblioitems->find( { 'biblionumber' => $searched_sub_id } );
		53
		54	my $sub_mana_info = {
		55	'title' => $biblio->title,
		56	'issn' => $biblioitem->issn,
		57	'ean' => $biblioitem->ean,
		58	'publishercode' => $biblioitem->publishercode
		59	};
		60	return $sub_mana_info;
		61	}
		62
48	sub get_sharable_info {	63	sub get_sharable_info {
49	my $shared_sub_id = shift;	64	my $shared_sub_id = shift;
50	my $subscription = Koha::Subscriptions->find($shared_sub_id);	65	my $subscription = Koha::Subscriptions->find($shared_sub_id);

Lines 74-87 if($op eq 'gennext' && @subscriptionid){ Link Here

(-)a/serials/serials-collection.pl (-2 / +4 lines)
74	require C4::Serials::Numberpattern;	74	require C4::Serials::Numberpattern;
75	my $subscription = GetSubscription($subscriptionid);	75	my $subscription = GetSubscription($subscriptionid);
76	my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscription->{numberpattern});	76	my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscription->{numberpattern});
		77	my $frequency = C4::Serials::Frequency::GetSubscriptionFrequencies($subscription->{periodicity});
77	my $expected = GetNextExpected($subscriptionid);	78	my $expected = GetNextExpected($subscriptionid);
78	my (	79	my (
79	$newserialseq, $newlastvalue1, $newlastvalue2, $newlastvalue3,	80	$newserialseq, $newlastvalue1, $newlastvalue2, $newlastvalue3,
80	$newinnerloop1, $newinnerloop2, $newinnerloop3	81	$newinnerloop1, $newinnerloop2, $newinnerloop3
81	) = GetNextSeq($subscription, $pattern, $expected->{publisheddate});	82	) = GetNextSeq($subscription, $pattern, $frequency, $expected->{publisheddate});
82		83
83	## We generate the next publication date	84	## We generate the next publication date
84	my $nextpublisheddate = GetNextDate($subscription, $expected->{publisheddate}, 1);	85	my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subscription->{periodicity});
		86	my $nextpublisheddate = GetNextDate($subscription, $expected->{publisheddate}, $frequency, 1);
85	## Creating the new issue	87	## Creating the new issue
86	NewIssue( $newserialseq, $subscriptionid, $subscription->{'biblionumber'},	88	NewIssue( $newserialseq, $subscriptionid, $subscription->{'biblionumber'},
87	1, $nextpublisheddate, $nextpublisheddate );	89	1, $nextpublisheddate, $nextpublisheddate );

Lines 56-62 my $subtype = $input->param('subtype'); Link Here

(-)a/serials/showpredictionpattern.pl (-5 / +18 lines)
56	my $sublength = $input->param('sublength');	56	my $sublength = $input->param('sublength');
57	my $custompattern = $input->param('custompattern');	57	my $custompattern = $input->param('custompattern');
58		58
59	my $frequency = GetSubscriptionFrequency($frequencyid);	59
		60	my $frequency;
		61	if ( $frequencyid eq 'mana' ) {
		62	$frequency = {
		63	'id' => undef,
		64	'displayorder' => undef,
		65	'description' => scalar $input->param('sfdescription') // '',
		66	'unitsperissue' => scalar $input->param('unitsperissue') // '',
		67	'issuesperunit' => scalar $input->param('issuesperunit') // '',
		68	'unit' => scalar $input->param('unit') // ''
		69	};
		70	}
		71	else {
		72	$frequency = GetSubscriptionFrequency($frequencyid);
		73	}
60		74
61	my %pattern = (	75	my %pattern = (
62	numberingmethod => scalar $input->param('numberingmethod') // '',	76	numberingmethod => scalar $input->param('numberingmethod') // '',
Lines 98-111 my %subscription = ( Link Here
98	innerloop2 => scalar $input->param('innerloop2') // '',	112	innerloop2 => scalar $input->param('innerloop2') // '',
99	innerloop3 => scalar $input->param('innerloop3') // '',	113	innerloop3 => scalar $input->param('innerloop3') // '',
100	irregularity => '',	114	irregularity => '',
101	periodicity => $frequencyid,
102	countissuesperunit => 1,	115	countissuesperunit => 1,
103	firstacquidate => $firstacquidate,	116	firstacquidate => $firstacquidate,
104	);	117	);
105		118
106	my $issuenumber;	119	my $issuenumber;
107	if(defined $subscriptionid) {	120	if(defined $subscriptionid) {
108	($issuenumber) = C4::Serials::GetFictiveIssueNumber(\%subscription, $date);	121	($issuenumber) = C4::Serials::GetFictiveIssueNumber(\%subscription, $date, $frequency);
109	} else {	122	} else {
110	$issuenumber = 1;	123	$issuenumber = 1;
111	}	124	}
Lines 135-141 while( $i < 1000 ) { Link Here
135	my %line;	148	my %line;
136		149
137	if(defined $date){	150	if(defined $date){
138	$date = GetNextDate(\%subscription, $date);	151	$date = GetNextDate(\%subscription, $date, $frequency);
139	}	152	}
140	if(defined $date){	153	if(defined $date){
141	$line{'publicationdate'} = $date;	154	$line{'publicationdate'} = $date;
Lines 156-162 while( $i < 1000 ) { Link Here
156	last;	169	last;
157	}	170	}
158		171
159	($calculated, $subscription{'lastvalue1'}, $subscription{'lastvalue2'}, $subscription{'lastvalue3'}, $subscription{'innerloop1'}, $subscription{'innerloop2'}, $subscription{'innerloop3'}) = GetNextSeq(\%subscription, \%pattern);	172	($calculated, $subscription{'lastvalue1'}, $subscription{'lastvalue2'}, $subscription{'lastvalue3'}, $subscription{'innerloop1'}, $subscription{'innerloop2'}, $subscription{'innerloop3'}) = GetNextSeq(\%subscription, \%pattern, $frequency);
160	$issuenumber++;	173	$issuenumber++;
161	$line{'number'} = $calculated;	174	$line{'number'} = $calculated;
162	$line{'issuenumber'} = $issuenumber;	175	$line{'issuenumber'} = $issuenumber;

Line 0 Link Here

(-)a/svc/mana/search (+62 lines)
	1	#!/usr/bin/perl
	2
	3	# Copyright 2016 BibLibre Morgane Alonso
	4	#
	5	# This file is part of Koha.
	6	#
	7	# Koha is free software; you can redistribute it and/or modify it
	8	# under the terms of the GNU General Public License as published by
	9	# the Free Software Foundation; either version 3 of the License, or
	10	# (at your option) any later version.
	11	#
	12	# Koha is distributed in the hope that it will be useful, but
	13	# WITHOUT ANY WARRANTY; without even the implied warranty of
	14	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	15	# GNU General Public License for more details.
	16	#
	17	# You should have received a copy of the GNU General Public License
	18	# along with Koha; if not, see <http://www.gnu.org/licenses>.
	19	#
	20
	21	use strict;
	22	use warnings;
	23
	24	use Koha::SharedContent;
	25	use Koha::Subscription;
	26	use C4::Auth qw(check_cookie_auth), qw(get_template_and_user);
	27	use C4::Output qw( output_with_http_headers );
	28
	29	use CGI;
	30	use JSON;
	31
	32	my $input = new CGI;
	33
	34	my ( $auth_status, $sessionID ) =
	35	check_cookie_auth( $input->cookie('CGISESSID'),
	36	{ serials => 'create_subscription' } );
	37
	38	if ( $auth_status ne "ok" ) {
	39	exit 0;
	40	}
	41
	42	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
	43	{
	44	template_name => "serials/mana-subscription-search-result.tt",
	45	query => $input,
	46	type => "intranet",
	47	authnotrequired => 0,
	48
	49	# flagsrequired => { serials => $permission },
	50	flagsrequired => { serials => 'create_subscription' },
	51	debug => 1,
	52	}
	53	);
	54
	55	my $biblionumber = $input->param('biblionumber');
	56
	57	my $sub_mana_info = Koha::Subscription::get_search_info($biblionumber);
	58	my $result =
	59	Koha::SharedContent::manaGetRequest( "subscription", $sub_mana_info );
	60	$template->param( subscriptions => $result->{data} );
	61
	62	output_with_http_headers $input, $cookie, $template->output, 'json';

Line 0 Link Here

(-)a/svc/mana/use (+48 lines)
	1	#!/usr/bin/perl
	2
	3	# Copyright 2016 BibLibre Morgane Alonso
	4	#
	5	# This file is part of Koha.
	6	#
	7	# Koha is free software; you can redistribute it and/or modify it
	8	# under the terms of the GNU General Public License as published by
	9	# the Free Software Foundation; either version 3 of the License, or
	10	# (at your option) any later version.
	11	#
	12	# Koha is distributed in the hope that it will be useful, but
	13	# WITHOUT ANY WARRANTY; without even the implied warranty of
	14	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	15	# GNU General Public License for more details.
	16	#
	17	# You should have received a copy of the GNU General Public License
	18	# along with Koha; if not, see <http://www.gnu.org/licenses>.
	19	#
	20
	21	use strict;
	22	use warnings;
	23
	24	use Koha::SharedContent;
	25	use C4::Auth qw(check_cookie_auth);
	26
	27	use CGI;
	28	use JSON;
	29
	30
	31	my $input = new CGI;
	32	binmode STDOUT, ":encoding(UTF-8)";
	33	print $input->header( -type => 'text/plain', -charset => 'UTF-8' );
	34
	35	my ( $auth_status, $sessionID ) =
	36	check_cookie_auth( $input->cookie('CGISESSID'),
	37	{ serials => 'create_subscription' } );
	38
	39	if ( $auth_status ne "ok" ) {
	40	exit 0;
	41	}
	42
	43	my $result = Koha::SharedContent::manaGetRequestWithId("subscription", $input->param('id') );
	44
	45	my $subscription;
	46	$subscription = $result->{data};
	47
	48	print(to_json($subscription));

Line 0 Link Here

(-)a/t/db_dependent/Serials/GetFictiveIssueNumber.t (+126 lines)
		1	#!/usr/bin/perl
		2
		3	use C4::Context;
		4	use Test::More tests => 18;
		5	use Modern::Perl;
		6
		7	my $dbh = C4::Context->dbh;
		8	$dbh->{RaiseError} = 1;
		9	$dbh->{AutoCommit} = 0;
		10
		11	use C4::Serials::Frequency;
		12	use C4::Serials;
		13
		14	# TEST CASE - 1 issue per day, no irregularities
		15	my $frequency = {
		16	description => "One issue per day",
		17	unit => 'day',
		18	issuesperunit => 1,
		19	unitsperissue => 1,
		20	};
		21
		22	my $subscription = {
		23	firstacquidate => '1970-01-01',
		24	irregularity => '',
		25	countissuesperunit => 1,
		26	};
		27	my $issueNumber;
		28
		29	$issueNumber =
		30	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-01', $frequency );
		31	is( $issueNumber, '1' );
		32
		33	$issueNumber =
		34	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-02', $frequency );
		35	is( $issueNumber, '2' );
		36	$issueNumber =
		37	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-03', $frequency );
		38	is( $issueNumber, '3' );
		39
		40	# TEST CASE - 2 issues per day, no irregularity
		41	$frequency = {
		42	description => "Two issues per day",
		43	unit => 'day',
		44	issuesperunit => 2,
		45	unitsperissue => 1,
		46	};
		47	$subscription = {
		48	firstacquidate => '1970-01-01',
		49	irregularity => '',
		50	countissuesperunit => 1,
		51	};
		52	$issueNumber =
		53	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-01', $frequency );
		54	is( $issueNumber, '1' );
		55	$issueNumber =
		56	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-02', $frequency );
		57	is( $issueNumber, '3' );
		58	$issueNumber =
		59	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-03', $frequency );
		60	is( $issueNumber, '5' );
		61
		62	$subscription->{countissuesperunit} = 2;
		63	$issueNumber =
		64	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-01', $frequency );
65	is( $issueNumber, '2' );
66	$issueNumber =
67	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-02', $frequency );
68	is( $issueNumber, '4' );
69	$issueNumber =
70	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-03', $frequency );
71	is( $issueNumber, '6' );
72
73	# TEST CASE - 1 issue every 2 days, no irregularity
74	$frequency = {
75	description => "one issue every two days",
76	unit => 'day',
77	issuesperunit => 1,
78	unitsperissue => 2,
79	};
80	$subscription = {
81	firstacquidate => '1970-01-01',
82	irregularity => '',
83	countissuesperunit => 1,
84	};
85	$issueNumber =
86	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-01', $frequency );
87	is( $issueNumber, 1 );
88	$issueNumber =
89	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-02', $frequency );
90	is( $issueNumber, 1 );
91	$issueNumber =
92	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-03', $frequency );
93	is( $issueNumber, 2 );
94	$issueNumber =
95	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-04', $frequency );
96	is( $issueNumber, 2 );
97	$issueNumber =
98	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-05', $frequency );
99	is( $issueNumber, 3 );
100
101	# TEST CASE - 1 issue per week, no irregularity
102	$frequency = {
103	description => "one issue per week",
104	unit => 'week',
105	issuesperunit => 1,
106	unitsperissue => 1,
107	};
108	$subscription = {
109	firstacquidate => '1970-01-01',
110	irregularity => '',
111	countissuesperunit => 1,
112	};
113	$issueNumber =
114	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-01', $frequency );
115	is( $issueNumber, 1 );
116	$issueNumber =
117	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-02', $frequency );
118	is( $issueNumber, 1 );
119	$issueNumber =
120	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-08', $frequency );
121	is( $issueNumber, 2 );
122	$issueNumber =
123	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-15', $frequency );
124	is( $issueNumber, 3 );
125
126	$dbh->rollback;

Lines 43-58 my $subscription = { Link Here

(-)a/t/db_dependent/Serials/GetNextSeq.t (-63 / +62 lines)
43	};	43	};
44	my $publisheddate = $subscription->{firstacquidate};	44	my $publisheddate = $subscription->{firstacquidate};
45		45
46	my $seq = _next_seq($subscription, $pattern, $publisheddate);	46	my $seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
47	is($seq, 'X: 2');	47	is($seq, 'X: 2');
48	$publisheddate = GetNextDate($subscription, $publisheddate);	48	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
49	$seq = _next_seq($subscription, $pattern, $publisheddate);	49	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
50	is($seq, 'X: 4');	50	is($seq, 'X: 4');
51	$publisheddate = GetNextDate($subscription, $publisheddate);	51	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
52	$seq = _next_seq($subscription, $pattern, $publisheddate);	52	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
53	is($seq, 'X: 2');	53	is($seq, 'X: 2');
54	$publisheddate = GetNextDate($subscription, $publisheddate);	54	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
55	$seq = _next_seq($subscription, $pattern, $publisheddate);	55	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
56	is($seq, 'X: 3');	56	is($seq, 'X: 3');
57		57
58	# TEST CASE 2 - 1 variable, use 'dayname' numbering, from 1 to 7	58	# TEST CASE 2 - 1 variable, use 'dayname' numbering, from 1 to 7
Lines 79-97 $pattern = { Link Here
79		79
80	$publisheddate = $subscription->{firstacquidate};	80	$publisheddate = $subscription->{firstacquidate};
81		81
82	$seq = _next_seq($subscription, $pattern, $publisheddate);	82	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
83	is($seq, 'X: Tuesday');	83	is($seq, 'X: Tuesday');
84	$publisheddate = GetNextDate($subscription, $publisheddate);	84	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
85	$seq = _next_seq($subscription, $pattern, $publisheddate);	85	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
86	is($seq, 'X: Friday');	86	is($seq, 'X: Friday');
87	$publisheddate = GetNextDate($subscription, $publisheddate);	87	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
88	$seq = _next_seq($subscription, $pattern, $publisheddate);	88	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
89	is($seq, 'X: Sunday');	89	is($seq, 'X: Sunday');
90	$publisheddate = GetNextDate($subscription, $publisheddate);	90	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
91	$seq = _next_seq($subscription, $pattern, $publisheddate);	91	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
92	is($seq, 'X: Monday');	92	is($seq, 'X: Monday');
93	$publisheddate = GetNextDate($subscription, $publisheddate);	93	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
94	$seq = _next_seq($subscription, $pattern, $publisheddate);	94	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
95	is($seq, 'X: Tuesday');	95	is($seq, 'X: Tuesday');
96		96
97	# TEST CASE 3 - 1 variable, use 'monthname' numbering, from 0 to 11 by step of 2	97	# TEST CASE 3 - 1 variable, use 'monthname' numbering, from 0 to 11 by step of 2
Lines 118-136 $pattern = { Link Here
118		118
119	$publisheddate = $subscription->{firstacquidate};	119	$publisheddate = $subscription->{firstacquidate};
120		120
121	$seq = _next_seq($subscription, $pattern, $publisheddate);	121	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
122	is($seq, 'X: March');	122	is($seq, 'X: March');
123	$publisheddate = GetNextDate($subscription, $publisheddate);	123	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
124	$seq = _next_seq($subscription, $pattern, $publisheddate);	124	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
125	is($seq, 'X: September');	125	is($seq, 'X: September');
126	$publisheddate = GetNextDate($subscription, $publisheddate);	126	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
127	$seq = _next_seq($subscription, $pattern, $publisheddate);	127	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
128	is($seq, 'X: January');	128	is($seq, 'X: January');
129	$publisheddate = GetNextDate($subscription, $publisheddate);	129	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
130	$seq = _next_seq($subscription, $pattern, $publisheddate);	130	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
131	is($seq, 'X: March');	131	is($seq, 'X: March');
132	$publisheddate = GetNextDate($subscription, $publisheddate);	132	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
133	$seq = _next_seq($subscription, $pattern, $publisheddate);	133	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
134	is($seq, 'X: May');	134	is($seq, 'X: May');
135		135
136	# TEST CASE 4 - 1 variable, use 'season' numbering, from 0 to 3	136	# TEST CASE 4 - 1 variable, use 'season' numbering, from 0 to 3
Lines 157-175 $pattern = { Link Here
157		157
158	$publisheddate = $subscription->{firstacquidate};	158	$publisheddate = $subscription->{firstacquidate};
159		159
160	$seq = _next_seq($subscription, $pattern, $publisheddate);	160	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
161	is($seq, 'X: Summer');	161	is($seq, 'X: Summer');
162	$publisheddate = GetNextDate($subscription, $publisheddate);	162	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
163	$seq = _next_seq($subscription, $pattern, $publisheddate);	163	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
164	is($seq, 'X: Spring');	164	is($seq, 'X: Spring');
165	$publisheddate = GetNextDate($subscription, $publisheddate);	165	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
166	$seq = _next_seq($subscription, $pattern, $publisheddate);	166	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
167	is($seq, 'X: Fall');	167	is($seq, 'X: Fall');
168	$publisheddate = GetNextDate($subscription, $publisheddate);	168	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
169	$seq = _next_seq($subscription, $pattern, $publisheddate);	169	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
170	is($seq, 'X: Winter');	170	is($seq, 'X: Winter');
171	$publisheddate = GetNextDate($subscription, $publisheddate);	171	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
172	$seq = _next_seq($subscription, $pattern, $publisheddate);	172	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
173	is($seq, 'X: Spring');	173	is($seq, 'X: Spring');
174		174
175	# TEST CASE 5 - 2 variables, from 1 to 12, and from 1 to 4	175	# TEST CASE 5 - 2 variables, from 1 to 12, and from 1 to 4
Lines 196-214 $pattern = { Link Here
196		196
197	$publisheddate = $subscription->{firstacquidate};	197	$publisheddate = $subscription->{firstacquidate};
198		198
199	$seq = _next_seq($subscription, $pattern, $publisheddate);	199	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
200	is($seq, 'Y: 1, X: 2');	200	is($seq, 'Y: 1, X: 2');
201	$publisheddate = GetNextDate($subscription, $publisheddate);	201	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
202	$seq = _next_seq($subscription, $pattern, $publisheddate);	202	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
203	is($seq, 'Y: 2, X: 1');	203	is($seq, 'Y: 2, X: 1');
204	$publisheddate = GetNextDate($subscription, $publisheddate);	204	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
205	$seq = _next_seq($subscription, $pattern, $publisheddate);	205	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
206	is($seq, 'Y: 2, X: 3');	206	is($seq, 'Y: 2, X: 3');
207	$publisheddate = GetNextDate($subscription, $publisheddate);	207	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
208	$seq = _next_seq($subscription, $pattern, $publisheddate);	208	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
209	is($seq, 'Y: 2, X: 4');	209	is($seq, 'Y: 2, X: 4');
210	$publisheddate = GetNextDate($subscription, $publisheddate);	210	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
211	$seq = _next_seq($subscription, $pattern, $publisheddate);	211	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
212	is($seq, 'Y: 3, X: 1');	212	is($seq, 'Y: 3, X: 1');
213		213
214	# TEST CASE 6 - 3 variables, from 1 to 12, from 1 to 8, and from 1 to 4	214	# TEST CASE 6 - 3 variables, from 1 to 12, from 1 to 8, and from 1 to 4
Lines 235-278 $pattern = { Link Here
235		235
236	$publisheddate = $subscription->{firstacquidate};	236	$publisheddate = $subscription->{firstacquidate};
237		237
238	$seq = _next_seq($subscription, $pattern, $publisheddate);	238	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
239	is($seq, 'Z: 1, Y: 1, X: 2');	239	is($seq, 'Z: 1, Y: 1, X: 2');
240	$publisheddate = GetNextDate($subscription, $publisheddate);	240	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
241	$seq = _next_seq($subscription, $pattern, $publisheddate);	241	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
242	is($seq, 'Z: 1, Y: 2, X: 1');	242	is($seq, 'Z: 1, Y: 2, X: 1');
243	$publisheddate = GetNextDate($subscription, $publisheddate);	243	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
244	$seq = _next_seq($subscription, $pattern, $publisheddate);	244	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
245	is($seq, 'Z: 1, Y: 2, X: 3');	245	is($seq, 'Z: 1, Y: 2, X: 3');
246	$publisheddate = GetNextDate($subscription, $publisheddate);	246	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
247	$seq = _next_seq($subscription, $pattern, $publisheddate);	247	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
248	is($seq, 'Z: 1, Y: 2, X: 4');	248	is($seq, 'Z: 1, Y: 2, X: 4');
249	for (1..100) {	249	for (1..100) {
250	$publisheddate = GetNextDate($subscription, $publisheddate);	250	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
251	$seq = _next_seq($subscription, $pattern, $publisheddate);	251	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
252	}	252	}
253	$publisheddate = GetNextDate($subscription, $publisheddate);	253	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
254	$seq = _next_seq($subscription, $pattern, $publisheddate);	254	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
255	is($seq, 'Z: 4, Y: 4, X: 1');	255	is($seq, 'Z: 4, Y: 4, X: 1');
256	# 110th is here	256	# 110th is here
257	$publisheddate = GetNextDate($subscription, $publisheddate);	257	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
258	$seq = _next_seq($subscription, $pattern, $publisheddate);	258	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
259	is($seq, 'Z: 4, Y: 4, X: 3');	259	is($seq, 'Z: 4, Y: 4, X: 3');
260	$publisheddate = GetNextDate($subscription, $publisheddate);	260	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
261	$seq = _next_seq($subscription, $pattern, $publisheddate);	261	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
262	is($seq, 'Z: 4, Y: 4, X: 4');	262	is($seq, 'Z: 4, Y: 4, X: 4');
263	$publisheddate = GetNextDate($subscription, $publisheddate);	263	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
264	$seq = _next_seq($subscription, $pattern, $publisheddate);	264	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
265	is($seq, 'Z: 4, Y: 5, X: 1');	265	is($seq, 'Z: 4, Y: 5, X: 1');
266		266
267		267
268	$dbh->rollback;	268	$dbh->rollback;
269		269
270	sub _next_seq {	270	sub _next_seq {
271	my ($subscription, $pattern, $publisheddate) = @_;	271	my ($subscription, $pattern, $frequency, $publisheddate) = @_;
272	my $seq;	272	my $seq;
273	($seq, $subscription->{lastvalue1}, $subscription->{lastvalue2},	273	($seq, $subscription->{lastvalue1}, $subscription->{lastvalue2},
274	$subscription->{lastvalue3}, $subscription->{innerloop1},	274	$subscription->{lastvalue3}, $subscription->{innerloop1},
275	$subscription->{innerloop2}, $subscription->{innerloop3}) =	275	$subscription->{innerloop2}, $subscription->{innerloop3}) =
276	GetNextSeq($subscription, $pattern, $publisheddate);	276	GetNextSeq($subscription, $pattern, $frequency, $publisheddate);
277	return $seq;	277	return $seq;
278	}	278	}
279	-