From b9db6ae0f75b68b0788fd079589f30620fc0ff63 Mon Sep 17 00:00:00 2001 From: Jared Camins-Esakov Date: Sat, 23 Mar 2013 00:36:37 -0400 Subject: [PATCH] Revert "Merge branch 'bug_7688' into 3.12-master" This reverts commit 60508cb03d825f515461c1898361ac0eb3cffb2b, reversing changes made to 8579d07f1474a2393e518b66e9aa6c3464ab2e81. The patches for bug 7688 caused a failure in t/db_dependent/Serials.t: not ok 8 - test getting history from sub-scription Conflicts: installer/data/mysql/kohastructure.sql installer/data/mysql/updatedatabase.pl kohaversion.pl --- C4/Serials.pm | 980 ++++------ C4/Serials/Frequency.pm | 292 --- C4/Serials/Numberpattern.pm | 289 --- .../mysql/de-DE/optional/sample_frequencies.sql | 16 - .../mysql/de-DE/optional/sample_frequencies.txt | 1 - .../mysql/de-DE/optional/sample_numberpatterns.sql | 25 - .../mysql/de-DE/optional/sample_numberpatterns.txt | 1 - .../data/mysql/en/optional/sample_frequencies.sql | 16 - .../data/mysql/en/optional/sample_frequencies.txt | 1 - .../mysql/en/optional/sample_numberpatterns.sql | 25 - .../mysql/en/optional/sample_numberpatterns.txt | 1 - .../mysql/es-ES/optional/sample_frequencies.sql | 16 - .../mysql/es-ES/optional/sample_frequencies.txt | 1 - .../mysql/es-ES/optional/sample_numberpatterns.sql | 25 - .../mysql/es-ES/optional/sample_numberpatterns.txt | 1 - .../mysql/fr-FR/2-Optionel/sample_frequencies.sql | 16 - .../mysql/fr-FR/2-Optionel/sample_frequencies.txt | 1 - .../fr-FR/2-Optionel/sample_numberpatterns.sql | 25 - .../fr-FR/2-Optionel/sample_numberpatterns.txt | 1 - .../mysql/it-IT/optional/sample_frequencies.sql | 16 - .../mysql/it-IT/optional/sample_frequencies.txt | 1 - .../mysql/it-IT/optional/sample_numberpatterns.sql | 25 - .../mysql/it-IT/optional/sample_numberpatterns.txt | 1 - installer/data/mysql/kohastructure.sql | 74 +- .../mysql/nb-NO/2-Valgfritt/sample_frequencies.sql | 16 - .../mysql/nb-NO/2-Valgfritt/sample_frequencies.txt | 1 - .../nb-NO/2-Valgfritt/sample_numberpatterns.sql | 25 - .../nb-NO/2-Valgfritt/sample_numberpatterns.txt | 1 - .../mysql/pl-PL/optional/sample_frequencies.sql | 16 - .../mysql/pl-PL/optional/sample_frequencies.txt | 1 - .../mysql/pl-PL/optional/sample_numberpatterns.sql | 25 - .../mysql/pl-PL/optional/sample_numberpatterns.txt | 1 - .../mysql/ru-RU/optional/sample_frequencies.sql | 16 - .../mysql/ru-RU/optional/sample_frequencies.txt | 1 - .../mysql/ru-RU/optional/sample_numberpatterns.sql | 25 - .../mysql/ru-RU/optional/sample_numberpatterns.txt | 1 - .../mysql/uk-UA/optional/sample_frequencies.sql | 16 - .../mysql/uk-UA/optional/sample_frequencies.txt | 1 - .../mysql/uk-UA/optional/sample_numberpatterns.sql | 25 - .../mysql/uk-UA/optional/sample_numberpatterns.txt | 1 - installer/data/mysql/updatedatabase.pl | 253 --- .../prog/en/includes/serials-menu.inc | 10 - .../prog/en/modules/serials/serials-collection.tt | 63 +- .../en/modules/serials/showpredictionpattern.tt | 82 - .../prog/en/modules/serials/subscription-add.tt | 2016 +++++++++++++------- .../prog/en/modules/serials/subscription-detail.tt | 143 +- .../en/modules/serials/subscription-frequencies.tt | 215 --- .../en/modules/serials/subscription-history.tt | 60 - .../modules/serials/subscription-numberpatterns.tt | 333 ---- serials/create-numberpattern.pl | 42 - serials/serials-collection.pl | 70 +- serials/serials-recieve.pl | 9 +- serials/showpredictionpattern.pl | 194 -- serials/subscription-add.pl | 254 +-- serials/subscription-detail.pl | 20 +- serials/subscription-frequencies.pl | 120 -- serials/subscription-frequency.pl | 19 - serials/subscription-history.pl | 87 - serials/subscription-numberpattern.pl | 15 - serials/subscription-numberpatterns.pl | 150 -- 60 files changed, 2010 insertions(+), 4167 deletions(-) delete mode 100644 C4/Serials/Frequency.pm delete mode 100644 C4/Serials/Numberpattern.pm delete mode 100644 installer/data/mysql/de-DE/optional/sample_frequencies.sql delete mode 100644 installer/data/mysql/de-DE/optional/sample_frequencies.txt delete mode 100644 installer/data/mysql/de-DE/optional/sample_numberpatterns.sql delete mode 100644 installer/data/mysql/de-DE/optional/sample_numberpatterns.txt delete mode 100644 installer/data/mysql/en/optional/sample_frequencies.sql delete mode 100644 installer/data/mysql/en/optional/sample_frequencies.txt delete mode 100644 installer/data/mysql/en/optional/sample_numberpatterns.sql delete mode 100644 installer/data/mysql/en/optional/sample_numberpatterns.txt delete mode 100644 installer/data/mysql/es-ES/optional/sample_frequencies.sql delete mode 100644 installer/data/mysql/es-ES/optional/sample_frequencies.txt delete mode 100644 installer/data/mysql/es-ES/optional/sample_numberpatterns.sql delete mode 100644 installer/data/mysql/es-ES/optional/sample_numberpatterns.txt delete mode 100644 installer/data/mysql/fr-FR/2-Optionel/sample_frequencies.sql delete mode 100644 installer/data/mysql/fr-FR/2-Optionel/sample_frequencies.txt delete mode 100644 installer/data/mysql/fr-FR/2-Optionel/sample_numberpatterns.sql delete mode 100644 installer/data/mysql/fr-FR/2-Optionel/sample_numberpatterns.txt delete mode 100644 installer/data/mysql/it-IT/optional/sample_frequencies.sql delete mode 100644 installer/data/mysql/it-IT/optional/sample_frequencies.txt delete mode 100644 installer/data/mysql/it-IT/optional/sample_numberpatterns.sql delete mode 100644 installer/data/mysql/it-IT/optional/sample_numberpatterns.txt delete mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/sample_frequencies.sql delete mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/sample_frequencies.txt delete mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/sample_numberpatterns.sql delete mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/sample_numberpatterns.txt delete mode 100644 installer/data/mysql/pl-PL/optional/sample_frequencies.sql delete mode 100644 installer/data/mysql/pl-PL/optional/sample_frequencies.txt delete mode 100644 installer/data/mysql/pl-PL/optional/sample_numberpatterns.sql delete mode 100644 installer/data/mysql/pl-PL/optional/sample_numberpatterns.txt delete mode 100644 installer/data/mysql/ru-RU/optional/sample_frequencies.sql delete mode 100644 installer/data/mysql/ru-RU/optional/sample_frequencies.txt delete mode 100644 installer/data/mysql/ru-RU/optional/sample_numberpatterns.sql delete mode 100644 installer/data/mysql/ru-RU/optional/sample_numberpatterns.txt delete mode 100644 installer/data/mysql/uk-UA/optional/sample_frequencies.sql delete mode 100644 installer/data/mysql/uk-UA/optional/sample_frequencies.txt delete mode 100644 installer/data/mysql/uk-UA/optional/sample_numberpatterns.sql delete mode 100644 installer/data/mysql/uk-UA/optional/sample_numberpatterns.txt delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt delete mode 100755 serials/create-numberpattern.pl delete mode 100755 serials/showpredictionpattern.pl delete mode 100755 serials/subscription-frequencies.pl delete mode 100755 serials/subscription-frequency.pl delete mode 100755 serials/subscription-history.pl delete mode 100755 serials/subscription-numberpattern.pl delete mode 100755 serials/subscription-numberpatterns.pl diff --git a/C4/Serials.pm b/C4/Serials.pm index a1597c8a13..b8b53ed21f 100644 --- a/C4/Serials.pm +++ b/C4/Serials.pm @@ -18,16 +18,14 @@ package C4::Serials; # with Koha; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -use Modern::Perl; - +use strict; +use warnings; use C4::Dates qw(format_date format_date_in_iso); use Date::Calc qw(:all); -use POSIX qw(strftime setlocale LC_TIME); +use POSIX qw(strftime); use C4::Biblio; use C4::Log; # logaction use C4::Debug; -use C4::Serials::Frequency; -use C4::Serials::Numberpattern; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); @@ -41,9 +39,8 @@ BEGIN { &SearchSubscriptions &GetFullSubscriptionsFromBiblionumber &GetFullSubscription &ModSubscriptionHistory &HasSubscriptionStrictlyExpired &HasSubscriptionExpired &GetExpirationDate &abouttoexpire - &GetSubscriptionHistoryFromSubscriptionId - &GetNextSeq &GetSeq &NewIssue &ItemizeSerials &GetSerials + &GetNextSeq &NewIssue &ItemizeSerials &GetSerials &GetLatestSerials &ModSerialStatus &GetNextDate &GetSerials2 &ReNewSubscription &GetLateIssues &GetLateOrMissingIssues &GetSerialInformation &AddItem2Serial @@ -166,29 +163,20 @@ sub GetLateIssues { =head2 GetSubscriptionHistoryFromSubscriptionId -$history = GetSubscriptionHistoryFromSubscriptionId($subscriptionid); - -This function returns the subscription history as a hashref +$sth = GetSubscriptionHistoryFromSubscriptionId() +this function prepares the SQL request and returns the statement handle +After this function, don't forget to execute it by using $sth->execute($subscriptionid) =cut sub GetSubscriptionHistoryFromSubscriptionId { - my ($subscriptionid) = @_; - - return unless $subscriptionid; - my $dbh = C4::Context->dbh; my $query = qq| SELECT * FROM subscriptionhistory WHERE subscriptionid = ? |; - my $sth = $dbh->prepare($query); - $sth->execute($subscriptionid); - my $results = $sth->fetchrow_hashref; - $sth->finish; - - return $results; + return $dbh->prepare($query); } =head2 GetSerialStatusFromSerialId @@ -582,7 +570,7 @@ sub GetSubscriptions { my $dbh = C4::Context->dbh; my $sth; my $sql = qq( - SELECT subscriptionhistory.*, subscription.*, biblio.title,biblioitems.issn,biblio.biblionumber + SELECT subscription.*, subscriptionhistory.*, biblio.title,biblioitems.issn,biblio.biblionumber FROM subscription LEFT JOIN subscriptionhistory USING(subscriptionid) LEFT JOIN biblio ON biblio.biblionumber = subscription.biblionumber @@ -890,131 +878,128 @@ sub GetDistributedTo { =head2 GetNextSeq - my ( - $nextseq, $newlastvalue1, $newlastvalue2, $newlastvalue3, - $newinnerloop1, $newinnerloop2, $newinnerloop3 - ) = GetNextSeq( $subscription, $pattern, $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'. -$planneddate is a C4::Dates object. +GetNextSeq($val) +$val is a hashref containing all the attributes of the table 'subscription' This function get the next issue for the subscription given on input arg +return: +a list containing all the input params updated. =cut +# sub GetNextSeq { +# my ($val) =@_; +# my ($calculated,$newlastvalue1,$newlastvalue2,$newlastvalue3,$newinnerloop1,$newinnerloop2,$newinnerloop3); +# $calculated = $val->{numberingmethod}; +# # calculate the (expected) value of the next issue recieved. +# $newlastvalue1 = $val->{lastvalue1}; +# # check if we have to increase the new value. +# $newinnerloop1 = $val->{innerloop1}+1; +# $newinnerloop1=0 if ($newinnerloop1 >= $val->{every1}); +# $newlastvalue1 += $val->{add1} if ($newinnerloop1<1); # <1 to be true when 0 or empty. +# $newlastvalue1=$val->{setto1} if ($newlastvalue1>$val->{whenmorethan1}); # reset counter if needed. +# $calculated =~ s/\{X\}/$newlastvalue1/g; +# +# $newlastvalue2 = $val->{lastvalue2}; +# # check if we have to increase the new value. +# $newinnerloop2 = $val->{innerloop2}+1; +# $newinnerloop2=0 if ($newinnerloop2 >= $val->{every2}); +# $newlastvalue2 += $val->{add2} if ($newinnerloop2<1); # <1 to be true when 0 or empty. +# $newlastvalue2=$val->{setto2} if ($newlastvalue2>$val->{whenmorethan2}); # reset counter if needed. +# $calculated =~ s/\{Y\}/$newlastvalue2/g; +# +# $newlastvalue3 = $val->{lastvalue3}; +# # check if we have to increase the new value. +# $newinnerloop3 = $val->{innerloop3}+1; +# $newinnerloop3=0 if ($newinnerloop3 >= $val->{every3}); +# $newlastvalue3 += $val->{add3} if ($newinnerloop3<1); # <1 to be true when 0 or empty. +# $newlastvalue3=$val->{setto3} if ($newlastvalue3>$val->{whenmorethan3}); # reset counter if needed. +# $calculated =~ s/\{Z\}/$newlastvalue3/g; +# return ($calculated,$newlastvalue1,$newlastvalue2,$newlastvalue3,$newinnerloop1,$newinnerloop2,$newinnerloop3); +# } + sub GetNextSeq { - my ($subscription, $pattern, $planneddate) = @_; - my ( $calculated, $newlastvalue1, $newlastvalue2, $newlastvalue3, - $newinnerloop1, $newinnerloop2, $newinnerloop3 ); - my $count = 1; - - if ($subscription->{'skip_serialseq'}) { - my @irreg = split /;/, $subscription->{'irregularity'}; - if(@irreg > 0) { - my $irregularities = {}; - $irregularities->{$_} = 1 foreach(@irreg); - my $issueno = GetFictiveIssueNumber($subscription, $planneddate) + 1; - while($irregularities->{$issueno}) { - $count++; - $issueno++; - } - } - } + my ($val) = @_; + my ( $calculated, $newlastvalue1, $newlastvalue2, $newlastvalue3, $newinnerloop1, $newinnerloop2, $newinnerloop3 ); + my $pattern = $val->{numberpattern}; + my @seasons = ( 'nothing', 'Winter', 'Spring', 'Summer', 'Autumn' ); + my @southern_seasons = ( '', 'Summer', 'Autumn', 'Winter', 'Spring' ); + $calculated = $val->{numberingmethod}; + $newlastvalue1 = $val->{lastvalue1}; + $newlastvalue2 = $val->{lastvalue2}; + $newlastvalue3 = $val->{lastvalue3}; + $newlastvalue1 = $val->{lastvalue1}; + + # check if we have to increase the new value. + $newinnerloop1 = $val->{innerloop1} + 1; + $newinnerloop1 = 0 if ( $newinnerloop1 >= $val->{every1} ); + $newlastvalue1 += $val->{add1} if ( $newinnerloop1 < 1 ); # <1 to be true when 0 or empty. + $newlastvalue1 = $val->{setto1} if ( $newlastvalue1 > $val->{whenmorethan1} ); # reset counter if needed. + $calculated =~ s/\{X\}/$newlastvalue1/g; - my $numberingmethod = $pattern->{numberingmethod}; - $calculated = $numberingmethod; - my $locale = $subscription->{locale}; - $newlastvalue1 = $subscription->{lastvalue1} || 0; - $newlastvalue2 = $subscription->{lastvalue2} || 0; - $newlastvalue3 = $subscription->{lastvalue3} || 0; - $newinnerloop1 = $subscription->{innerloop1} || 0; - $newinnerloop2 = $subscription->{innerloop2} || 0; - $newinnerloop3 = $subscription->{innerloop3} || 0; - my %calc; - foreach(qw/X Y Z/) { - $calc{$_} = 1 if ($numberingmethod =~ /\{$_\}/); - } - - for(my $i = 0; $i < $count; $i++) { - if($calc{'X'}) { - # check if we have to increase the new value. - $newinnerloop1 += 1; - if ($newinnerloop1 >= $pattern->{every1}) { - $newinnerloop1 = 0; - $newlastvalue1 += $pattern->{add1}; - } - # reset counter if needed. - $newlastvalue1 = $pattern->{setto1} if ($newlastvalue1 > $pattern->{whenmorethan1}); - } - if($calc{'Y'}) { - # check if we have to increase the new value. - $newinnerloop2 += 1; - if ($newinnerloop2 >= $pattern->{every2}) { - $newinnerloop2 = 0; - $newlastvalue2 += $pattern->{add2}; - } - # reset counter if needed. - $newlastvalue2 = $pattern->{setto2} if ($newlastvalue2 > $pattern->{whenmorethan2}); - } - if($calc{'Z'}) { - # check if we have to increase the new value. - $newinnerloop3 += 1; - if ($newinnerloop3 >= $pattern->{every3}) { - $newinnerloop3 = 0; - $newlastvalue3 += $pattern->{add3}; - } - # reset counter if needed. - $newlastvalue3 = $pattern->{setto3} if ($newlastvalue3 > $pattern->{whenmorethan3}); + $newlastvalue2 = $val->{lastvalue2}; + + # check if we have to increase the new value. + $newinnerloop2 = $val->{innerloop2} + 1; + $newinnerloop2 = 0 if ( $newinnerloop2 >= $val->{every2} ); + $newlastvalue2 += $val->{add2} if ( $newinnerloop2 < 1 ); # <1 to be true when 0 or empty. + $newlastvalue2 = $val->{setto2} if ( $newlastvalue2 > $val->{whenmorethan2} ); # reset counter if needed. + if ( $pattern == 6 ) { + if ( $val->{hemisphere} == 2 ) { + my $newlastvalue2seq = $southern_seasons[$newlastvalue2]; + $calculated =~ s/\{Y\}/$newlastvalue2seq/g; + } else { + my $newlastvalue2seq = $seasons[$newlastvalue2]; + $calculated =~ s/\{Y\}/$newlastvalue2seq/g; } + } else { + $calculated =~ s/\{Y\}/$newlastvalue2/g; } - if($calc{'X'}) { - my $newlastvalue1string = _numeration( $newlastvalue1, $pattern->{numbering1}, $locale ); - $calculated =~ s/\{X\}/$newlastvalue1string/g; - } - if($calc{'Y'}) { - my $newlastvalue2string = _numeration( $newlastvalue2, $pattern->{numbering2}, $locale ); - $calculated =~ s/\{Y\}/$newlastvalue2string/g; - } - if($calc{'Z'}) { - my $newlastvalue3string = _numeration( $newlastvalue3, $pattern->{numbering3}, $locale ); - $calculated =~ s/\{Z\}/$newlastvalue3string/g; - } - return ($calculated, - $newlastvalue1, $newlastvalue2, $newlastvalue3, - $newinnerloop1, $newinnerloop2, $newinnerloop3); + $newlastvalue3 = $val->{lastvalue3}; + + # check if we have to increase the new value. + $newinnerloop3 = $val->{innerloop3} + 1; + $newinnerloop3 = 0 if ( $newinnerloop3 >= $val->{every3} ); + $newlastvalue3 += $val->{add3} if ( $newinnerloop3 < 1 ); # <1 to be true when 0 or empty. + $newlastvalue3 = $val->{setto3} if ( $newlastvalue3 > $val->{whenmorethan3} ); # reset counter if needed. + $calculated =~ s/\{Z\}/$newlastvalue3/g; + + return ( $calculated, $newlastvalue1, $newlastvalue2, $newlastvalue3, $newinnerloop1, $newinnerloop2, $newinnerloop3 ); } =head2 GetSeq -$calculated = GetSeq($subscription, $pattern) -$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' +$calculated = GetSeq($val) +$val is a hashref containing all the attributes of the table 'subscription' this function transforms {X},{Y},{Z} to 150,0,0 for example. return: -the sequence in string format +the sequence in integer format =cut sub GetSeq { - my ($subscription, $pattern) = @_; - my $locale = $subscription->{locale}; - - my $calculated = $pattern->{numberingmethod}; - - my $newlastvalue1 = $subscription->{'lastvalue1'} || 0; - $newlastvalue1 = _numeration($newlastvalue1, $pattern->{numbering1}, $locale) if ($pattern->{numbering1}); # reset counter if needed. - $calculated =~ s/\{X\}/$newlastvalue1/g; - - my $newlastvalue2 = $subscription->{'lastvalue2'} || 0; - $newlastvalue2 = _numeration($newlastvalue2, $pattern->{numbering2}, $locale) if ($pattern->{numbering2}); # reset counter if needed. - $calculated =~ s/\{Y\}/$newlastvalue2/g; - - my $newlastvalue3 = $subscription->{'lastvalue3'} || 0; - $newlastvalue3 = _numeration($newlastvalue3, $pattern->{numbering3}, $locale) if ($pattern->{numbering3}); # reset counter if needed. - $calculated =~ s/\{Z\}/$newlastvalue3/g; + my ($val) = @_; + my $pattern = $val->{numberpattern}; + my @seasons = ( 'nothing', 'Winter', 'Spring', 'Summer', 'Autumn' ); + my @southern_seasons = ( '', 'Summer', 'Autumn', 'Winter', 'Spring' ); + my $calculated = $val->{numberingmethod}; + my $x = $val->{'lastvalue1'}; + $calculated =~ s/\{X\}/$x/g; + my $newlastvalue2 = $val->{'lastvalue2'}; + + if ( $pattern == 6 ) { + if ( $val->{hemisphere} == 2 ) { + my $newlastvalue2seq = $southern_seasons[$newlastvalue2]; + $calculated =~ s/\{Y\}/$newlastvalue2seq/g; + } else { + my $newlastvalue2seq = $seasons[$newlastvalue2]; + $calculated =~ s/\{Y\}/$newlastvalue2seq/g; + } + } else { + $calculated =~ s/\{Y\}/$newlastvalue2/g; + } + my $z = $val->{'lastvalue3'}; + $calculated =~ s/\{Z\}/$z/g; return $calculated; } @@ -1039,15 +1024,14 @@ sub GetExpirationDate { $enddate = $startdate || $subscription->{startdate}; my @date = split( /-/, $enddate ); return if ( scalar(@date) != 3 || not check_date(@date) ); - my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subscription->{periodicity}); - if ( $frequency and $frequency->{unit} ) { + if ( ( $subscription->{periodicity} % 16 ) > 0 ) { # If Not Irregular if ( my $length = $subscription->{numberlength} ) { #calculate the date of the last issue. for ( my $i = 1 ; $i <= $length ; $i++ ) { - $enddate = GetNextDate( $subscription, $enddate ); + $enddate = GetNextDate( $enddate, $subscription ); } } elsif ( $subscription->{monthlength} ) { if ( $$subscription{startdate} ) { @@ -1060,12 +1044,10 @@ sub GetExpirationDate { my @enddate = Add_Delta_Days( $date[0], $date[1], $date[2], $subscription->{weeklength} * 7 ); $enddate = sprintf( "%04d-%02d-%02d", $enddate[0], $enddate[1], $enddate[2] ); } - } else { - $enddate = $subscription->{enddate}; } return $enddate; } else { - return $subscription->{enddate}; + return; } } @@ -1098,64 +1080,20 @@ returns the number of rows affected =cut sub ModSubscriptionHistory { - my ( $subscriptionid, $histstartdate, $enddate, $receivedlist, $missinglist, $opacnote, $librariannote ) = @_; + my ( $subscriptionid, $histstartdate, $enddate, $recievedlist, $missinglist, $opacnote, $librariannote ) = @_; my $dbh = C4::Context->dbh; my $query = "UPDATE subscriptionhistory SET histstartdate=?,histenddate=?,recievedlist=?,missinglist=?,opacnote=?,librariannote=? WHERE subscriptionid=? "; my $sth = $dbh->prepare($query); - $receivedlist =~ s/^; // if $receivedlist; - $missinglist =~ s/^; // if $missinglist; - $opacnote =~ s/^; // if $opacnote; - $sth->execute( $histstartdate, $enddate, $receivedlist, $missinglist, $opacnote, $librariannote, $subscriptionid ); + $recievedlist =~ s/^; //; + $missinglist =~ s/^; //; + $opacnote =~ s/^; //; + $sth->execute( $histstartdate, $enddate, $recievedlist, $missinglist, $opacnote, $librariannote, $subscriptionid ); return $sth->rows; } -# Update missinglist field, used by ModSerialStatus -sub _update_missinglist { - my $subscriptionid = shift; - - my $dbh = C4::Context->dbh; - my @missingserials = GetSerials2($subscriptionid, "4,5"); - my $missinglist; - foreach (@missingserials) { - if($_->{'status'} == 4) { - $missinglist .= $_->{'serialseq'} . "; "; - } elsif($_->{'status'} == 5) { - $missinglist .= "not issued " . $_->{'serialseq'} . "; "; - } - } - $missinglist =~ s/; $//; - my $query = qq{ - UPDATE subscriptionhistory - SET missinglist = ? - WHERE subscriptionid = ? - }; - my $sth = $dbh->prepare($query); - $sth->execute($missinglist, $subscriptionid); -} - -# Update recievedlist field, used by ModSerialStatus -sub _update_receivedlist { - my $subscriptionid = shift; - - my $dbh = C4::Context->dbh; - my @receivedserials = GetSerials2($subscriptionid, "2"); - my $receivedlist; - foreach (@receivedserials) { - $receivedlist .= $_->{'serialseq'} . "; "; - } - $receivedlist =~ s/; $//; - my $query = qq{ - UPDATE subscriptionhistory - SET recievedlist = ? - WHERE subscriptionid = ? - }; - my $sth = $dbh->prepare($query); - $sth->execute($receivedlist, $subscriptionid); -} - =head2 ModSerialStatus ModSerialStatus($serialid,$serialseq, $planneddate,$publisheddate,$status,$notes) @@ -1168,30 +1106,22 @@ Note : if we change from "waited" to something else,then we will have to create sub ModSerialStatus { my ( $serialid, $serialseq, $planneddate, $publisheddate, $status, $notes ) = @_; - #It is a usual serial # 1st, get previous status : my $dbh = C4::Context->dbh; - my $query = "SELECT serial.subscriptionid,serial.status,subscription.periodicity - FROM serial, subscription - WHERE serial.subscriptionid=subscription.subscriptionid - AND serialid=?"; + my $query = "SELECT subscriptionid,status FROM serial WHERE serialid=?"; my $sth = $dbh->prepare($query); $sth->execute($serialid); - my ( $subscriptionid, $oldstatus, $periodicity ) = $sth->fetchrow; - my $frequency = GetSubscriptionFrequency($periodicity); + my ( $subscriptionid, $oldstatus ) = $sth->fetchrow; # change status & update subscriptionhistory my $val; if ( $status == 6 ) { - DelIssue( { 'serialid' => $serialid, 'subscriptionid' => $subscriptionid, 'serialseq' => $serialseq } ); - } else { - - unless ($frequency->{'unit'}) { - if ( not $planneddate or $planneddate eq '0000-00-00' ) { $planneddate = C4::Dates->new()->output('iso') }; - if ( not $publisheddate or $publisheddate eq '0000-00-00' ) { $publisheddate = C4::Dates->new()->output('iso') }; - } - my $query = 'UPDATE serial SET serialseq=?,publisheddate=?,planneddate=?,status=?,notes=? WHERE serialid = ?'; + DelIssue( {'serialid'=>$serialid, 'subscriptionid'=>$subscriptionid,'serialseq'=>$serialseq} ); + } + else { + my $query = +'UPDATE serial SET serialseq=?,publisheddate=?,planneddate=?,status=?,notes=? WHERE serialid = ?'; $sth = $dbh->prepare($query); $sth->execute( $serialseq, $publisheddate, $planneddate, $status, $notes, $serialid ); $query = "SELECT * FROM subscription WHERE subscriptionid = ?"; @@ -1199,45 +1129,58 @@ sub ModSerialStatus { $sth->execute($subscriptionid); my $val = $sth->fetchrow_hashref; unless ( $val->{manualhistory} ) { - if ( $status == 2 || ($oldstatus == 2 && $status != 2) ) { - _update_receivedlist($subscriptionid); - } - if($status == 4 || $status == 5 - || ($oldstatus == 4 && $status != 4) - || ($oldstatus == 5 && $status != 5)) { - _update_missinglist($subscriptionid); + $query = "SELECT missinglist,recievedlist FROM subscriptionhistory WHERE subscriptionid=?"; + $sth = $dbh->prepare($query); + $sth->execute($subscriptionid); + my ( $missinglist, $recievedlist ) = $sth->fetchrow; + if ( $status == 2 ) { + + $recievedlist .= "; $serialseq" + unless ( index( "$recievedlist", "$serialseq" ) >= 0 ); } + + # warn "missinglist : $missinglist serialseq :$serialseq, ".index("$missinglist","$serialseq"); + $missinglist .= "; $serialseq" + if ( $status == 4 + and not index( "$missinglist", "$serialseq" ) >= 0 ); + $missinglist .= "; not issued $serialseq" + if ( $status == 5 + and index( "$missinglist", "$serialseq" ) >= 0 ); + $query = "UPDATE subscriptionhistory SET recievedlist=?, missinglist=? WHERE subscriptionid=?"; + $sth = $dbh->prepare($query); + $recievedlist =~ s/^; //; + $missinglist =~ s/^; //; + $sth->execute( $recievedlist, $missinglist, $subscriptionid ); } } # create new waited entry if needed (ie : was a "waited" and has changed) if ( $oldstatus == 1 && $status != 1 ) { - my $subscription = GetSubscription($subscriptionid); - my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscription->{numberpattern}); + my $query = "SELECT * FROM subscription WHERE subscriptionid = ?"; + $sth = $dbh->prepare($query); + $sth->execute($subscriptionid); + my $val = $sth->fetchrow_hashref; # next issue number my ( $newserialseq, $newlastvalue1, $newlastvalue2, $newlastvalue3, $newinnerloop1, $newinnerloop2, $newinnerloop3 - ) - = GetNextSeq( $subscription, $pattern, $publisheddate ); + ) = GetNextSeq($val); # next date (calculated from actual date & frequency parameters) - my $nextpublisheddate = GetNextDate($subscription, $publisheddate, 1); - my $nextpubdate = $nextpublisheddate; - NewIssue( $newserialseq, $subscriptionid, $subscription->{'biblionumber'}, 1, $nextpubdate, $nextpubdate ); + my $nextpublisheddate = GetNextDate( $publisheddate, $val ); + NewIssue( $newserialseq, $subscriptionid, $val->{'biblionumber'}, 1, $nextpublisheddate, $nextpublisheddate ); $query = "UPDATE subscription SET lastvalue1=?, lastvalue2=?, lastvalue3=?, innerloop1=?, innerloop2=?, innerloop3=? WHERE subscriptionid = ?"; $sth = $dbh->prepare($query); $sth->execute( $newlastvalue1, $newlastvalue2, $newlastvalue3, $newinnerloop1, $newinnerloop2, $newinnerloop3, $subscriptionid ); - # check if an alert must be sent... (= a letter is defined & status became "arrived" - if ( $subscription->{letter} && $status == 2 && $oldstatus != 2 ) { +# check if an alert must be sent... (= a letter is defined & status became "arrived" + if ( $val->{letter} && $status == 2 && $oldstatus != 2 ) { require C4::Letters; - C4::Letters::SendAlerts( 'issue', $subscription->{subscriptionid}, $subscription->{letter} ); + C4::Letters::SendAlerts( 'issue', $val->{subscriptionid}, $val->{letter} ); } } - return; } @@ -1251,50 +1194,31 @@ returns a hashref: $nextexepected = { serialid => int - planneddate => ISO date + planneddate => C4::Dates object } =cut sub GetNextExpected { my ($subscriptionid) = @_; - - my $dbh = C4::Context->dbh; - my $query = qq{ - SELECT * - FROM serial - WHERE subscriptionid = ? - AND status = ? - LIMIT 1 - }; - my $sth = $dbh->prepare($query); + my $dbh = C4::Context->dbh; + my $sth = $dbh->prepare('SELECT serialid, planneddate FROM serial WHERE subscriptionid=? AND status=?'); # Each subscription has only one 'expected' issue, with serial.status==1. $sth->execute( $subscriptionid, 1 ); - my $nextissue = $sth->fetchrow_hashref; - if ( !$nextissue ) { - $query = qq{ - SELECT * - FROM serial - WHERE subscriptionid = ? - ORDER BY publisheddate DESC - LIMIT 1 - }; - $sth = $dbh->prepare($query); - $sth->execute($subscriptionid); - $nextissue = $sth->fetchrow_hashref; + my ( $nextissue ) = $sth->fetchrow_hashref; + if( !$nextissue){ + $sth = $dbh->prepare('SELECT serialid,planneddate FROM serial WHERE subscriptionid = ? ORDER BY planneddate DESC LIMIT 1'); + $sth->execute( $subscriptionid ); + $nextissue = $sth->fetchrow_hashref; } - foreach(qw/planneddate publisheddate/) { - if ( !defined $nextissue->{$_} ) { - # or should this default to 1st Jan ??? - $nextissue->{$_} = strftime( '%Y-%m-%d', localtime ); - } - $nextissue->{$_} = ($nextissue->{$_} ne '0000-00-00') - ? $nextissue->{$_} - : undef; + if (!defined $nextissue->{planneddate}) { + # or should this default to 1st Jan ??? + $nextissue->{planneddate} = strftime('%Y-%m-%d',localtime); } - + $nextissue->{planneddate} = C4::Dates->new($nextissue->{planneddate},'iso'); return $nextissue; + } =head2 ModNextExpected @@ -1304,7 +1228,7 @@ ModNextExpected($subscriptionid,$date) Update the planneddate for the current expected issue of the subscription. This will modify all future prediction results. -C<$date> is an ISO date. +C<$date> is a C4::Dates object. returns 0 @@ -1318,42 +1242,11 @@ sub ModNextExpected { my $sth = $dbh->prepare('UPDATE serial SET planneddate=?,publisheddate=? WHERE subscriptionid=? AND status=?'); # Each subscription has only one 'expected' issue, with serial.status==1. - $sth->execute( $date, $date, $subscriptionid, 1 ); + $sth->execute( $date->output('iso'), $date->output('iso'), $subscriptionid, 1 ); return 0; } -=head2 GetSubscriptionIrregularities - -=over 4 - -=item @irreg = &GetSubscriptionIrregularities($subscriptionid); -get the list of irregularities for a subscription - -=back - -=cut - -sub GetSubscriptionIrregularities { - my $subscriptionid = shift; - - return unless $subscriptionid; - - my $dbh = C4::Context->dbh; - my $query = qq{ - SELECT irregularity - FROM subscription - WHERE subscriptionid = ? - }; - my $sth = $dbh->prepare($query); - $sth->execute($subscriptionid); - - my ($result) = $sth->fetchrow_array; - my @irreg = split /;/, $result; - - return @irreg; -} - =head2 ModSubscription this function modifies a subscription. Put all new values on input args. @@ -1362,41 +1255,43 @@ returns the number of rows affected =cut sub ModSubscription { - my ( - $auser, $branchcode, $aqbooksellerid, $cost, $aqbudgetid, $startdate, - $periodicity, $firstacquidate, $irregularity, $numberpattern, $locale, - $numberlength, $weeklength, $monthlength, $lastvalue1, $innerloop1, - $lastvalue2, $innerloop2, $lastvalue3, $innerloop3, $status, - $biblionumber, $callnumber, $notes, $letter, $manualhistory, - $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, - $graceperiod, $location, $enddate, $subscriptionid, $skip_serialseq + my ($auser, $branchcode, $aqbooksellerid, $cost, $aqbudgetid, $startdate, $periodicity, $firstacquidate, + $dow, $irregularity, $numberpattern, $numberlength, $weeklength, $monthlength, $add1, $every1, + $whenmorethan1, $setto1, $lastvalue1, $innerloop1, $add2, $every2, $whenmorethan2, $setto2, + $lastvalue2, $innerloop2, $add3, $every3, $whenmorethan3, $setto3, $lastvalue3, $innerloop3, + $numberingmethod, $status, $biblionumber, $callnumber, $notes, $letter, $hemisphere, $manualhistory, + $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate, $subscriptionid ) = @_; + # warn $irregularity; my $dbh = C4::Context->dbh; my $query = "UPDATE subscription - SET librarian=?, branchcode=?, aqbooksellerid=?, cost=?, aqbudgetid=?, - startdate=?, periodicity=?, firstacquidate=?, irregularity=?, - numberpattern=?, locale=?, numberlength=?, weeklength=?, monthlength=?, - lastvalue1=?, innerloop1=?, lastvalue2=?, innerloop2=?, - lastvalue3=?, innerloop3=?, status=?, biblionumber=?, - callnumber=?, notes=?, letter=?, manualhistory=?, - internalnotes=?, serialsadditems=?, staffdisplaycount=?, - opacdisplaycount=?, graceperiod=?, location = ?, enddate=?, - skip_serialseq=? - WHERE subscriptionid = ?"; - + SET librarian=?, branchcode=?,aqbooksellerid=?,cost=?,aqbudgetid=?,startdate=?, + periodicity=?,firstacquidate=?,dow=?,irregularity=?, numberpattern=?, numberlength=?,weeklength=?,monthlength=?, + add1=?,every1=?,whenmorethan1=?,setto1=?,lastvalue1=?,innerloop1=?, + add2=?,every2=?,whenmorethan2=?,setto2=?,lastvalue2=?,innerloop2=?, + add3=?,every3=?,whenmorethan3=?,setto3=?,lastvalue3=?,innerloop3=?, + numberingmethod=?, status=?, biblionumber=?, callnumber=?, notes=?, + letter=?, hemisphere=?,manualhistory=?,internalnotes=?,serialsadditems=?, + staffdisplaycount = ?,opacdisplaycount = ?, graceperiod = ?, location = ? + ,enddate=? + WHERE subscriptionid = ?"; + + #warn "query :".$query; my $sth = $dbh->prepare($query); $sth->execute( $auser, $branchcode, $aqbooksellerid, $cost, $aqbudgetid, $startdate, $periodicity, $firstacquidate, - $irregularity, $numberpattern, $locale, $numberlength, - $weeklength, $monthlength, $lastvalue1, $innerloop1, - $lastvalue2, $innerloop2, $lastvalue3, $innerloop3, - $status, $biblionumber, $callnumber, $notes, - $letter, ($manualhistory ? $manualhistory : 0), + $dow, "$irregularity", $numberpattern, $numberlength, + $weeklength, $monthlength, $add1, $every1, + $whenmorethan1, $setto1, $lastvalue1, $innerloop1, + $add2, $every2, $whenmorethan2, $setto2, + $lastvalue2, $innerloop2, $add3, $every3, + $whenmorethan3, $setto3, $lastvalue3, $innerloop3, + $numberingmethod, $status, $biblionumber, $callnumber, + $notes, $letter, $hemisphere, ( $manualhistory ? $manualhistory : 0 ), $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, - $graceperiod, $location, $enddate, $skip_serialseq, - $subscriptionid + $graceperiod, $location, $enddate, $subscriptionid ); my $rows = $sth->rows; @@ -1408,10 +1303,11 @@ sub ModSubscription { $subscriptionid = &NewSubscription($auser,branchcode,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber, $startdate,$periodicity,$dow,$numberlength,$weeklength,$monthlength, - $lastvalue1,$innerloop1,$lastvalue2,$innerloop2,$lastvalue3,$innerloop3, - $status, $notes, $letter, $firstacquidate, $irregularity, $numberpattern, - $callnumber, $hemisphere, $manualhistory, $internalnotes, $serialsadditems, - $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate, $skip_serialseq); + $add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1, + $add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2, + $add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3, + $numberingmethod, $status, $notes, $serialsadditems, + $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate); Create a new subscription with value given on input args. @@ -1421,44 +1317,42 @@ the id of this new subscription =cut sub NewSubscription { - my ( - $auser, $branchcode, $aqbooksellerid, $cost, $aqbudgetid, $biblionumber, - $startdate, $periodicity, $numberlength, $weeklength, $monthlength, - $lastvalue1, $innerloop1, $lastvalue2, $innerloop2, $lastvalue3, - $innerloop3, $status, $notes, $letter, $firstacquidate, $irregularity, - $numberpattern, $locale, $callnumber, $manualhistory, $internalnotes, - $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, - $location, $enddate, $skip_serialseq + my ($auser, $branchcode, $aqbooksellerid, $cost, $aqbudgetid, $biblionumber, $startdate, $periodicity, + $dow, $numberlength, $weeklength, $monthlength, $add1, $every1, $whenmorethan1, $setto1, + $lastvalue1, $innerloop1, $add2, $every2, $whenmorethan2, $setto2, $lastvalue2, $innerloop2, + $add3, $every3, $whenmorethan3, $setto3, $lastvalue3, $innerloop3, $numberingmethod, $status, + $notes, $letter, $firstacquidate, $irregularity, $numberpattern, $callnumber, $hemisphere, $manualhistory, + $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate ) = @_; my $dbh = C4::Context->dbh; #save subscription (insert into database) my $query = qq| INSERT INTO subscription - (librarian, branchcode, aqbooksellerid, cost, aqbudgetid, - biblionumber, startdate, periodicity, numberlength, weeklength, - monthlength, lastvalue1, innerloop1, lastvalue2, innerloop2, - lastvalue3, innerloop3, status, notes, letter, firstacquidate, - irregularity, numberpattern, locale, callnumber, - manualhistory, internalnotes, serialsadditems, staffdisplaycount, - opacdisplaycount, graceperiod, location, enddate, skip_serialseq) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + (librarian,branchcode,aqbooksellerid,cost,aqbudgetid,biblionumber, + startdate,periodicity,dow,numberlength,weeklength,monthlength, + add1,every1,whenmorethan1,setto1,lastvalue1,innerloop1, + add2,every2,whenmorethan2,setto2,lastvalue2,innerloop2, + add3,every3,whenmorethan3,setto3,lastvalue3,innerloop3, + numberingmethod, status, notes, letter,firstacquidate,irregularity, + numberpattern, callnumber, hemisphere,manualhistory,internalnotes,serialsadditems, + staffdisplaycount,opacdisplaycount,graceperiod,location,enddate) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) |; my $sth = $dbh->prepare($query); $sth->execute( - $auser, $branchcode, $aqbooksellerid, $cost, $aqbudgetid, $biblionumber, - $startdate, $periodicity, $numberlength, $weeklength, - $monthlength, $lastvalue1, $innerloop1, $lastvalue2, $innerloop2, - $lastvalue3, $innerloop3, $status, $notes, $letter, - $firstacquidate, $irregularity, $numberpattern, $locale, $callnumber, - $manualhistory, $internalnotes, $serialsadditems, $staffdisplaycount, - $opacdisplaycount, $graceperiod, $location, $enddate, $skip_serialseq + $auser, $branchcode, $aqbooksellerid, $cost, $aqbudgetid, $biblionumber, $startdate, $periodicity, + $dow, $numberlength, $weeklength, $monthlength, $add1, $every1, $whenmorethan1, $setto1, + $lastvalue1, $innerloop1, $add2, $every2, $whenmorethan2, $setto2, $lastvalue2, $innerloop2, + $add3, $every3, $whenmorethan3, $setto3, $lastvalue3, $innerloop3, $numberingmethod, "$status", + $notes, $letter, $firstacquidate, $irregularity, $numberpattern, $callnumber, $hemisphere, $manualhistory, + $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate ); my $subscriptionid = $dbh->{'mysql_insertid'}; - unless ($enddate) { - $enddate = GetExpirationDate( $subscriptionid, $startdate ); - $query = qq| + unless ($enddate){ + $enddate = GetExpirationDate($subscriptionid,$startdate); + $query = q| UPDATE subscription SET enddate=? WHERE subscriptionid=? @@ -1466,8 +1360,7 @@ sub NewSubscription { $sth = $dbh->prepare($query); $sth->execute( $enddate, $subscriptionid ); } - - # then create the 1st expected number + #then create the 1st waited number $query = qq( INSERT INTO subscriptionhistory (biblionumber, subscriptionid, histstartdate, opacnote, librariannote) @@ -1477,11 +1370,17 @@ sub NewSubscription { $sth->execute( $biblionumber, $subscriptionid, $startdate, $notes, $internalnotes ); # reread subscription to get a hash (for calculation of the 1st issue number) - my $subscription = GetSubscription($subscriptionid); - my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscription->{numberpattern}); + $query = qq( + SELECT * + FROM subscription + WHERE subscriptionid = ? + ); + $sth = $dbh->prepare($query); + $sth->execute($subscriptionid); + my $val = $sth->fetchrow_hashref; # calculate issue number - my $serialseq = GetSeq($subscription, $pattern); + my $serialseq = GetSeq($val); $query = qq| INSERT INTO serial (serialseq,subscriptionid,biblionumber,status, planneddate, publisheddate) @@ -1494,7 +1393,7 @@ sub NewSubscription { #set serial flag on biblio if not already set. my $bib = GetBiblio($biblionumber); - if ( $bib and !$bib->{'serial'} ) { + if ( !$bib->{'serial'} ) { my $record = GetMarcBiblio($biblionumber); my ( $tag, $subf ) = GetMarcFromKohaField( 'biblio.serial', $bib->{'frameworkcode'} ); if ($tag) { @@ -1812,8 +1711,7 @@ sub HasSubscriptionExpired { my ($subscriptionid) = @_; my $dbh = C4::Context->dbh; my $subscription = GetSubscription($subscriptionid); - my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subscription->{periodicity}); - if ( $frequency and $frequency->{unit} ) { + if ( ( $subscription->{periodicity} % 16 ) > 0 ) { my $expirationdate = $subscription->{enddate} || GetExpirationDate($subscriptionid); if (!defined $expirationdate) { $expirationdate = q{}; @@ -1837,7 +1735,6 @@ sub HasSubscriptionExpired { || ( !$res ) ); return 0; } else { - # Irregular if ( $subscription->{'numberlength'} ) { my $countreceived = countissuesfrom( $subscriptionid, $subscription->{'startdate'} ); return 1 if ( $countreceived > $subscription->{'numberlength'} ); @@ -2329,17 +2226,29 @@ sub abouttoexpire { my $dbh = C4::Context->dbh; my $subscription = GetSubscription($subscriptionid); my $per = $subscription->{'periodicity'}; - my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($per); - if ($frequency and $frequency->{unit}){ - my $expirationdate = GetExpirationDate($subscriptionid); + if ($per && $per % 16 > 0){ + my $expirationdate = GetExpirationDate($subscriptionid); my ($res) = $dbh->selectrow_array('select max(planneddate) from serial where subscriptionid = ?', undef, $subscriptionid); - my $nextdate = GetNextDate($subscription, $res); - if(Date::Calc::Delta_Days( - split( /-/, $nextdate ), - split( /-/, $expirationdate ) - ) <= 0) { - return 1; + my @res; + if (defined $res) { + @res=split (/-/,$res); + @res=Date::Calc::Today if ($res[0]*$res[1]==0); + } else { # default an undefined value + @res=Date::Calc::Today; } + my @endofsubscriptiondate=split(/-/,$expirationdate); + my @per_list = (0, 7, 7, 14, 21, 31, 62, 93, 93, 190, 365, 730, 0, 124, 0, 0); + my @datebeforeend; + @datebeforeend = Add_Delta_Days( $endofsubscriptiondate[0],$endofsubscriptiondate[1],$endofsubscriptiondate[2], + - (3 * $per_list[$per])) if (@endofsubscriptiondate && $endofsubscriptiondate[0]*$endofsubscriptiondate[1]*$endofsubscriptiondate[2]); + return 1 if ( @res && + (@datebeforeend && + Delta_Days($res[0],$res[1],$res[2], + $datebeforeend[0],$datebeforeend[1],$datebeforeend[2]) <= 0) && + (@endofsubscriptiondate && + Delta_Days($res[0],$res[1],$res[2], + $endofsubscriptiondate[0],$endofsubscriptiondate[1],$endofsubscriptiondate[2]) >= 0) ); + return 0; } elsif ($subscription->{numberlength}>0) { return (countissuesfrom($subscriptionid,$subscription->{'startdate'}) >=$subscription->{numberlength}-1); } @@ -2390,277 +2299,170 @@ sub GetSubscriptionsFromBorrower { return ( $count, @routinglist ); } - -=head2 GetFictiveIssueNumber - -$issueno = GetFictiveIssueNumber($subscription, $publishedate); - -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... -This issuenumber doesn't take into account irregularities, so, for instance, if the 3rd -issue is declared as 'irregular' (will be skipped at receipt), the next issue number -will be 4, not 3. It's why it is called 'fictive'. It is NOT a serial seq, and is not -depending on how many rows are in serial table. -The issue number calculation is based on subscription frequency, first acquisition -date, and $publisheddate. - -=cut - -sub GetFictiveIssueNumber { - my ($subscription, $publisheddate) = @_; - - my $frequency = GetSubscriptionFrequency($subscription->{'periodicity'}); - my $unit = $frequency->{unit} ? lc $frequency->{'unit'} : undef; - my $issueno = 0; - - if($unit) { - my ($year, $month, $day) = split /-/, $publisheddate; - my ($fa_year, $fa_month, $fa_day) = split /-/, $subscription->{'firstacquidate'}; - my $wkno; - my $delta; - - if($unit eq 'day') { - $delta = Delta_Days($fa_year, $fa_month, $fa_day, $year, $month, $day); - } elsif($unit eq 'week') { - ($wkno, $year) = Week_of_Year($year, $month, $day); - my ($fa_wkno, $fa_yr) = Week_of_Year($fa_year, $fa_month, $fa_day); - $delta = ($fa_yr == $year) ? ($wkno - $fa_wkno) : ( ($year-$fa_yr-1)*52 + (52-$fa_wkno+$wkno) ); - } elsif($unit eq 'month') { - $delta = ($fa_year == $year) - ? ($month - $fa_month) - : ( ($year-$fa_year-1)*12 + (12-$fa_month+$month) ); - } elsif($unit eq 'year') { - $delta = $year - $fa_year; - } - if($frequency->{'unitsperissue'} == 1) { - $issueno = $delta * $frequency->{'issuesperunit'} + $subscription->{'countissuesperunit'}; - } else { - # Assuming issuesperunit == 1 - $issueno = int( ($delta + $frequency->{'unitsperissue'}) / $frequency->{'unitsperissue'} ); - } - } - return $issueno; -} - =head2 GetNextDate -$resultdate = GetNextDate($publisheddate,$subscription) +$resultdate = GetNextDate($planneddate,$subscription) -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 'periodicity', 'firstacquidate', 'irregularity', and 'countissuesperunit' -$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 +this function it takes the planneddate and will return the next issue's date and will skip dates if there +exists an irregularity +- eg if periodicity is monthly and $planneddate is 2007-02-10 but if March and April is to be skipped then the returned date will be 2007-05-10 return : -$resultdate - then next date in the sequence (ISO date) +$resultdate - then next date in the sequence -Return $publisheddate if subscription is irregular +Return 0 if periodicity==0 =cut sub GetNextDate { - my ( $subscription, $publisheddate, $updatecount ) = @_; - - my $freqdata = GetSubscriptionFrequency($subscription->{'periodicity'}); - - if ($freqdata->{'unit'}) { - my ( $year, $month, $day ) = split /-/, $publisheddate; - - # Process an irregularity Hash - # Suppose that irregularities are stored in a string with this structure - # irreg1;irreg2;irreg3 - # where irregX is the number of issue which will not be received - # (the first issue takes the number 1, the 2nd the number 2 and so on) - my @irreg = split /;/, $subscription->{'irregularity'} ; - my %irregularities; - foreach my $irregularity (@irreg) { - $irregularities{$irregularity} = 1; - } + my ( $planneddate, $subscription ) = @_; + my @irreg = split( /\,/, $subscription->{irregularity} ); - # Get the 'fictive' next issue number - # It is used to check if next issue is an irregular issue. - my $issueno = GetFictiveIssueNumber($subscription, $publisheddate) + 1; - - # Then get the next date - my $unit = lc $freqdata->{'unit'}; - if ($unit eq 'day') { - while ($irregularities{$issueno}) { - if ($subscription->{'countissuesperunit'} + 1 > $freqdata->{'issuesperunit'}){ - ($year,$month,$day) = Add_Delta_Days($year,$month, $day , $freqdata->{'unitsperissue'} ); - $subscription->{'countissuesperunit'} = 1; - } else { - $subscription->{'countissuesperunit'}++; + #date supposed to be in ISO. + + my ( $year, $month, $day ) = split( /-/, $planneddate ); + $month = 1 unless ($month); + $day = 1 unless ($day); + my @resultdate; + + # warn "DOW $dayofweek"; + if ( $subscription->{periodicity} % 16 == 0 ) { # 'without regularity' || 'irregular' + return 0; + } + + # daily : n / week + # Since we're interpreting irregularity here as which days of the week to skip an issue, + # renaming this pattern from 1/day to " n / week ". + if ( $subscription->{periodicity} == 1 ) { + my $dayofweek = eval { Day_of_Week( $year, $month, $day ) }; + if ($@) { warn "year month day : $year $month $day $subscription->{subscriptionid} : $@"; } + else { + for ( my $i = 0 ; $i < @irreg ; $i++ ) { + $dayofweek = 0 if ( $dayofweek == 7 ); + if ( in_array( ( $dayofweek + 1 ), @irreg ) ) { + ( $year, $month, $day ) = Add_Delta_Days( $year, $month, $day, 1 ); + $dayofweek++; } - $issueno++; - } - if ($subscription->{'countissuesperunit'} + 1 > $freqdata->{'issuesperunit'}){ - ($year,$month,$day) = Add_Delta_Days($year,$month, $day , $freqdata->{"unitsperissue"} ); - $subscription->{'countissuesperunit'} = 1; - } else { - $subscription->{'countissuesperunit'}++; } + @resultdate = Add_Delta_Days( $year, $month, $day, 1 ); } - elsif ($unit eq 'week') { - my ($wkno, $yr) = Week_of_Year($year, $month, $day); - while ($irregularities{$issueno}) { - if ($subscription->{'countissuesperunit'} + 1 > $freqdata->{'issuesperunit'}){ - $subscription->{'countissuesperunit'} = 1; - $wkno += $freqdata->{"unitsperissue"}; - if($wkno > 52){ - $wkno = $wkno % 52; - $yr++; - } - my $dow = Day_of_Week($year, $month, $day); - ($year,$month,$day) = Monday_of_Week($wkno, $yr); - if($freqdata->{'issuesperunit'} == 1) { - ($year, $month, $day) = Add_Delta_Days($year, $month, $day, $dow - 1); - } - } else { - $subscription->{'countissuesperunit'}++; + } + + # 1 week + if ( $subscription->{periodicity} == 2 ) { + my ( $wkno, $year ) = eval { Week_of_Year( $year, $month, $day ) }; + if ($@) { warn "year month day : $year $month $day $subscription->{subscriptionid} : $@"; } + else { + for ( my $i = 0 ; $i < @irreg ; $i++ ) { + + #FIXME: if two consecutive irreg, do we only skip one? + if ( $irreg[$i] == ( ( $wkno != 51 ) ? ( $wkno + 1 ) % 52 : 52 ) ) { + ( $year, $month, $day ) = Add_Delta_Days( $year, $month, $day, 7 ); + $wkno = ( ( $wkno != 51 ) ? ( $wkno + 1 ) % 52 : 52 ); } - $issueno++; } - if ($subscription->{'countissuesperunit'} + 1 > $freqdata->{'issuesperunit'}){ - $subscription->{'countissuesperunit'} = 1; - $wkno += $freqdata->{"unitsperissue"}; - if($wkno > 52){ - $wkno = $wkno % 52 ; - $yr++; - } - my $dow = Day_of_Week($year, $month, $day); - ($year,$month,$day) = Monday_of_Week($wkno, $yr); - if($freqdata->{'issuesperunit'} == 1) { - ($year, $month, $day) = Add_Delta_Days($year, $month, $day, $dow - 1); + @resultdate = Add_Delta_Days( $year, $month, $day, 7 ); + } + } + + # 1 / 2 weeks + if ( $subscription->{periodicity} == 3 ) { + my ( $wkno, $year ) = eval { Week_of_Year( $year, $month, $day ) }; + if ($@) { warn "year month day : $year $month $day $subscription->{subscriptionid} : $@"; } + else { + for ( my $i = 0 ; $i < @irreg ; $i++ ) { + if ( $irreg[$i] == ( ( $wkno != 50 ) ? ( $wkno + 2 ) % 52 : 52 ) ) { + ### BUGFIX was previously +1 ^ + ( $year, $month, $day ) = Add_Delta_Days( $year, $month, $day, 14 ); + $wkno = ( ( $wkno != 50 ) ? ( $wkno + 2 ) % 52 : 52 ); } - } else { - $subscription->{'countissuesperunit'}++; } + @resultdate = Add_Delta_Days( $year, $month, $day, 14 ); } - elsif ($unit eq 'month') { - while ($irregularities{$issueno}) { - if ($subscription->{'countissuesperunit'} + 1 > $freqdata->{'issuesperunit'}){ - $subscription->{'countissuesperunit'} = 1; - ($year,$month,$day) = Add_Delta_YM($year,$month,$day, 0,$freqdata->{"unitsperissue"}); - unless($freqdata->{'issuesperunit'} == 1) { - $day = 1; # Jumping to the first day of month, because we don't know what day is expected - } - } else { - $subscription->{'countissuesperunit'}++; + } + + # 1 / 3 weeks + if ( $subscription->{periodicity} == 4 ) { + my ( $wkno, $year ) = eval { Week_of_Year( $year, $month, $day ) }; + if ($@) { warn "année mois jour : $year $month $day $subscription->{subscriptionid} : $@"; } + else { + for ( my $i = 0 ; $i < @irreg ; $i++ ) { + if ( $irreg[$i] == ( ( $wkno != 49 ) ? ( $wkno + 3 ) % 52 : 52 ) ) { + ( $year, $month, $day ) = Add_Delta_Days( $year, $month, $day, 21 ); + $wkno = ( ( $wkno != 49 ) ? ( $wkno + 3 ) % 52 : 52 ); } - $issueno++; } - if ($subscription->{'countissuesperunit'} + 1 > $freqdata->{'issuesperunit'}){ - $subscription->{'countissuesperunit'} = 1; - ($year,$month,$day) = Add_Delta_YM($year,$month,$day, 0,$freqdata->{"unitsperissue"}); - unless($freqdata->{'issuesperunit'} == 1) { - $day = 1; # Jumping to the first day of month, because we don't know what day is expected + @resultdate = Add_Delta_Days( $year, $month, $day, 21 ); + } + } + my $tmpmonth = $month; + if ( $year && $month && $day ) { + if ( $subscription->{periodicity} == 5 ) { + for ( my $i = 0 ; $i < @irreg ; $i++ ) { + if ( $irreg[$i] == ( ( $tmpmonth != 11 ) ? ( $tmpmonth + 1 ) % 12 : 12 ) ) { + ( $year, $month, $day ) = Add_Delta_YMD( $year, $month, $day, 0, 1, 0 ); + $tmpmonth = ( ( $tmpmonth != 11 ) ? ( $tmpmonth + 1 ) % 12 : 12 ); } - } else { - $subscription->{'countissuesperunit'}++; } + @resultdate = Add_Delta_YMD( $year, $month, $day, 0, 1, 0 ); } - elsif ($unit eq 'year') { - while ($irregularities{$issueno}) { - if ($subscription->{'countissuesperunit'} + 1 > $freqdata->{'issuesperunit'}){ - $subscription->{'countissuesperunit'} = 1; - ($year,$month,$day) = Add_Delta_YM($year,$month,$day, $freqdata->{"unitsperissue"},0); - unless($freqdata->{'issuesperunit'} == 1) { - # Jumping to the first day of year, because we don't know what day is expected - $month = 1; - $day = 1; - } - } else { - $subscription->{'countissuesperunit'}++; + if ( $subscription->{periodicity} == 6 ) { + for ( my $i = 0 ; $i < @irreg ; $i++ ) { + if ( $irreg[$i] == ( ( $tmpmonth != 10 ) ? ( $tmpmonth + 2 ) % 12 : 12 ) ) { + ( $year, $month, $day ) = Add_Delta_YMD( $year, $month, $day, 0, 2, 0 ); + $tmpmonth = ( ( $tmpmonth != 10 ) ? ( $tmpmonth + 2 ) % 12 : 12 ); } - $issueno++; } - if ($subscription->{'countissuesperunit'} + 1 > $freqdata->{'issuesperunit'}){ - $subscription->{'countissuesperunit'} = 1; - ($year,$month,$day) = Add_Delta_YM($year,$month,$day, $freqdata->{"unitsperissue"},0); - unless($freqdata->{'issuesperunit'} == 1) { - # Jumping to the first day of year, because we don't know what day is expected - $month = 1; - $day = 1; + @resultdate = Add_Delta_YMD( $year, $month, $day, 0, 2, 0 ); + } + if ( $subscription->{periodicity} == 7 ) { + for ( my $i = 0 ; $i < @irreg ; $i++ ) { + if ( $irreg[$i] == ( ( $tmpmonth != 9 ) ? ( $tmpmonth + 3 ) % 12 : 12 ) ) { + ( $year, $month, $day ) = Add_Delta_YMD( $year, $month, $day, 0, 3, 0 ); + $tmpmonth = ( ( $tmpmonth != 9 ) ? ( $tmpmonth + 3 ) % 12 : 12 ); } - } else { - $subscription->{'countissuesperunit'}++; } + @resultdate = Add_Delta_YMD( $year, $month, $day, 0, 3, 0 ); } - if ($updatecount){ - my $dbh = C4::Context->dbh; - my $query = qq{ - UPDATE subscription - SET countissuesperunit = ? - WHERE subscriptionid = ? - }; - my $sth = $dbh->prepare($query); - $sth->execute($subscription->{'countissuesperunit'}, $subscription->{'subscriptionid'}); + if ( $subscription->{periodicity} == 8 ) { + for ( my $i = 0 ; $i < @irreg ; $i++ ) { + if ( $irreg[$i] == ( ( $tmpmonth != 9 ) ? ( $tmpmonth + 3 ) % 12 : 12 ) ) { + ( $year, $month, $day ) = Add_Delta_YMD( $year, $month, $day, 0, 3, 0 ); + $tmpmonth = ( ( $tmpmonth != 9 ) ? ( $tmpmonth + 3 ) % 12 : 12 ); + } + } + @resultdate = Add_Delta_YMD( $year, $month, $day, 0, 3, 0 ); } - return sprintf("%04d-%02d-%02d", $year, $month, $day); - } - else { - return $publisheddate; - } -} - -=head2 _numeration - - $string = &_numeration($value,$num_type,$locale); - -_numeration returns the string corresponding to $value in the num_type -num_type can take : - -dayname - -monthname - -season -=cut - -#' - -sub _numeration { - my ($value, $num_type, $locale) = @_; - $value ||= 0; - my $initlocale = setlocale(LC_TIME); - if($locale and $locale ne $initlocale) { - $locale = setlocale(LC_TIME, $locale); - } - $locale ||= $initlocale; - my $string; - $num_type //= ''; - given ($num_type) { - when (/^dayname$/) { - $value = $value % 7; - $string = POSIX::strftime("%A",0,0,0,0,0,0,$value); + if ( $subscription->{periodicity} == 13 ) { + for ( my $i = 0 ; $i < @irreg ; $i++ ) { + if ( $irreg[$i] == ( ( $tmpmonth != 8 ) ? ( $tmpmonth + 4 ) % 12 : 12 ) ) { + ( $year, $month, $day ) = Add_Delta_YMD( $year, $month, $day, 0, 4, 0 ); + $tmpmonth = ( ( $tmpmonth != 8 ) ? ( $tmpmonth + 4 ) % 12 : 12 ); + } + } + @resultdate = Add_Delta_YMD( $year, $month, $day, 0, 4, 0 ); } - when (/^monthname$/) { - $value = $value % 12; - $string = POSIX::strftime("%B",0,0,0,1,$value,0,0,0,0); + if ( $subscription->{periodicity} == 9 ) { + for ( my $i = 0 ; $i < @irreg ; $i++ ) { + if ( $irreg[$i] == ( ( $tmpmonth != 9 ) ? ( $tmpmonth + 3 ) % 12 : 12 ) ) { + ### BUFIX Seems to need more Than One ? + ( $year, $month, $day ) = Add_Delta_YM( $year, $month, $day, 0, 6 ); + $tmpmonth = ( ( $tmpmonth != 6 ) ? ( $tmpmonth + 6 ) % 12 : 12 ); + } + } + @resultdate = Add_Delta_YM( $year, $month, $day, 0, 6 ); } - when (/^season$/) { - my $seasonlocale = ($locale) - ? (substr $locale,0,2) - : "en"; - my %seasons=( - "en" => - [qw(Spring Summer Fall Winter)], - "fr"=> - [qw(Printemps Été Automne Hiver)], - ); - $value = $value % 4; - $string = ($seasons{$seasonlocale}) - ? $seasons{$seasonlocale}->[$value] - : $seasons{'en'}->[$value]; + if ( $subscription->{periodicity} == 10 ) { + @resultdate = Add_Delta_YM( $year, $month, $day, 1, 0 ); } - default { - $string = $value; + if ( $subscription->{periodicity} == 11 ) { + @resultdate = Add_Delta_YM( $year, $month, $day, 2, 0 ); } } - if($locale ne $initlocale) { - setlocale(LC_TIME, $initlocale); - } - return $string; + my $resultdate = sprintf( "%04d-%02d-%02d", $resultdate[0], $resultdate[1], $resultdate[2] ); + + return "$resultdate"; } =head2 is_barcode_in_use diff --git a/C4/Serials/Frequency.pm b/C4/Serials/Frequency.pm deleted file mode 100644 index 8c11aa5cbc..0000000000 --- a/C4/Serials/Frequency.pm +++ /dev/null @@ -1,292 +0,0 @@ -package C4::Serials::Frequency; - -# Copyright 2000-2002 Biblibre SARL -# -# This file is part of Koha. -# -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -use strict; -use warnings; - -use C4::Context; - -use vars qw($VERSION @ISA @EXPORT); - -BEGIN { - # set the version for version checking - $VERSION = 3.01; - require Exporter; - @ISA = qw(Exporter); - @EXPORT = qw( - &GetSubscriptionFrequencies - &GetSubscriptionFrequency - &AddSubscriptionFrequency - &ModSubscriptionFrequency - &DelSubscriptionFrequency - - &GetSubscriptionsWithFrequency - ); -} - - -=head1 NAME - -C4::Serials::Frequency - Serials Frequency module - -=head1 FUNCTIONS - -=head2 GetSubscriptionFrequencies - -=over 4 - -=item C<@frequencies> = &GetSubscriptionFrequencies(); - -gets frequencies restricted on filters - -=back - -=cut - -sub GetSubscriptionFrequencies { - my $dbh = C4::Context->dbh; - my $query = qq{ - SELECT * - FROM subscription_frequencies - ORDER BY displayorder - }; - my $sth = $dbh->prepare($query); - $sth->execute(); - - my $results = $sth->fetchall_arrayref( {} ); - return @$results; -} - -=head2 GetSubscriptionFrequency - -=over 4 - -=item $frequency = &GetSubscriptionFrequency($frequencyid); - -gets frequency where $frequencyid is the identifier - -=back - -=cut - -sub GetSubscriptionFrequency { - my ($frequencyid) = @_; - - my $dbh = C4::Context->dbh; - my $query = qq{ - SELECT * - FROM subscription_frequencies - WHERE id = ? - }; - my $sth = $dbh->prepare($query); - $sth->execute($frequencyid); - - return $sth->fetchrow_hashref; -} - -=head2 AddSubscriptionFrequency - -=over 4 - -=item C<$frequencyid> = &AddSubscriptionFrequency($frequency); - -Add a new frequency - -=item C<$frequency> is a hashref that can contains the following keys - -=over 2 - -=item * description - -=item * unit - -=item * issuesperunit - -=item * unitsperissue - -=item * expectedissuesayear - -=item * displayorder - -=back - -Only description is mandatory. - -=back - -=cut - -sub AddSubscriptionFrequency { - my $frequency = shift; - - unless(ref($frequency) eq 'HASH' && defined $frequency->{'description'} && $frequency->{'description'} ne '') { - return; - } - - my @keys; - my @values; - foreach (qw/ description unit issuesperunit unitsperissue expectedissuesayear displayorder /) { - if(exists $frequency->{$_}) { - push @keys, $_; - push @values, $frequency->{$_}; - } - } - - my $dbh = C4::Context->dbh; - my $query = "INSERT INTO subscription_frequencies"; - $query .= '(' . join(',', @keys) . ')'; - $query .= ' VALUES (' . ('?,' x (scalar(@keys)-1)) . '?)'; - my $sth = $dbh->prepare($query); - my $rv = $sth->execute(@values); - - if(defined $rv) { - return $dbh->last_insert_id(undef, undef, "subscription_frequencies", undef); - } - - return $rv; -} - -=head2 ModSubscriptionFrequency - -=over 4 - -=item &ModSubscriptionFrequency($frequency); - -Modifies a frequency - -=item C<$frequency> is a hashref that can contains the following keys - -=over 2 - -=item * id - -=item * description - -=item * unit - -=item * issuesperunit - -=item * unitsperissue - -=item * expectedissuesayear - -=item * displayorder - -=back - -Only id is mandatory. - -=back - -=cut - -sub ModSubscriptionFrequency { - my $frequency = shift; - - unless( - ref($frequency) eq 'HASH' - && defined $frequency->{'id'} && $frequency->{'id'} > 0 - && ( - (defined $frequency->{'description'} - && $frequency->{'description'} ne '') - || !defined $frequency->{'description'} - ) - ) { - return; - } - - my @keys; - my @values; - foreach (qw/ description unit issuesperunit unitsperissue expectedissuesayear displayorder /) { - if(exists $frequency->{$_}) { - push @keys, $_; - push @values, $frequency->{$_}; - } - } - - my $dbh = C4::Context->dbh; - my $query = "UPDATE subscription_frequencies"; - $query .= ' SET ' . join(' = ?,', @keys) . ' = ?'; - $query .= ' WHERE id = ?'; - my $sth = $dbh->prepare($query); - - return $sth->execute(@values, $frequency->{'id'}); -} - -=head2 DelSubscriptionFrequency - -=over 4 - -=item &DelSubscriptionFrequency($frequencyid); - -Delete a frequency - -=back - -=cut - -sub DelSubscriptionFrequency { - my $frequencyid = shift; - - my $dbh = C4::Context->dbh; - my $query = qq{ - DELETE FROM subscription_frequencies - WHERE id = ? - }; - my $sth = $dbh->prepare($query); - $sth->execute($frequencyid); -} - -=head2 GetSubscriptionsWithFrequency - - my @subs = GetSubscriptionsWithFrequency($frequencyid); - -Returns all subscriptions that are using a particular frequency - -=cut - -sub GetSubscriptionsWithFrequency { - my ($frequencyid) = @_; - - return unless $frequencyid; - - my $dbh = C4::Context->dbh; - my $query = qq{ - SELECT * - FROM subscription - LEFT JOIN biblio ON subscription.biblionumber = biblio.biblionumber - WHERE periodicity = ? - }; - my $sth = $dbh->prepare($query); - my @results; - if ($sth->execute($frequencyid)) { - @results = @{ $sth->fetchall_arrayref({}) }; - } - return @results; -} - -1; - -__END__ - -=head1 AUTHOR - -Koha Developement team - -=cut diff --git a/C4/Serials/Numberpattern.pm b/C4/Serials/Numberpattern.pm deleted file mode 100644 index fde293b5e4..0000000000 --- a/C4/Serials/Numberpattern.pm +++ /dev/null @@ -1,289 +0,0 @@ -package C4::Serials::Numberpattern; - -# Copyright 2000-2002 Biblibre SARL -# -# This file is part of Koha. -# -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -use strict; -use warnings; - -use C4::Context; - -use vars qw($VERSION @ISA @EXPORT); - -BEGIN { - - # set the version for version checking - $VERSION = 3.01; - require Exporter; - @ISA = qw(Exporter); - @EXPORT = qw( - &GetSubscriptionNumberpatterns - &GetSubscriptionNumberpattern - &GetSubscriptionNumberpatternByName - &AddSubscriptionNumberpattern - &ModSubscriptionNumberpattern - &DelSubscriptionNumberpattern - - &GetSubscriptionsWithNumberpattern - ); -} - - -=head1 NAME - -C4::Serials::Numberpattern - Serials numbering pattern module - -=head1 FUNCTIONS - -=head2 GetSubscriptionNumberpatterns - -@results = GetSubscriptionNumberpatterns; -this function get all subscription number patterns entered in table - -=cut - -sub GetSubscriptionNumberpatterns { - my $dbh = C4::Context->dbh; - my $query = qq{ - SELECT * - FROM subscription_numberpatterns - ORDER by displayorder - }; - my $sth = $dbh->prepare($query); - $sth->execute; - my $results = $sth->fetchall_arrayref({}); - - return @$results; -} - -=head2 GetSubscriptionNumberpattern - -$result = GetSubscriptionNumberpattern($numberpatternid); -this function get the data of the subscription numberpatterns which id is $numberpatternid - -=cut - -sub GetSubscriptionNumberpattern { - my $numberpatternid = shift; - my $dbh = C4::Context->dbh; - my $query = qq( - SELECT * - FROM subscription_numberpatterns - WHERE id = ? - ); - my $sth = $dbh->prepare($query); - $sth->execute($numberpatternid); - - return $sth->fetchrow_hashref; -} - -=head2 GetSubscriptionNumberpatternByName - -$result = GetSubscriptionNumberpatternByName($name); -this function get the data of the subscription numberpatterns which name is $name - -=cut - -sub GetSubscriptionNumberpatternByName { - my $name = shift; - my $dbh = C4::Context->dbh; - my $query = qq( - SELECT * - FROM subscription_numberpatterns - WHERE label = ? - ); - my $sth = $dbh->prepare($query); - my $rv = $sth->execute($name); - - return $sth->fetchrow_hashref; -} - -=head2 AddSubscriptionNumberpattern - -=over 4 - -=item C<$numberpatternid> = &AddSubscriptionNumberpattern($numberpattern) - -Add a new numberpattern - -=item C<$frequency> is a hashref that contains values of the number pattern - -=item Only label and numberingmethod are mandatory - -=back - -=cut - -sub AddSubscriptionNumberpattern { - my $numberpattern = shift; - - unless( - ref($numberpattern) eq 'HASH' - && defined $numberpattern->{'label'} - && $numberpattern->{'label'} ne '' - && defined $numberpattern->{'numberingmethod'} - && $numberpattern->{'numberingmethod'} ne '' - ) { - return; - } - - my @keys; - my @values; - foreach (qw/ label description numberingmethod displayorder - label1 label2 label3 add1 add2 add3 every1 every2 every3 - setto1 setto2 setto3 whenmorethan1 whenmorethan2 whenmorethan3 - numbering1 numbering2 numbering3 /) { - if(exists $numberpattern->{$_}) { - push @keys, $_; - push @values, $numberpattern->{$_}; - } - } - - my $dbh = C4::Context->dbh; - my $query = "INSERT INTO subscription_numberpatterns"; - $query .= '(' . join(',', @keys) . ')'; - $query .= ' VALUES (' . ('?,' x (scalar(@keys)-1)) . '?)'; - my $sth = $dbh->prepare($query); - my $rv = $sth->execute(@values); - - if(defined $rv) { - return $dbh->last_insert_id(undef, undef, "subscription_numberpatterns", undef); - } - - return $rv; -} - -=head2 ModSubscriptionNumberpattern - -=over 4 - -=item &ModSubscriptionNumberpattern($numberpattern) - -Modifies a numberpattern - -=item C<$frequency> is a hashref that contains values of the number pattern - -=item Only id is mandatory - -=back - -=cut - -sub ModSubscriptionNumberpattern { - my $numberpattern = shift; - - unless( - ref($numberpattern) eq 'HASH' - && defined $numberpattern->{'id'} - && $numberpattern->{'id'} > 0 - && ( - (defined $numberpattern->{'label'} - && $numberpattern->{'label'} ne '') - || !defined $numberpattern->{'label'} - ) - && ( - (defined $numberpattern->{'numberingmethod'} - && $numberpattern->{'numberingmethod'} ne '') - || !defined $numberpattern->{'numberingmethod'} - ) - ) { - return; - } - - my @keys; - my @values; - foreach (qw/ label description numberingmethod displayorder - label1 label2 label3 add1 add2 add3 every1 every2 every3 - setto1 setto2 setto3 whenmorethan1 whenmorethan2 whenmorethan3 - numbering1 numbering2 numbering3 /) { - if(exists $numberpattern->{$_}) { - push @keys, $_; - push @values, $numberpattern->{$_}; - } - } - - my $dbh = C4::Context->dbh; - my $query = "UPDATE subscription_numberpatterns"; - $query .= ' SET ' . join(' = ?,', @keys) . ' = ?'; - $query .= ' WHERE id = ?'; - my $sth = $dbh->prepare($query); - - return $sth->execute(@values, $numberpattern->{'id'}); -} - -=head2 DelSubscriptionNumberpattern - -=over 4 - -=item &DelSubscriptionNumberpattern($numberpatternid) - -Delete a number pattern - -=back - -=cut - -sub DelSubscriptionNumberpattern { - my $numberpatternid = shift; - - my $dbh = C4::Context->dbh; - my $query = qq{ - DELETE FROM subscription_numberpatterns - WHERE id = ? - }; - my $sth = $dbh->prepare($query); - $sth->execute($numberpatternid); -} - -=head2 GetSubscriptionsWithNumberpattern - - my @subs = GetSubscriptionsWithNumberpattern($numberpatternid); - -Returns all subscriptions that are using a particular numbering pattern - -=cut - -sub GetSubscriptionsWithNumberpattern { - my ($numberpatternid) = @_; - - return unless $numberpatternid; - - my $dbh = C4::Context->dbh; - my $query = qq{ - SELECT * - FROM subscription - LEFT JOIN biblio ON subscription.biblionumber = biblio.biblionumber - WHERE numberpattern = ? - }; - my $sth = $dbh->prepare($query); - my @results; - if ($sth->execute($numberpatternid)) { - @results = @{ $sth->fetchall_arrayref({}) }; - } - return @results; -} - - -1; - -__END__ - -=head1 AUTHOR - -Koha Developement team - -=cut diff --git a/installer/data/mysql/de-DE/optional/sample_frequencies.sql b/installer/data/mysql/de-DE/optional/sample_frequencies.sql deleted file mode 100644 index f09c8a2c1b..0000000000 --- a/installer/data/mysql/de-DE/optional/sample_frequencies.sql +++ /dev/null @@ -1,16 +0,0 @@ -INSERT INTO subscription_frequencies - (description, unit, unitsperissue, issuesperunit, displayorder) -VALUES - ('2/day', 'day', 1, 2, 1), - ('1/day', 'day', 1, 1, 2), - ('3/week', 'week', 1, 3, 3), - ('1/week', 'week', 1, 1, 4), - ('1/2 weeks', 'week', 2, 1, 5), - ('1/3 weeks', 'week', 3, 1, 6), - ('1/month', 'month', 1, 1, 7), - ('1/2 months', 'month', 2, 1, 8), - ('1/3 months', 'month', 3, 1, 9), - ('2/year', 'month', 6, 1, 10), - ('1/year', 'year', 1, 1, 11), - ('1/2 year', 'year', 2, 1, 12), - ('Irregular', NULL, 1, 1, 13); diff --git a/installer/data/mysql/de-DE/optional/sample_frequencies.txt b/installer/data/mysql/de-DE/optional/sample_frequencies.txt deleted file mode 100644 index 8754f46f24..0000000000 --- a/installer/data/mysql/de-DE/optional/sample_frequencies.txt +++ /dev/null @@ -1 +0,0 @@ -Sample frequencies for subscriptions diff --git a/installer/data/mysql/de-DE/optional/sample_numberpatterns.sql b/installer/data/mysql/de-DE/optional/sample_numberpatterns.sql deleted file mode 100644 index 6b5930023a..0000000000 --- a/installer/data/mysql/de-DE/optional/sample_numberpatterns.sql +++ /dev/null @@ -1,25 +0,0 @@ -INSERT INTO subscription_numberpatterns - (label, displayorder, description, numberingmethod, - label1, add1, every1, whenmorethan1, setto1, numbering1, - label2, add2, every2, whenmorethan2, setto2, numbering2, - label3, add3, every3, whenmorethan3, setto3, numbering3) -VALUES - ('Number', 1, 'Simple Numbering method', 'No.{X}', - 'Number', 1, 1, 99999, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL), - - ('Volume, Number, Issue', 2, 'Volume Number Issue 1', 'Vol.{X}, Number {Y}, Issue {Z}', - 'Volume', 1, 48, 99999, 1, NULL, - 'Number', 1, 4, 12, 1, NULL, - 'Issue', 1, 1, 4, 1, NULL), - - ('Volume, Number', 3, 'Volume Number 1', 'Vol {X}, No {Y}', - 'Volume', 1, 12, 99999, 1, NULL, - 'Number', 1, 1, 12, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL), - - ('Seasonal', 4, 'Season Year', '{X} {Y}', - 'Season', 1, 1, 3, 0, 'season', - 'Year', 1, 4, 99999, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL); diff --git a/installer/data/mysql/de-DE/optional/sample_numberpatterns.txt b/installer/data/mysql/de-DE/optional/sample_numberpatterns.txt deleted file mode 100644 index 853db0fd92..0000000000 --- a/installer/data/mysql/de-DE/optional/sample_numberpatterns.txt +++ /dev/null @@ -1 +0,0 @@ -Sample numbering patterns for subscriptions diff --git a/installer/data/mysql/en/optional/sample_frequencies.sql b/installer/data/mysql/en/optional/sample_frequencies.sql deleted file mode 100644 index f09c8a2c1b..0000000000 --- a/installer/data/mysql/en/optional/sample_frequencies.sql +++ /dev/null @@ -1,16 +0,0 @@ -INSERT INTO subscription_frequencies - (description, unit, unitsperissue, issuesperunit, displayorder) -VALUES - ('2/day', 'day', 1, 2, 1), - ('1/day', 'day', 1, 1, 2), - ('3/week', 'week', 1, 3, 3), - ('1/week', 'week', 1, 1, 4), - ('1/2 weeks', 'week', 2, 1, 5), - ('1/3 weeks', 'week', 3, 1, 6), - ('1/month', 'month', 1, 1, 7), - ('1/2 months', 'month', 2, 1, 8), - ('1/3 months', 'month', 3, 1, 9), - ('2/year', 'month', 6, 1, 10), - ('1/year', 'year', 1, 1, 11), - ('1/2 year', 'year', 2, 1, 12), - ('Irregular', NULL, 1, 1, 13); diff --git a/installer/data/mysql/en/optional/sample_frequencies.txt b/installer/data/mysql/en/optional/sample_frequencies.txt deleted file mode 100644 index 8754f46f24..0000000000 --- a/installer/data/mysql/en/optional/sample_frequencies.txt +++ /dev/null @@ -1 +0,0 @@ -Sample frequencies for subscriptions diff --git a/installer/data/mysql/en/optional/sample_numberpatterns.sql b/installer/data/mysql/en/optional/sample_numberpatterns.sql deleted file mode 100644 index 6b5930023a..0000000000 --- a/installer/data/mysql/en/optional/sample_numberpatterns.sql +++ /dev/null @@ -1,25 +0,0 @@ -INSERT INTO subscription_numberpatterns - (label, displayorder, description, numberingmethod, - label1, add1, every1, whenmorethan1, setto1, numbering1, - label2, add2, every2, whenmorethan2, setto2, numbering2, - label3, add3, every3, whenmorethan3, setto3, numbering3) -VALUES - ('Number', 1, 'Simple Numbering method', 'No.{X}', - 'Number', 1, 1, 99999, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL), - - ('Volume, Number, Issue', 2, 'Volume Number Issue 1', 'Vol.{X}, Number {Y}, Issue {Z}', - 'Volume', 1, 48, 99999, 1, NULL, - 'Number', 1, 4, 12, 1, NULL, - 'Issue', 1, 1, 4, 1, NULL), - - ('Volume, Number', 3, 'Volume Number 1', 'Vol {X}, No {Y}', - 'Volume', 1, 12, 99999, 1, NULL, - 'Number', 1, 1, 12, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL), - - ('Seasonal', 4, 'Season Year', '{X} {Y}', - 'Season', 1, 1, 3, 0, 'season', - 'Year', 1, 4, 99999, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL); diff --git a/installer/data/mysql/en/optional/sample_numberpatterns.txt b/installer/data/mysql/en/optional/sample_numberpatterns.txt deleted file mode 100644 index 853db0fd92..0000000000 --- a/installer/data/mysql/en/optional/sample_numberpatterns.txt +++ /dev/null @@ -1 +0,0 @@ -Sample numbering patterns for subscriptions diff --git a/installer/data/mysql/es-ES/optional/sample_frequencies.sql b/installer/data/mysql/es-ES/optional/sample_frequencies.sql deleted file mode 100644 index f09c8a2c1b..0000000000 --- a/installer/data/mysql/es-ES/optional/sample_frequencies.sql +++ /dev/null @@ -1,16 +0,0 @@ -INSERT INTO subscription_frequencies - (description, unit, unitsperissue, issuesperunit, displayorder) -VALUES - ('2/day', 'day', 1, 2, 1), - ('1/day', 'day', 1, 1, 2), - ('3/week', 'week', 1, 3, 3), - ('1/week', 'week', 1, 1, 4), - ('1/2 weeks', 'week', 2, 1, 5), - ('1/3 weeks', 'week', 3, 1, 6), - ('1/month', 'month', 1, 1, 7), - ('1/2 months', 'month', 2, 1, 8), - ('1/3 months', 'month', 3, 1, 9), - ('2/year', 'month', 6, 1, 10), - ('1/year', 'year', 1, 1, 11), - ('1/2 year', 'year', 2, 1, 12), - ('Irregular', NULL, 1, 1, 13); diff --git a/installer/data/mysql/es-ES/optional/sample_frequencies.txt b/installer/data/mysql/es-ES/optional/sample_frequencies.txt deleted file mode 100644 index 8754f46f24..0000000000 --- a/installer/data/mysql/es-ES/optional/sample_frequencies.txt +++ /dev/null @@ -1 +0,0 @@ -Sample frequencies for subscriptions diff --git a/installer/data/mysql/es-ES/optional/sample_numberpatterns.sql b/installer/data/mysql/es-ES/optional/sample_numberpatterns.sql deleted file mode 100644 index 6b5930023a..0000000000 --- a/installer/data/mysql/es-ES/optional/sample_numberpatterns.sql +++ /dev/null @@ -1,25 +0,0 @@ -INSERT INTO subscription_numberpatterns - (label, displayorder, description, numberingmethod, - label1, add1, every1, whenmorethan1, setto1, numbering1, - label2, add2, every2, whenmorethan2, setto2, numbering2, - label3, add3, every3, whenmorethan3, setto3, numbering3) -VALUES - ('Number', 1, 'Simple Numbering method', 'No.{X}', - 'Number', 1, 1, 99999, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL), - - ('Volume, Number, Issue', 2, 'Volume Number Issue 1', 'Vol.{X}, Number {Y}, Issue {Z}', - 'Volume', 1, 48, 99999, 1, NULL, - 'Number', 1, 4, 12, 1, NULL, - 'Issue', 1, 1, 4, 1, NULL), - - ('Volume, Number', 3, 'Volume Number 1', 'Vol {X}, No {Y}', - 'Volume', 1, 12, 99999, 1, NULL, - 'Number', 1, 1, 12, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL), - - ('Seasonal', 4, 'Season Year', '{X} {Y}', - 'Season', 1, 1, 3, 0, 'season', - 'Year', 1, 4, 99999, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL); diff --git a/installer/data/mysql/es-ES/optional/sample_numberpatterns.txt b/installer/data/mysql/es-ES/optional/sample_numberpatterns.txt deleted file mode 100644 index 853db0fd92..0000000000 --- a/installer/data/mysql/es-ES/optional/sample_numberpatterns.txt +++ /dev/null @@ -1 +0,0 @@ -Sample numbering patterns for subscriptions diff --git a/installer/data/mysql/fr-FR/2-Optionel/sample_frequencies.sql b/installer/data/mysql/fr-FR/2-Optionel/sample_frequencies.sql deleted file mode 100644 index fb7801ae83..0000000000 --- a/installer/data/mysql/fr-FR/2-Optionel/sample_frequencies.sql +++ /dev/null @@ -1,16 +0,0 @@ -INSERT INTO subscription_frequencies - (description, unit, unitsperissue, issuesperunit, displayorder) -VALUES - ('2/jour', 'day', 1, 2, 1), - ('1/jour', 'day', 1, 1, 2), - ('3/semaine', 'week', 1, 3, 3), - ('1/semaine', 'week', 1, 1, 4), - ('1/2 semaines', 'week', 2, 1, 5), - ('1/3 semaines', 'week', 3, 1, 6), - ('1/mois', 'month', 1, 1, 7), - ('1/2 mois', 'month', 2, 1, 8), - ('1/3 mois', 'month', 3, 1, 9), - ('2/an', 'month', 6, 1, 10), - ('1/an', 'year', 1, 1, 11), - ('1/2 ans', 'year', 2, 1, 12), - ('Irrégulier', NULL, 1, 1, 13); diff --git a/installer/data/mysql/fr-FR/2-Optionel/sample_frequencies.txt b/installer/data/mysql/fr-FR/2-Optionel/sample_frequencies.txt deleted file mode 100644 index 8754f46f24..0000000000 --- a/installer/data/mysql/fr-FR/2-Optionel/sample_frequencies.txt +++ /dev/null @@ -1 +0,0 @@ -Sample frequencies for subscriptions diff --git a/installer/data/mysql/fr-FR/2-Optionel/sample_numberpatterns.sql b/installer/data/mysql/fr-FR/2-Optionel/sample_numberpatterns.sql deleted file mode 100644 index 6b5930023a..0000000000 --- a/installer/data/mysql/fr-FR/2-Optionel/sample_numberpatterns.sql +++ /dev/null @@ -1,25 +0,0 @@ -INSERT INTO subscription_numberpatterns - (label, displayorder, description, numberingmethod, - label1, add1, every1, whenmorethan1, setto1, numbering1, - label2, add2, every2, whenmorethan2, setto2, numbering2, - label3, add3, every3, whenmorethan3, setto3, numbering3) -VALUES - ('Number', 1, 'Simple Numbering method', 'No.{X}', - 'Number', 1, 1, 99999, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL), - - ('Volume, Number, Issue', 2, 'Volume Number Issue 1', 'Vol.{X}, Number {Y}, Issue {Z}', - 'Volume', 1, 48, 99999, 1, NULL, - 'Number', 1, 4, 12, 1, NULL, - 'Issue', 1, 1, 4, 1, NULL), - - ('Volume, Number', 3, 'Volume Number 1', 'Vol {X}, No {Y}', - 'Volume', 1, 12, 99999, 1, NULL, - 'Number', 1, 1, 12, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL), - - ('Seasonal', 4, 'Season Year', '{X} {Y}', - 'Season', 1, 1, 3, 0, 'season', - 'Year', 1, 4, 99999, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL); diff --git a/installer/data/mysql/fr-FR/2-Optionel/sample_numberpatterns.txt b/installer/data/mysql/fr-FR/2-Optionel/sample_numberpatterns.txt deleted file mode 100644 index 853db0fd92..0000000000 --- a/installer/data/mysql/fr-FR/2-Optionel/sample_numberpatterns.txt +++ /dev/null @@ -1 +0,0 @@ -Sample numbering patterns for subscriptions diff --git a/installer/data/mysql/it-IT/optional/sample_frequencies.sql b/installer/data/mysql/it-IT/optional/sample_frequencies.sql deleted file mode 100644 index f09c8a2c1b..0000000000 --- a/installer/data/mysql/it-IT/optional/sample_frequencies.sql +++ /dev/null @@ -1,16 +0,0 @@ -INSERT INTO subscription_frequencies - (description, unit, unitsperissue, issuesperunit, displayorder) -VALUES - ('2/day', 'day', 1, 2, 1), - ('1/day', 'day', 1, 1, 2), - ('3/week', 'week', 1, 3, 3), - ('1/week', 'week', 1, 1, 4), - ('1/2 weeks', 'week', 2, 1, 5), - ('1/3 weeks', 'week', 3, 1, 6), - ('1/month', 'month', 1, 1, 7), - ('1/2 months', 'month', 2, 1, 8), - ('1/3 months', 'month', 3, 1, 9), - ('2/year', 'month', 6, 1, 10), - ('1/year', 'year', 1, 1, 11), - ('1/2 year', 'year', 2, 1, 12), - ('Irregular', NULL, 1, 1, 13); diff --git a/installer/data/mysql/it-IT/optional/sample_frequencies.txt b/installer/data/mysql/it-IT/optional/sample_frequencies.txt deleted file mode 100644 index 8754f46f24..0000000000 --- a/installer/data/mysql/it-IT/optional/sample_frequencies.txt +++ /dev/null @@ -1 +0,0 @@ -Sample frequencies for subscriptions diff --git a/installer/data/mysql/it-IT/optional/sample_numberpatterns.sql b/installer/data/mysql/it-IT/optional/sample_numberpatterns.sql deleted file mode 100644 index 6b5930023a..0000000000 --- a/installer/data/mysql/it-IT/optional/sample_numberpatterns.sql +++ /dev/null @@ -1,25 +0,0 @@ -INSERT INTO subscription_numberpatterns - (label, displayorder, description, numberingmethod, - label1, add1, every1, whenmorethan1, setto1, numbering1, - label2, add2, every2, whenmorethan2, setto2, numbering2, - label3, add3, every3, whenmorethan3, setto3, numbering3) -VALUES - ('Number', 1, 'Simple Numbering method', 'No.{X}', - 'Number', 1, 1, 99999, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL), - - ('Volume, Number, Issue', 2, 'Volume Number Issue 1', 'Vol.{X}, Number {Y}, Issue {Z}', - 'Volume', 1, 48, 99999, 1, NULL, - 'Number', 1, 4, 12, 1, NULL, - 'Issue', 1, 1, 4, 1, NULL), - - ('Volume, Number', 3, 'Volume Number 1', 'Vol {X}, No {Y}', - 'Volume', 1, 12, 99999, 1, NULL, - 'Number', 1, 1, 12, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL), - - ('Seasonal', 4, 'Season Year', '{X} {Y}', - 'Season', 1, 1, 3, 0, 'season', - 'Year', 1, 4, 99999, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL); diff --git a/installer/data/mysql/it-IT/optional/sample_numberpatterns.txt b/installer/data/mysql/it-IT/optional/sample_numberpatterns.txt deleted file mode 100644 index 853db0fd92..0000000000 --- a/installer/data/mysql/it-IT/optional/sample_numberpatterns.txt +++ /dev/null @@ -1 +0,0 @@ -Sample numbering patterns for subscriptions diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index ae6be56f71..af1de2273e 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -1854,53 +1854,6 @@ DROP TABLE IF EXISTS `stopwords`; ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- --- Table structure for table subscription_frequencies --- - -DROP TABLE IF EXISTS subscription_frequencies; -CREATE TABLE subscription_frequencies ( - id INTEGER NOT NULL AUTO_INCREMENT, - description TEXT NOT NULL, - displayorder INT DEFAULT NULL, - unit ENUM('day','week','month','year') DEFAULT NULL, - unitsperissue INTEGER NOT NULL DEFAULT '1', - issuesperunit INTEGER NOT NULL DEFAULT '1', - PRIMARY KEY (id) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- --- Table structure for table subscription_numberpatterns --- - -DROP TABLE IF EXISTS subscription_numberpatterns; -CREATE TABLE subscription_numberpatterns ( - id INTEGER NOT NULL AUTO_INCREMENT, - label VARCHAR(255) NOT NULL, - displayorder INTEGER DEFAULT NULL, - description TEXT NOT NULL, - numberingmethod VARCHAR(255) NOT NULL, - label1 VARCHAR(255) DEFAULT NULL, - add1 INTEGER DEFAULT NULL, - every1 INTEGER DEFAULT NULL, - whenmorethan1 INTEGER DEFAULT NULL, - setto1 INTEGER DEFAULT NULL, - numbering1 VARCHAR(255) DEFAULT NULL, - label2 VARCHAR(255) DEFAULT NULL, - add2 INTEGER DEFAULT NULL, - every2 INTEGER DEFAULT NULL, - whenmorethan2 INTEGER DEFAULT NULL, - setto2 INTEGER DEFAULT NULL, - numbering2 VARCHAR(255) DEFAULT NULL, - label3 VARCHAR(255) DEFAULT NULL, - add3 INTEGER DEFAULT NULL, - every3 INTEGER DEFAULT NULL, - whenmorethan3 INTEGER DEFAULT NULL, - setto3 INTEGER DEFAULT NULL, - numbering3 VARCHAR(255) DEFAULT NULL, - PRIMARY KEY (id) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- -- Table structure for table `subscription` -- @@ -1917,27 +1870,40 @@ CREATE TABLE `subscription` ( `monthlength` int(11) default 0, `numberlength` int(11) default 0, `periodicity` tinyint(4) default 0, - countissuesperunit INTEGER NOT NULL DEFAULT 1, + `dow` varchar(100) default '', + `numberingmethod` varchar(100) default '', `notes` mediumtext, `status` varchar(100) NOT NULL default '', + `add1` int(11) default 0, + `every1` int(11) default 0, + `whenmorethan1` int(11) default 0, + `setto1` int(11) default NULL, `lastvalue1` int(11) default NULL, - `innerloop1` int(11) default 0, + `add2` int(11) default 0, + `every2` int(11) default 0, + `whenmorethan2` int(11) default 0, + `setto2` int(11) default NULL, `lastvalue2` int(11) default NULL, + `add3` int(11) default 0, + `every3` int(11) default 0, + `innerloop1` int(11) default 0, `innerloop2` int(11) default 0, - `lastvalue3` int(11) default NULL, `innerloop3` int(11) default 0, + `whenmorethan3` int(11) default 0, + `setto3` int(11) default NULL, + `lastvalue3` int(11) default NULL, + `issuesatonce` tinyint(3) NOT NULL default 1, `firstacquidate` date default NULL, `manualhistory` tinyint(1) NOT NULL default 0, `irregularity` text, - skip_serialseq BOOLEAN NOT NULL DEFAULT 0, `letter` varchar(20) default NULL, `numberpattern` tinyint(3) default 0, - locale VARCHAR(80) DEFAULT NULL, `distributedto` text, `internalnotes` longtext, `callnumber` text, `location` varchar(80) NULL default '', `branchcode` varchar(10) NOT NULL default '', + `hemisphere` tinyint(3) default 0, `lastbranch` varchar(10), `serialsadditems` tinyint(1) NOT NULL default '0', `staffdisplaycount` VARCHAR(10) NULL, @@ -1946,9 +1912,7 @@ CREATE TABLE `subscription` ( `enddate` date default NULL, `closed` INT(1) NOT NULL DEFAULT 0, `reneweddate` date default NULL, - PRIMARY KEY (`subscriptionid`), - CONSTRAINT subscription_ibfk_1 FOREIGN KEY (periodicity) REFERENCES subscription_frequencies (id) ON DELETE SET NULL ON UPDATE CASCADE, - CONSTRAINT subscription_ibfk_2 FOREIGN KEY (numberpattern) REFERENCES subscription_numberpatterns (id) ON DELETE SET NULL ON UPDATE CASCADE + PRIMARY KEY (`subscriptionid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- diff --git a/installer/data/mysql/nb-NO/2-Valgfritt/sample_frequencies.sql b/installer/data/mysql/nb-NO/2-Valgfritt/sample_frequencies.sql deleted file mode 100644 index f09c8a2c1b..0000000000 --- a/installer/data/mysql/nb-NO/2-Valgfritt/sample_frequencies.sql +++ /dev/null @@ -1,16 +0,0 @@ -INSERT INTO subscription_frequencies - (description, unit, unitsperissue, issuesperunit, displayorder) -VALUES - ('2/day', 'day', 1, 2, 1), - ('1/day', 'day', 1, 1, 2), - ('3/week', 'week', 1, 3, 3), - ('1/week', 'week', 1, 1, 4), - ('1/2 weeks', 'week', 2, 1, 5), - ('1/3 weeks', 'week', 3, 1, 6), - ('1/month', 'month', 1, 1, 7), - ('1/2 months', 'month', 2, 1, 8), - ('1/3 months', 'month', 3, 1, 9), - ('2/year', 'month', 6, 1, 10), - ('1/year', 'year', 1, 1, 11), - ('1/2 year', 'year', 2, 1, 12), - ('Irregular', NULL, 1, 1, 13); diff --git a/installer/data/mysql/nb-NO/2-Valgfritt/sample_frequencies.txt b/installer/data/mysql/nb-NO/2-Valgfritt/sample_frequencies.txt deleted file mode 100644 index 8754f46f24..0000000000 --- a/installer/data/mysql/nb-NO/2-Valgfritt/sample_frequencies.txt +++ /dev/null @@ -1 +0,0 @@ -Sample frequencies for subscriptions diff --git a/installer/data/mysql/nb-NO/2-Valgfritt/sample_numberpatterns.sql b/installer/data/mysql/nb-NO/2-Valgfritt/sample_numberpatterns.sql deleted file mode 100644 index 6b5930023a..0000000000 --- a/installer/data/mysql/nb-NO/2-Valgfritt/sample_numberpatterns.sql +++ /dev/null @@ -1,25 +0,0 @@ -INSERT INTO subscription_numberpatterns - (label, displayorder, description, numberingmethod, - label1, add1, every1, whenmorethan1, setto1, numbering1, - label2, add2, every2, whenmorethan2, setto2, numbering2, - label3, add3, every3, whenmorethan3, setto3, numbering3) -VALUES - ('Number', 1, 'Simple Numbering method', 'No.{X}', - 'Number', 1, 1, 99999, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL), - - ('Volume, Number, Issue', 2, 'Volume Number Issue 1', 'Vol.{X}, Number {Y}, Issue {Z}', - 'Volume', 1, 48, 99999, 1, NULL, - 'Number', 1, 4, 12, 1, NULL, - 'Issue', 1, 1, 4, 1, NULL), - - ('Volume, Number', 3, 'Volume Number 1', 'Vol {X}, No {Y}', - 'Volume', 1, 12, 99999, 1, NULL, - 'Number', 1, 1, 12, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL), - - ('Seasonal', 4, 'Season Year', '{X} {Y}', - 'Season', 1, 1, 3, 0, 'season', - 'Year', 1, 4, 99999, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL); diff --git a/installer/data/mysql/nb-NO/2-Valgfritt/sample_numberpatterns.txt b/installer/data/mysql/nb-NO/2-Valgfritt/sample_numberpatterns.txt deleted file mode 100644 index 853db0fd92..0000000000 --- a/installer/data/mysql/nb-NO/2-Valgfritt/sample_numberpatterns.txt +++ /dev/null @@ -1 +0,0 @@ -Sample numbering patterns for subscriptions diff --git a/installer/data/mysql/pl-PL/optional/sample_frequencies.sql b/installer/data/mysql/pl-PL/optional/sample_frequencies.sql deleted file mode 100644 index f09c8a2c1b..0000000000 --- a/installer/data/mysql/pl-PL/optional/sample_frequencies.sql +++ /dev/null @@ -1,16 +0,0 @@ -INSERT INTO subscription_frequencies - (description, unit, unitsperissue, issuesperunit, displayorder) -VALUES - ('2/day', 'day', 1, 2, 1), - ('1/day', 'day', 1, 1, 2), - ('3/week', 'week', 1, 3, 3), - ('1/week', 'week', 1, 1, 4), - ('1/2 weeks', 'week', 2, 1, 5), - ('1/3 weeks', 'week', 3, 1, 6), - ('1/month', 'month', 1, 1, 7), - ('1/2 months', 'month', 2, 1, 8), - ('1/3 months', 'month', 3, 1, 9), - ('2/year', 'month', 6, 1, 10), - ('1/year', 'year', 1, 1, 11), - ('1/2 year', 'year', 2, 1, 12), - ('Irregular', NULL, 1, 1, 13); diff --git a/installer/data/mysql/pl-PL/optional/sample_frequencies.txt b/installer/data/mysql/pl-PL/optional/sample_frequencies.txt deleted file mode 100644 index 8754f46f24..0000000000 --- a/installer/data/mysql/pl-PL/optional/sample_frequencies.txt +++ /dev/null @@ -1 +0,0 @@ -Sample frequencies for subscriptions diff --git a/installer/data/mysql/pl-PL/optional/sample_numberpatterns.sql b/installer/data/mysql/pl-PL/optional/sample_numberpatterns.sql deleted file mode 100644 index 6b5930023a..0000000000 --- a/installer/data/mysql/pl-PL/optional/sample_numberpatterns.sql +++ /dev/null @@ -1,25 +0,0 @@ -INSERT INTO subscription_numberpatterns - (label, displayorder, description, numberingmethod, - label1, add1, every1, whenmorethan1, setto1, numbering1, - label2, add2, every2, whenmorethan2, setto2, numbering2, - label3, add3, every3, whenmorethan3, setto3, numbering3) -VALUES - ('Number', 1, 'Simple Numbering method', 'No.{X}', - 'Number', 1, 1, 99999, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL), - - ('Volume, Number, Issue', 2, 'Volume Number Issue 1', 'Vol.{X}, Number {Y}, Issue {Z}', - 'Volume', 1, 48, 99999, 1, NULL, - 'Number', 1, 4, 12, 1, NULL, - 'Issue', 1, 1, 4, 1, NULL), - - ('Volume, Number', 3, 'Volume Number 1', 'Vol {X}, No {Y}', - 'Volume', 1, 12, 99999, 1, NULL, - 'Number', 1, 1, 12, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL), - - ('Seasonal', 4, 'Season Year', '{X} {Y}', - 'Season', 1, 1, 3, 0, 'season', - 'Year', 1, 4, 99999, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL); diff --git a/installer/data/mysql/pl-PL/optional/sample_numberpatterns.txt b/installer/data/mysql/pl-PL/optional/sample_numberpatterns.txt deleted file mode 100644 index 853db0fd92..0000000000 --- a/installer/data/mysql/pl-PL/optional/sample_numberpatterns.txt +++ /dev/null @@ -1 +0,0 @@ -Sample numbering patterns for subscriptions diff --git a/installer/data/mysql/ru-RU/optional/sample_frequencies.sql b/installer/data/mysql/ru-RU/optional/sample_frequencies.sql deleted file mode 100644 index f09c8a2c1b..0000000000 --- a/installer/data/mysql/ru-RU/optional/sample_frequencies.sql +++ /dev/null @@ -1,16 +0,0 @@ -INSERT INTO subscription_frequencies - (description, unit, unitsperissue, issuesperunit, displayorder) -VALUES - ('2/day', 'day', 1, 2, 1), - ('1/day', 'day', 1, 1, 2), - ('3/week', 'week', 1, 3, 3), - ('1/week', 'week', 1, 1, 4), - ('1/2 weeks', 'week', 2, 1, 5), - ('1/3 weeks', 'week', 3, 1, 6), - ('1/month', 'month', 1, 1, 7), - ('1/2 months', 'month', 2, 1, 8), - ('1/3 months', 'month', 3, 1, 9), - ('2/year', 'month', 6, 1, 10), - ('1/year', 'year', 1, 1, 11), - ('1/2 year', 'year', 2, 1, 12), - ('Irregular', NULL, 1, 1, 13); diff --git a/installer/data/mysql/ru-RU/optional/sample_frequencies.txt b/installer/data/mysql/ru-RU/optional/sample_frequencies.txt deleted file mode 100644 index 8754f46f24..0000000000 --- a/installer/data/mysql/ru-RU/optional/sample_frequencies.txt +++ /dev/null @@ -1 +0,0 @@ -Sample frequencies for subscriptions diff --git a/installer/data/mysql/ru-RU/optional/sample_numberpatterns.sql b/installer/data/mysql/ru-RU/optional/sample_numberpatterns.sql deleted file mode 100644 index 6b5930023a..0000000000 --- a/installer/data/mysql/ru-RU/optional/sample_numberpatterns.sql +++ /dev/null @@ -1,25 +0,0 @@ -INSERT INTO subscription_numberpatterns - (label, displayorder, description, numberingmethod, - label1, add1, every1, whenmorethan1, setto1, numbering1, - label2, add2, every2, whenmorethan2, setto2, numbering2, - label3, add3, every3, whenmorethan3, setto3, numbering3) -VALUES - ('Number', 1, 'Simple Numbering method', 'No.{X}', - 'Number', 1, 1, 99999, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL), - - ('Volume, Number, Issue', 2, 'Volume Number Issue 1', 'Vol.{X}, Number {Y}, Issue {Z}', - 'Volume', 1, 48, 99999, 1, NULL, - 'Number', 1, 4, 12, 1, NULL, - 'Issue', 1, 1, 4, 1, NULL), - - ('Volume, Number', 3, 'Volume Number 1', 'Vol {X}, No {Y}', - 'Volume', 1, 12, 99999, 1, NULL, - 'Number', 1, 1, 12, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL), - - ('Seasonal', 4, 'Season Year', '{X} {Y}', - 'Season', 1, 1, 3, 0, 'season', - 'Year', 1, 4, 99999, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL); diff --git a/installer/data/mysql/ru-RU/optional/sample_numberpatterns.txt b/installer/data/mysql/ru-RU/optional/sample_numberpatterns.txt deleted file mode 100644 index 853db0fd92..0000000000 --- a/installer/data/mysql/ru-RU/optional/sample_numberpatterns.txt +++ /dev/null @@ -1 +0,0 @@ -Sample numbering patterns for subscriptions diff --git a/installer/data/mysql/uk-UA/optional/sample_frequencies.sql b/installer/data/mysql/uk-UA/optional/sample_frequencies.sql deleted file mode 100644 index f09c8a2c1b..0000000000 --- a/installer/data/mysql/uk-UA/optional/sample_frequencies.sql +++ /dev/null @@ -1,16 +0,0 @@ -INSERT INTO subscription_frequencies - (description, unit, unitsperissue, issuesperunit, displayorder) -VALUES - ('2/day', 'day', 1, 2, 1), - ('1/day', 'day', 1, 1, 2), - ('3/week', 'week', 1, 3, 3), - ('1/week', 'week', 1, 1, 4), - ('1/2 weeks', 'week', 2, 1, 5), - ('1/3 weeks', 'week', 3, 1, 6), - ('1/month', 'month', 1, 1, 7), - ('1/2 months', 'month', 2, 1, 8), - ('1/3 months', 'month', 3, 1, 9), - ('2/year', 'month', 6, 1, 10), - ('1/year', 'year', 1, 1, 11), - ('1/2 year', 'year', 2, 1, 12), - ('Irregular', NULL, 1, 1, 13); diff --git a/installer/data/mysql/uk-UA/optional/sample_frequencies.txt b/installer/data/mysql/uk-UA/optional/sample_frequencies.txt deleted file mode 100644 index 8754f46f24..0000000000 --- a/installer/data/mysql/uk-UA/optional/sample_frequencies.txt +++ /dev/null @@ -1 +0,0 @@ -Sample frequencies for subscriptions diff --git a/installer/data/mysql/uk-UA/optional/sample_numberpatterns.sql b/installer/data/mysql/uk-UA/optional/sample_numberpatterns.sql deleted file mode 100644 index 6b5930023a..0000000000 --- a/installer/data/mysql/uk-UA/optional/sample_numberpatterns.sql +++ /dev/null @@ -1,25 +0,0 @@ -INSERT INTO subscription_numberpatterns - (label, displayorder, description, numberingmethod, - label1, add1, every1, whenmorethan1, setto1, numbering1, - label2, add2, every2, whenmorethan2, setto2, numbering2, - label3, add3, every3, whenmorethan3, setto3, numbering3) -VALUES - ('Number', 1, 'Simple Numbering method', 'No.{X}', - 'Number', 1, 1, 99999, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL), - - ('Volume, Number, Issue', 2, 'Volume Number Issue 1', 'Vol.{X}, Number {Y}, Issue {Z}', - 'Volume', 1, 48, 99999, 1, NULL, - 'Number', 1, 4, 12, 1, NULL, - 'Issue', 1, 1, 4, 1, NULL), - - ('Volume, Number', 3, 'Volume Number 1', 'Vol {X}, No {Y}', - 'Volume', 1, 12, 99999, 1, NULL, - 'Number', 1, 1, 12, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL), - - ('Seasonal', 4, 'Season Year', '{X} {Y}', - 'Season', 1, 1, 3, 0, 'season', - 'Year', 1, 4, 99999, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL); diff --git a/installer/data/mysql/uk-UA/optional/sample_numberpatterns.txt b/installer/data/mysql/uk-UA/optional/sample_numberpatterns.txt deleted file mode 100644 index 853db0fd92..0000000000 --- a/installer/data/mysql/uk-UA/optional/sample_numberpatterns.txt +++ /dev/null @@ -1 +0,0 @@ -Sample numbering patterns for subscriptions diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index a01be2b8a9..6285633689 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -6723,259 +6723,6 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } -$DBversion = "3.11.00.114"; -if ( CheckVersion($DBversion) ) { - $dbh->do(qq| - DROP TABLE IF EXISTS subscription_frequencies - |); - $dbh->do(qq| - CREATE TABLE subscription_frequencies ( - id INTEGER NOT NULL AUTO_INCREMENT, - description TEXT NOT NULL, - displayorder INT DEFAULT NULL, - unit ENUM('day','week','month','year') DEFAULT NULL, - unitsperissue INTEGER NOT NULL DEFAULT '1', - issuesperunit INTEGER NOT NULL DEFAULT '1', - PRIMARY KEY (id) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 - |); - - $dbh->do(qq| - DROP TABLE IF EXISTS subscription_numberpatterns - |); - $dbh->do(qq| - CREATE TABLE subscription_numberpatterns ( - id INTEGER NOT NULL AUTO_INCREMENT, - label VARCHAR(255) NOT NULL, - displayorder INTEGER DEFAULT NULL, - description TEXT NOT NULL, - numberingmethod VARCHAR(255) NOT NULL, - label1 VARCHAR(255) DEFAULT NULL, - add1 INTEGER DEFAULT NULL, - every1 INTEGER DEFAULT NULL, - whenmorethan1 INTEGER DEFAULT NULL, - setto1 INTEGER DEFAULT NULL, - numbering1 VARCHAR(255) DEFAULT NULL, - label2 VARCHAR(255) DEFAULT NULL, - add2 INTEGER DEFAULT NULL, - every2 INTEGER DEFAULT NULL, - whenmorethan2 INTEGER DEFAULT NULL, - setto2 INTEGER DEFAULT NULL, - numbering2 VARCHAR(255) DEFAULT NULL, - label3 VARCHAR(255) DEFAULT NULL, - add3 INTEGER DEFAULT NULL, - every3 INTEGER DEFAULT NULL, - whenmorethan3 INTEGER DEFAULT NULL, - setto3 INTEGER DEFAULT NULL, - numbering3 VARCHAR(255) DEFAULT NULL, - PRIMARY KEY (id) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 - |); - - $dbh->do(qq| - INSERT INTO subscription_frequencies (description, unit, unitsperissue, issuesperunit, displayorder) - VALUES - ('2/day', 'day', 1, 2, 1), - ('1/day', 'day', 1, 1, 2), - ('3/week', 'week', 1, 3, 3), - ('1/week', 'week', 1, 1, 4), - ('1/2 weeks', 'week', 2, 1, 5), - ('1/3 weeks', 'week', 3, 1, 6), - ('1/month', 'month', 1, 1, 7), - ('1/2 months', 'month', 2, 1, 8), - ('1/3 months', 'month', 3, 1, 9), - ('2/year', 'month', 6, 1, 10), - ('1/year', 'year', 1, 1, 11), - ('1/2 year', 'year', 2, 1, 12), - ('Irregular', NULL, 1, 1, 13) - |); - - # Used to link existing subscription to newly created frequencies - my $frequencies_mapping = { # keys are old frequency numbers, values are the new ones - 1 => 2, # daily (n/week) - 2 => 4, # 1/week - 3 => 5, # 1/2 weeks - 4 => 6, # 1/3 weeks - 5 => 7, # 1/month - 6 => 8, # 1/2 months (6/year) - 7 => 9, # 1/3 months (1/quarter) - 8 => 9, # 1/quarter (seasonal) - 9 => 10, # 2/year - 10 => 11, # 1/year - 11 => 12, # 1/2 years - 12 => 1, # 2/day - 16 => 13, # Without periodicity - 32 => 13, # Irregular - 48 => 13 # Unknown - }; - - $dbh->do(qq| - INSERT INTO subscription_numberpatterns - (label, displayorder, description, numberingmethod, - label1, add1, every1, whenmorethan1, setto1, numbering1, - label2, add2, every2, whenmorethan2, setto2, numbering2, - label3, add3, every3, whenmorethan3, setto3, numbering3) - VALUES - ('Number', 1, 'Simple Numbering method', 'No.{X}', - 'Number', 1, 1, 99999, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL), - - ('Volume, Number, Issue', 2, 'Volume Number Issue 1', 'Vol.{X}, Number {Y}, Issue {Z}', - 'Volume', 1, 48, 99999, 1, NULL, - 'Number', 1, 4, 12, 1, NULL, - 'Issue', 1, 1, 4, 1, NULL), - - ('Volume, Number', 3, 'Volume Number 1', 'Vol {X}, No {Y}', - 'Volume', 1, 12, 99999, 1, NULL, - 'Number', 1, 1, 12, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL), - - ('Seasonal', 4, 'Season Year', '{X} {Y}', - 'Season', 1, 1, 3, 0, 'season', - 'Year', 1, 4, 99999, 1, NULL, - NULL, NULL, NULL, NULL, NULL, NULL) - |); - - $dbh->do(qq| - ALTER TABLE subscription - MODIFY COLUMN numberpattern INTEGER DEFAULT NULL, - MODIFY COLUMN periodicity INTEGER DEFAULT NULL - |); - - # Update existing subscriptions - - my $query = qq| - SELECT subscriptionid, periodicity, numberingmethod, - add1, every1, whenmorethan1, setto1, - add2, every2, whenmorethan2, setto2, - add3, every3, whenmorethan3, setto3 - FROM subscription - ORDER BY subscriptionid - |; - my $sth = $dbh->prepare($query); - $sth->execute; - my $insert_numberpatterns_sth = $dbh->prepare(qq| - INSERT INTO subscription_numberpatterns - (label, displayorder, description, numberingmethod, - label1, add1, every1, whenmorethan1, setto1, numbering1, - label2, add2, every2, whenmorethan2, setto2, numbering2, - label3, add3, every3, whenmorethan3, setto3, numbering3) - VALUES - (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) - |); - my $check_numberpatterns_sth = $dbh->prepare(qq| - SELECT * FROM subscription_numberpatterns - WHERE add1 = ? AND add2 = ? AND add3 = ? - AND every1 = ? AND every2 = ? AND every3 = ? - AND whenmorethan1 = ? AND whenmorethan2 = ? AND whenmorethan3 = ? - AND setto1 = ? AND setto2 = ? AND setto3 = ? - AND numberingmethod = ? - LIMIT 1 - |); - my $update_subscription_sth = $dbh->prepare(qq| - UPDATE subscription - SET numberpattern = ?, - periodicity = ? - WHERE subscriptionid = ? - |); - - my $i = 1; - while(my $sub = $sth->fetchrow_hashref) { - $check_numberpatterns_sth->execute( - $sub->{add1}, $sub->{add2}, $sub->{add3}, - $sub->{every1}, $sub->{every2}, $sub->{every3}, - $sub->{whenmorethan1}, $sub->{whenmorethan2}, $sub->{whenmorethan3}, - $sub->{setto1}, $sub->{setto2}, $sub->{setto3}, - $sub->{numberingmethod} - ); - my $p = $check_numberpatterns_sth->fetchrow_hashref; - if (defined $p) { - # Pattern already exists, link to it - $update_subscription_sth->execute($p->{id}, - $frequencies_mapping->{$sub->{periodicity}}, - $sub->{subscriptionid}); - } else { - # Create a new numbering pattern for this subscription - my $ok = $insert_numberpatterns_sth->execute( - "Backup pattern $i", 4+$i, "Automatically created pattern by updatedatabase", $sub->{numberingmethod}, - "X", $sub->{add1}, $sub->{every1}, $sub->{whenmorethan1}, $sub->{setto1}, undef, - "Y", $sub->{add2}, $sub->{every2}, $sub->{whenmorethan2}, $sub->{setto2}, undef, - "Z", $sub->{add3}, $sub->{every3}, $sub->{whenmorethan3}, $sub->{setto3}, undef - ); - if($ok) { - my $id = $dbh->last_insert_id(undef, undef, 'subscription_numberpatterns', undef); - # Link to subscription_numberpatterns and subscription_frequencies - $update_subscription_sth->execute($id, - $frequencies_mapping->{$sub->{periodicity}}, - $sub->{subscriptionid}); - } - $i++; - } - } - - # Remove now useless columns - $dbh->do(qq| - ALTER TABLE subscription - DROP COLUMN numberingmethod, - DROP COLUMN add1, - DROP COLUMN every1, - DROP COLUMN whenmorethan1, - DROP COLUMN setto1, - DROP COLUMN add2, - DROP COLUMN every2, - DROP COLUMN whenmorethan2, - DROP COLUMN setto2, - DROP COLUMN add3, - DROP COLUMN every3, - DROP COLUMN whenmorethan3, - DROP COLUMN setto3, - DROP COLUMN dow, - DROP COLUMN issuesatonce, - DROP COLUMN hemisphere, - ADD COLUMN countissuesperunit INTEGER NOT NULL DEFAULT 1 AFTER periodicity, - ADD COLUMN skip_serialseq BOOLEAN NOT NULL DEFAULT 0 AFTER irregularity, - ADD COLUMN locale VARCHAR(80) DEFAULT NULL AFTER numberpattern, - ADD CONSTRAINT subscription_ibfk_1 FOREIGN KEY (periodicity) REFERENCES subscription_frequencies (id) ON DELETE SET NULL ON UPDATE CASCADE, - ADD CONSTRAINT subscription_ibfk_2 FOREIGN KEY (numberpattern) REFERENCES subscription_numberpatterns (id) ON DELETE SET NULL ON UPDATE CASCADE - |); - - # Set firstacquidate if not already set (firstacquidate is now mandatory) - my $get_first_planneddate_sth = $dbh->prepare(qq| - SELECT planneddate - FROM serial - WHERE subscriptionid = ? - ORDER BY serialid - LIMIT 1 - |); - my $update_firstacquidate_sth = $dbh->prepare(qq| - UPDATE subscription - SET firstacquidate = ? - WHERE subscriptionid = ? - |); - my $get_subscriptions_sth = $dbh->prepare(qq| - SELECT subscriptionid, startdate - FROM subscription - WHERE firstacquidate IS NULL - OR firstacquidate = '0000-00-00' - |); - $get_subscriptions_sth->execute; - while ( my ($subscriptionid, $startdate) = $get_subscriptions_sth->fetchrow ) { - # Try to get the planned date of the first serial - $get_first_planneddate_sth->execute($subscriptionid); - my ($first_planneddate) = $get_first_planneddate_sth->fetchrow; - if ($first_planneddate and $first_planneddate =~ /^\d{4}-\d{2}-\d{2}$/) { - $update_firstacquidate_sth->execute($first_planneddate, $subscriptionid); - } else { - # Defaults to subscription start date - $update_firstacquidate_sth->execute($startdate, $subscriptionid); - } - } - - print "Upgrade to $DBversion done (Bug 7688: Add subscription_frequencies and subscription_numberpatterns tables)\n"; - SetVersion($DBversion); -} - $DBversion = "3.11.00.115"; if ( CheckVersion($DBversion) ) { $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('HighlightOwnItemsOnOPAC','0','','If on, and a patron is logged into the OPAC, items from his or her home library will be emphasized and shown first in search results and item details.','YesNo')"); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc index b6c4b323c5..808319262a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc @@ -20,14 +20,4 @@ [% IF ( CAN_user_serials_check_expiration ) %]
  • Check expiration
    • [% END %] -
  • - - Manage frequencies - -
    • -
  • - - Manage numbering patterns - -
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt index 2bac863ab7..eeb9262b17 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt @@ -118,11 +118,64 @@ $(document).ready(function() { [% FOREACH subscription IN subscriptions %] [% UNLESS ( loop.odd ) %][% ELSE %][% END %] - # [% subscription.subscriptionid %] - [% subscription.frequency.description %] - [% subscription.numberpattern.label %] - [% subscription.branchcode %] - [% subscription.callnumber %] + # [% subscription.subscriptionid %] + [% IF ( subscription.periodicity1 ) %] + 1/day + [% END %] + [% IF ( subscription.periodicity2 ) %] + 1/week + [% END %] + [% IF ( subscription.periodicity3 ) %] + 1/2 weeks + [% END %] + [% IF ( subscription.periodicity4 ) %] + 1/3 weeks + [% END %] + [% IF ( subscription.periodicity5 ) %] + 1/Month + [% END %] + [% IF ( subscription.periodicity6 ) %] + 1/2 Months (6/year) + [% END %] + [% IF ( subscription.periodicity7 ) %] + 1/quarter + [% END %] + [% IF ( subscription.periodicity8 ) %] + 1/quarter + [% END %] + [% IF ( subscription.periodicity9 ) %] + 2/year + [% END %] + [% IF ( subscription.periodicity10 ) %] + 1/year + [% END %] + [% IF ( subscription.periodicity11 ) %] + 1/2 years + [% END %] + + [% IF ( subscription.numberpattern1 ) %] + Number + [% END %] + [% IF ( subscription.numberpattern2 ) %] + Volume, number, issue + [% END %] + [% IF ( subscription.numberpattern3 ) %] + Volume, number + [% END %] + [% IF ( subscription.numberpattern4 ) %] + Volume, issue + [% END %] + [% IF ( subscription.numberpattern5 ) %] + Number, issue + [% END %] + [% IF ( subscription.numberpattern6 ) %] + Seasonal only + [% END %] + [% IF ( subscription.numberpattern7 ) %] + None of the above + [% END %] + [% subscription.branchcode %] + [% subscription.callnumber %] [% subscription.notes %] [% UNLESS subscription.closed %] [% IF ( subscription.subscriptionexpired ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt deleted file mode 100644 index 5a1265290f..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt +++ /dev/null @@ -1,82 +0,0 @@ -[% USE KohaDates %] - -

    Prediction pattern

    -[% IF (not_consistent_end_date) %] -

    End date is not consistent with subscription length.

    -[% END %] -[% IF (ask_for_irregularities) %] -

    Please check issues that are NOT published (irregularities)

    - [% IF (daily_options) %] - -

    - If there is a day (or more) in the week where issues are never - published, you can check corresponding boxes below. -

    - - - - - - - - - - - - - - - [% END %] -[% END %] -[% IF (predictions_loop) %] - - - - - - [% IF (ask_for_irregularities) %] - - [% END %] - - - - [% FOREACH prediction IN predictions_loop %] - - - - [% IF (ask_for_irregularities) %] - - [% END %] - [% END %] - - [% END %] - -
    NumberPublication DateNot published
    [% prediction.number %] - [% IF (prediction.publicationdate) %] - [% prediction.publicationdate | $KohaDates %] - [% ELSE %] - unknown - [% END %] - - [% UNLESS (loop.first) %] - [% IF (prediction.not_published) %] - - [% ELSE %] - - [% END %] -
    -[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt index c0b4816ce6..35d418727c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt @@ -1,5 +1,3 @@ -[% USE KohaDates %] - [% INCLUDE 'doc-head-open.inc' %] Koha › Serials › [% IF ( modify ) %][% bibliotitle |html %] › Modify subscription[% ELSE %]New subscription[% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -13,441 +11,953 @@ fieldset.rows li.radio { width: 100%; } /* override staff-global.css */ @@ -470,383 +978,415 @@ $(document).ready(function() {
    -
    -
    -

    [% IF ( modify ) %] Modify subscription for [% bibliotitle |html %][% ELSE %]Add a new subscription[% END %] (1/2)

    -
    - [% IF ( modify ) %] - - + +
    +

    [% IF ( modify ) %] Modify subscription for [% bibliotitle |html %][% ELSE %]Add a new subscription[% END %]

    +
    + +[% IF ( modify ) %] + + +[% ELSE %] + +[% END %] + + + + +
    +
    + Subscription details +
      + [% IF ( subscriptionid ) %] +
    1. Subscription # [% subscriptionid %]
      2. + [% END %] +
    2. + + () Search for a vendor +
      3. +
    3. + + + + () Required +
      Search for Biblio + [% IF ( CAN_user_editcatalogue ) %] + [% IF ( modify ) %] + | Edit biblio + [% ELSE %] + | Create Biblio + [% END %] + [% END %] +
      + +
      4. +
    4. + [% IF ( serialsadditems ) %] +

      +

      + [% ELSE %] +

      +

      + [% END %] +
      5. +
    5. + + + (select a library) + +
      6. +
    6. + + +
      7. +
    7. + + +
      8. +
    8. + day(s) +
      9. +
    9. + + +
      10. +
    10. + + +
      11. +
    11. + + [% IF ( letterloop ) %] + + +
      Select a notice and subscribers will be notified when new issues are received.
      + [% ELSE %] + Patron notification: +
      To notify patrons of new serial issues, you must define a notice.
      + [% END %] +
      12. +
    12. + + +
      13. +
    13. + + +
      14. +
    +
    +
    + +
    + + +
    +
    + Serials planning +
      +
    1. + + [% IF ( modify ) %] + [% ELSE %][% END %] +
      2. + [% IF ( modify ) %]
    2. + +
      3. [% END %] + +
    3. + + + [% END %] - - - -
      -
      -
      - Subscription details -
        - [% IF ( subscriptionid ) %] -
      1. Subscription # [% subscriptionid %]
        2. - [% END %] -
      2. - - () Search for a vendor -
        3. -
      3. - - - () Required -
        Search for Biblio - [% IF ( CAN_user_editcatalogue ) %] - [% IF ( modify ) %] - | Edit biblio - [% ELSE %] - | Create Biblio - [% END %] - [% END %] -
        -
        4. -
      4. - [% IF ( serialsadditems ) %] -

        -

        - [% ELSE %] -

        -

        - [% END %] -
        5. -
      5. -

        When there is an irregular issue:

        - [% IF (skip_serialseq) %] -

        - - -

        -

        - - -

        - [% ELSE %] -

        - - -

        -

        - - -

        - [% END %] -
        6. -
      6. - - [% IF (manualhistory) %] - - [% ELSE %] - - [% END %] -
        7. -
      7. - - -
        8. -
      8. - - (select a library) -
        9. -
      9. - - -
        10. -
      10. - - -
        11. -
      11. - [% IF ( letterloop ) %] - - -
        Select a notice and patrons on the routing list will be notified when new issues are received.
        - [% ELSE %] - Patron notification: -
        To notify patrons of new serial issues, you must define a notice.
        - [% END %] -
        12. -
      12. - - -
        13. -
      13. - - day(s) -
        14. -
      14. - - -
        15. -
      15. - - -
        16. -
      -
      -
      - -
      -
      -
      - -
      -
      -
      -
      - Serials planning -
        -
      1. - - [% UNLESS (more_than_one_serial) %] - - [% ELSE %] - [% firstacquidate | $KohaDates %] - - [% END %] -
        2. - [% IF (more_than_one_serial) %] -
      2. - - -
        3. - [% END %] -
      3. - - -
        4. -
      4. - - - (enter amount in numerals) - -
        5. -
      5. - - -
        6. -
      6. - - -
        7. -
      7. - - -
        8. -
      8. - - - If empty, system locale is used -
        9. -
      9. - - - - - - - - - - - - - - - - - - - - - - - -
            
        - [% IF (more_than_one_serial) %] - Last value - [% ELSE %] - Begins with - [% END %] -
        Inner counter
        -
        10. -
      10. Show/Hide advanced pattern
        11. - -
      -
      -
      - - - -
      -
      -
      -
      -
    4. -
    -
    - + [% IF ( periodicity3 ) %] + + [% ELSE %] + + [% END %] + [% IF ( periodicity4 ) %] + + [% ELSE %] + + [% END %] + [% IF ( periodicity5 ) %] + + [% ELSE %] + + [% END %] + [% IF ( periodicity6 ) %] + + [% ELSE %] + + [% END %] + [% IF ( periodicity7 ) %] + + [% ELSE %] + + [% END %] + + [% IF ( periodicity8 ) %] + + [% ELSE %] + + [% END %] + [% IF ( periodicity13 ) %] + + [% ELSE %] + + [% END %] + + [% IF ( periodicity9 ) %] + + [% ELSE %] + + [% END %] + [% IF ( periodicity10 ) %] + + [% ELSE %] + + [% END %] + [% IF ( periodicity11 ) %] + + [% ELSE %] + + [% END %] + Required +
  • + + [% IF ( manualhistory ) %] + + [% ELSE %] + + [% END %] +
    • +
  • + + + +
    • +
  • +
  • +
  • +
  • + + + Required +
    • +
  • + + + + (enter amount in numerals) + Required +
    • +
  • + + +
    • +
  • +
    • + + + +
    + + + +
    +
    + +
    + -
    + +
    +
    + +
    +
    [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt index a507abbdd9..a7b9e832b2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt @@ -9,6 +9,21 @@ var text = new Array(_("Number"),_("Volume"),_("Issue"),_("Month"),_("Week"),_(" "Autumn"),_("Winter"),_("Spring"),_("Summer"),_("Fall"),_("Season"),_("Year")); +// to display the options section +function options(x,y,z){ +var textbox = ''; + // alert("X: "+x+"Y: "+y+"Z: "+z); + if(x){ + document.f.xfield.value = x; + if(y){ + document.f.yfield.value = y; + if(z){ + document.f.zfield.value = z; + } + } + } +} + function confirm_deletion() { var is_confirmed = confirm(_("Are you sure you want to delete this subscription?")); if (is_confirmed) { @@ -93,14 +108,6 @@ $(document).ready(function() { [% ELSE %]
  • Items: Serial receipt does not create an item record.
    • [% END %] -
  • - Serial number: - [% IF skip_serialseq %] - Serial number is skipped when an irregularity is found. - [% ELSE %] - Serial number is kept when an irregularity is found. - [% END %] -
  • Grace period: [% graceperiod %]
    • @@ -164,44 +171,118 @@ $(document).ready(function() {
    1. Beginning date: [% startdate %]
      2. -
    2. Frequency: - [% frequency.description %] +
    3. Frequency (*): + [% IF ( periodicity16 ) %] + Without regularity + [% END %] + [% IF ( periodicity32 ) %] + Irregular + [% END %] + [% IF ( periodicity0 ) %] + Unknown + [% END %] + [% IF ( periodicity12 ) %] + 2/day + [% END %] + [% IF ( periodicity1 ) %] + 1/day + [% END %] + [% IF ( periodicity13 ) %] + 1/4 months (3/year) + [% END %] + [% IF ( periodicity2 ) %] + 1/week + [% END %] + [% IF ( periodicity3 ) %] + 1/2 weeks + [% END %] + [% IF ( periodicity4 ) %] + 1/3 weeks + [% END %] + [% IF ( periodicity5 ) %] + 1/month + [% END %] + [% IF ( periodicity6 ) %] + 1/2 months (6/year) + [% END %] + [% IF ( periodicity7 ) %] + 1/quarter + [% END %] + [% IF ( periodicity8 ) %] + 1/quarter + [% END %] + [% IF ( periodicity9 ) %] + 2/year + [% END %] + [% IF ( periodicity10 ) %] + 1/year + [% END %] + [% IF ( periodicity11 ) %] + 1/2 years + [% END %]
    4. Manual history: [% IF ( manualhistory ) %] - Enabled Edit history + Enabled [% ELSE %] Disabled [% END %]
    5. Number pattern: - [% numberpattern.label %] -
      6. -
    6. - - - [% IF (has_X) %] - + [% IF ( numberpattern1 ) %] + Number only [% END %] - [% IF (has_Y) %] - + [% IF ( numberpattern2 ) %] + Volume, number, issue [% END %] - [% IF (has_Z) %] - + [% IF ( numberpattern3 ) %] + Volume, number [% END %] - - - - [% IF (has_X) %] - + [% IF ( numberpattern4 ) %] + Volume, issue [% END %] - [% IF (has_Y) %] - + [% IF ( numberpattern5 ) %] + Number, issue [% END %] - [% IF (has_Z) %] - + [% IF ( numberpattern8 ) %] + Year/Number [% END %] + [% IF ( numberpattern6 ) %] + Seasonal only + [% END %] + [% IF ( numberpattern7 ) %] + None of the above + [% END %] + +
    7. Starting with:[% lastvalue1 %][% lastvalue2 %][% lastvalue3 %]
      Rollover:[% numberpattern.whenmorethan1 %][% numberpattern.whenmorethan2 %][% numberpattern.whenmorethan3 %]
      + + + [% IF ( lastvalue2 ) %] + + [% END %] + [% IF ( lastvalue3 ) %] + + [% END %] + + + + [% IF ( whenmorethan2 ) %] + + [% END %] + [% IF ( whenmorethan3 ) %] + + [% END %]
      Starting with:[% lastvalue1 %]  + [% lastvalue2 %] +   + [% lastvalue3 %] +
      Rollover: + [% IF ( whenmorethan1 < 9999999 ) %][% whenmorethan1 %][% ELSE %]Never[% END %] +   + [% IF ( whenmorethan2 < 9999999 ) %][% whenmorethan2 %][% ELSE %]Never[% END %] +   + [% IF ( whenmorethan3 < 9999999 ) %][% whenmorethan3 %][% ELSE %]Never[% END %] +
      8. [% IF ( irregular_issues ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt deleted file mode 100644 index 8f8a4ab6e7..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt +++ /dev/null @@ -1,215 +0,0 @@ -[% INCLUDE 'doc-head-open.inc' %] -Koha › Serials › Frequencies -[% INCLUDE 'doc-head-close.inc' %] - - - - -[% INCLUDE 'header.inc' %] -[% INCLUDE 'serials-search.inc' %] - - - -
      - -
      -
      -
      - [% IF (new or modify) %] - [% IF (new) %] -

      New frequency

      - [% ELSE %] -

      Modify frequency: [% description %]

      - [% END %] -
      - [% IF (modify) %] - - - [% ELSE %] - - [% END %] -
      -
        -
      1. - - -
        2. -
      2. - - -
        3. -
      3. Note: one of the two following fields must be equal to 1
        4. -
      4. - - [% IF (new) %] - - [% ELSE %] - - [% END %] -
        5. -
      5. - - [% IF (new) %] - - [% ELSE %] - - [% END %] -
        6. -
      6. - - -
        7. -
      -
      -
      - - -
      -
      - [% ELSE %] -

      Frequencies

      - [% IF still_used %] -
      -

      - This frequency is still used by [% subscriptions.size %] - subscription(s). Do you still want to delete it? -

      -

      Show subscriptions

      - - -
      - - - - -
      -
      - -
      -
      - [% END %] - New frenquency - - [% IF (frequencies_loop.size) %] - - - - - - - - - - - - - [% FOREACH frequency IN frequencies_loop %] - - - - - - - - - [% END %] - -
      DescriptionUnitIssues per unitUnits per issueDisplay order 
      [% frequency.description %][% frequency.unit %][% frequency.issuesperunit %][% frequency.unitsperissue %][% frequency.displayorder %] - Modify | - Delete -
      - [% ELSE %] -

      There is no defined frequency.

      - [% END %] - [% END %] - -
      -
      -
      - [% INCLUDE 'serials-menu.inc' %] -
      -
      -[% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt deleted file mode 100644 index ef35f31e03..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt +++ /dev/null @@ -1,60 +0,0 @@ -[% USE KohaDates %] - -[% INCLUDE 'doc-head-open.inc' %] -Koha › Serials › Subscription history -[% INCLUDE 'doc-head-close.inc' %] - - - -[% INCLUDE 'header.inc' %] -[% INCLUDE 'serials-search.inc' %] - - - -
      - -
      -
      -
      -

      Subscription history for [% title %]

      -
      -
      - - -

      Hint : you can update the serial history manually. This can be useful for an old subscription or to clean the existing history. Modify those fields with care, as future serial recieve will continue to update them automatically.

      - - - - - - - - - - - - - - - - - - - - - - - - - -
      Subscription start date (start date of the 1st subscription)
      Subscription end date(if empty, subscription is still active)
      Received issues
      Missing issues
      Note for OPAC
      Note for staff
      - -
      -
      -
      -
      -
      - [% INCLUDE 'serials-menu.inc' %] -
      -
      -[% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt deleted file mode 100644 index 4ab79f4ffa..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt +++ /dev/null @@ -1,333 +0,0 @@ -[% INCLUDE 'doc-head-open.inc' %] -Koha › Serials › Number patterns -[% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'calendar.inc' %] - - - - -[% INCLUDE 'header.inc' %] -[% INCLUDE 'serials-search.inc' %] - - - -
      - -
      -
      -
      - [% IF (new or modify) %] -
      - [% IF (new) %] -

      New number pattern

      - [% IF (error_existing_numberpattern) %] -
      -

      A pattern with this name already exists.

      -
      - [% END %] - [% ELSE %] -

      Modify pattern: [% label %]

      - [% IF (error_existing_numberpattern) %] -
      -

      Another pattern with this name already exists.

      -
      - [% END %] - [% END %] -
      -
      -
      - [% IF (new) %] - - [% ELSE %] - - - [% END %] -
      -
        -
      1. - - -
        2. -
      2. - - -
        3. -
      3. - - -
        4. -
      4. - - -
        5. -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [% BLOCK numbering_select %] - - [% END %] - - - - - - -
       XYZ
      Label
      Add
      Every
      Set back to
      When more than
      Fromatting[% PROCESS numbering_select name="numbering1" value=numbering1 %][% PROCESS numbering_select name="numbering2" value=numbering2 %][% PROCESS numbering_select name="numbering3" value=numbering3 %]
      -
      -
      - - - -
      -
      -
      -
      -
      -
      - Test prediction pattern -
        -
      1. - - -
        2. -
      2. - - -
        3. -
      3. - - - -
        4. -
      4. - - - If empty, system locale is used -
        5. -
      - - - - - - - - - - - - - - - - - - - - - - - -
       XYZ
      Begins with
      Inner counter
      -
      - -
      -
      -
      -
      -
      - [% ELSE %] -

      Number patterns

      - [% IF still_used %] -
      -

      - This pattern is still used by [% subscriptions.size %] - subscription(s). Do you still want to delete it? -

      -

      Show subscriptions

      - - -
      - - - - -
      -
      - -
      -
      - [% END %] - New numbering pattern - [% IF (numberpatterns_loop.size) %] - - - - - - - - - - - - [% FOREACH numberpattern IN numberpatterns_loop %] - - - - - - - - [% END %] - -
      NameDescriptionNumbering formulaDisplay order 
      [% numberpattern.label %][% numberpattern.description %][% numberpattern.numberingmethod %][% numberpattern.displayorder %] - Edit | - Delete -
      - [% ELSE %] -

      There is no existing patterns.

      - [% END %] - [% END %] -
      -
      -
      - [% INCLUDE 'serials-menu.inc' %] -
      -
      -[% INCLUDE 'intranet-bottom.inc' %] diff --git a/serials/create-numberpattern.pl b/serials/create-numberpattern.pl deleted file mode 100755 index 8aa967e7f3..0000000000 --- a/serials/create-numberpattern.pl +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/perl - -use CGI; -use C4::Context; -use C4::Serials::Numberpattern; -use URI::Escape; -use strict; -use warnings; - -my $input = new CGI; - -my $numberpattern; -foreach (qw/ numberingmethod label1 label2 label3 add1 add2 add3 - every1 every2 every3 setto1 setto2 setto3 whenmorethan1 whenmorethan2 - whenmorethan3 numbering1 numbering2 numbering3 locale /) { - $numberpattern->{$_} = $input->param($_); -} -# patternname is label in database -$numberpattern->{'label'} = $input->param('patternname'); - -# Check if pattern already exist in database -my $dbh = C4::Context->dbh; -my $query = qq{ - SELECT id - FROM subscription_numberpatterns - WHERE STRCMP(label, ?) = 0 -}; -my $sth = $dbh->prepare($query); -my $rv = $sth->execute($numberpattern->{'label'}); -my $numberpatternid; -if($rv == 0) { - # Pattern does not exists - $numberpatternid = AddSubscriptionNumberpattern($numberpattern); -} else { - ($numberpatternid) = $sth->fetchrow_array; - $numberpattern->{'id'} = $numberpatternid; - ModSubscriptionNumberpattern($numberpattern); -} - -binmode STDOUT, ":encoding(UTF-8)"; -print $input->header(-type => 'text/plain', -charset => 'UTF-8'); -print "{\"numberpatternid\":\"$numberpatternid\"}"; diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl index 28b4d6a94c..ad57e0755b 100755 --- a/serials/serials-collection.pl +++ b/serials/serials-collection.pl @@ -61,40 +61,38 @@ if($op eq 'gennext' && @subscriptionid){ my $status = defined( $nbissues ) ? 2 : 3; $nbissues ||= 1; for ( my $i = 0; $i < $nbissues; $i++ ){ - $sth->execute($subscriptionid); - # modify actual expected issue, to generate the next - if ( my $issue = $sth->fetchrow_hashref ) { - ModSerialStatus( $issue->{serialid}, $issue->{serialseq}, - $issue->{planneddate}, $issue->{publisheddate}, - $status, "" ); - } else { - require C4::Serials::Numberpattern; + $sth->execute($subscriptionid); + # modify actual expected issue, to generate the next + if ( my $issue = $sth->fetchrow_hashref ) { + ModSerialStatus( $issue->{serialid}, $issue->{serialseq}, + $issue->{planneddate}, $issue->{publisheddate}, + $status, "" ); + }else{ my $subscription = GetSubscription($subscriptionid); - my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscription->{numberpattern}); my $expected = GetNextExpected($subscriptionid); - my ( - $newserialseq, $newlastvalue1, $newlastvalue2, $newlastvalue3, - $newinnerloop1, $newinnerloop2, $newinnerloop3 - ) = GetNextSeq($subscription, $pattern, $expected->{publisheddate}); - - ## We generate the next publication date - my $nextpublisheddate = GetNextDate($subscription, $expected->{publisheddate}, 1); - ## Creating the new issue - NewIssue( $newserialseq, $subscriptionid, $subscription->{'biblionumber'}, - 1, $nextpublisheddate, $nextpublisheddate ); - - ## Updating the subscription seq status - my $squery = "UPDATE subscription SET lastvalue1=?, lastvalue2=?, lastvalue3=?, innerloop1=?, innerloop2=?, innerloop3=? - WHERE subscriptionid = ?"; - my $seqsth = $dbh->prepare($squery); - $seqsth->execute( - $newlastvalue1, $newlastvalue2, $newlastvalue3, $newinnerloop1, - $newinnerloop2, $newinnerloop3, $subscriptionid - ); - - } - last if $nbissues == 1; - last if HasSubscriptionExpired($subscriptionid) > 0; + my ( + $newserialseq, $newlastvalue1, $newlastvalue2, $newlastvalue3, + $newinnerloop1, $newinnerloop2, $newinnerloop3 + ) = GetNextSeq($subscription); + + ## We generate the next publication date + my $nextpublisheddate = GetNextDate( $expected->{planneddate}->output('iso'), $subscription ); + ## Creating the new issue + NewIssue( $newserialseq, $subscriptionid, $subscription->{'biblionumber'}, + 1, $nextpublisheddate, $nextpublisheddate ); + + ## Updating the subscription seq status + my $squery = "UPDATE subscription SET lastvalue1=?, lastvalue2=?, lastvalue3=?, innerloop1=?, innerloop2=?, innerloop3=? + WHERE subscriptionid = ?"; + my $seqsth = $dbh->prepare($squery); + $seqsth->execute( + $newlastvalue1, $newlastvalue2, $newlastvalue3, $newinnerloop1, + $newinnerloop2, $newinnerloop3, $subscriptionid + ); + + } + last if $nbissues == 1; + last if HasSubscriptionExpired($subscriptionid) > 0; } print $query->redirect('/cgi-bin/koha/serials/serials-collection.pl?subscriptionid='.$subscriptionid); } @@ -111,6 +109,9 @@ if (@subscriptionid){ $subs->{missinglist} =~ s/\n/\/g; $subs->{recievedlist} =~ s/\n/\/g; ##these are display information + $subs->{ "periodicity" . $subs->{periodicity} } = 1; + $subs->{ "numberpattern" . $subs->{numberpattern} } = 1; + $subs->{ "status" . $subs->{'status'} } = 1; $subs->{startdate} = format_date( $subs->{startdate} ); $subs->{histstartdate} = format_date( $subs->{histstartdate} ); if ( !defined $subs->{enddate} || $subs->{enddate} eq '0000-00-00' ) { @@ -124,10 +125,6 @@ if (@subscriptionid){ $subs->{'subscriptionid'} = $subscriptionid; # FIXME - why was this lost ? $location = GetAuthorisedValues('LOC', $subs->{'location'}); $callnumber = $subs->{callnumber}; - my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subs->{periodicity}); - my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subs->{numberpattern}); - $subs->{frequency} = $frequency; - $subs->{numberpattern} = $numberpattern; push @$subscriptiondescs,$subs; my $tmpsubscription= GetFullSubscription($subscriptionid); @subscriptioninformation=(@$tmpsubscription,@subscriptioninformation); @@ -157,7 +154,6 @@ foreach (@$location) { $locationlib = $_->{'lib'} if $_->{'selected'}; } - chop $subscriptionidlist; $template->param( subscriptionidlist => $subscriptionidlist, diff --git a/serials/serials-recieve.pl b/serials/serials-recieve.pl index c14e4d075b..770d10d1e0 100755 --- a/serials/serials-recieve.pl +++ b/serials/serials-recieve.pl @@ -192,7 +192,10 @@ for(my $i=0;$i<$count;$i++){ $serialslist[$i]->{'barcode'} = "TEMP" . sprintf("%.0f",$temp); } -my $solhistory = GetSubscriptionHistoryFromSubscriptionId($subscriptionid); +my $sth= C4::Serials::GetSubscriptionHistoryFromSubscriptionId(); + +$sth->execute($subscriptionid); +my $solhistory = $sth->fetchrow_hashref; $subs = &GetSubscription($subscriptionid); ($totalissues,@serialslist) = GetSerials($subscriptionid); @@ -250,7 +253,9 @@ if (C4::Context->preference("serialsadditems")){ $template->param(branchloop=>[],itemstatusloop=>[],itemlocationloop=>[]) ; } -$solhistory = GetSubscriptionHistoryFromSubscriptionId($subscriptionid); +$sth= C4::Serials::GetSubscriptionHistoryFromSubscriptionId(); +$sth->execute($subscriptionid); +$solhistory = $sth->fetchrow_hashref; $template->param( user => $auser, diff --git a/serials/showpredictionpattern.pl b/serials/showpredictionpattern.pl deleted file mode 100755 index 1d9b8676cd..0000000000 --- a/serials/showpredictionpattern.pl +++ /dev/null @@ -1,194 +0,0 @@ -#!/usr/bin/perl - -# Copyright 2011 BibLibre SARL -# This file is part of Koha. -# -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -=head1 NAME - -showpredictionpattern.pl - -=head1 DESCRIPTION - -This script calculate numbering of serials based on numbering pattern, and -publication date, based on frequency and first publication date. - -=cut - -use Modern::Perl; - -use CGI; -use Date::Calc qw(Today Day_of_Year Week_of_Year Day_of_Week Days_in_Year Delta_Days Add_Delta_Days Add_Delta_YM); -use C4::Auth; -use C4::Output; -use C4::Serials; -use C4::Serials::Frequency; - -my $input = new CGI; -my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( { - template_name => 'serials/showpredictionpattern.tt', - query => $input, - type => 'intranet', - authnotrequired => 0, - flagsrequired => { 'serials' => '*' }, -} ); - -my $subscriptionid = $input->param('subscriptionid'); -my $frequencyid = $input->param('frequency'); -my $firstacquidate = $input->param('firstacquidate'); -my $nextacquidate = $input->param('nextacquidate'); -my $enddate = $input->param('enddate'); -my $subtype = $input->param('subtype'); -my $sublength = $input->param('sublength'); -my $custompattern = $input->param('custompattern'); - - -my %pattern = ( - numberingmethod => $input->param('numberingmethod') // '', - numbering1 => $input->param('numbering1') // '', - numbering2 => $input->param('numbering2') // '', - numbering3 => $input->param('numbering3') // '', - add1 => $input->param('add1') // '', - add2 => $input->param('add2') // '', - add3 => $input->param('add3') // '', - whenmorethan1 => $input->param('whenmorethan1') // '', - whenmorethan2 => $input->param('whenmorethan2') // '', - whenmorethan3 => $input->param('whenmorethan3') // '', - setto1 => $input->param('setto1') // '', - setto2 => $input->param('setto2') // '', - setto3 => $input->param('setto3') // '', - every1 => $input->param('every1') // '', - every2 => $input->param('every2') // '', - every3 => $input->param('every3') // '', -); - -if(!defined $firstacquidate || $firstacquidate eq ''){ - my ($year, $month, $day) = Today(); - $firstacquidate = sprintf "%04d-%02d-%02d", $year, $month, $day; -} else { - $firstacquidate = C4::Dates->new($firstacquidate)->output('iso'); -} - -if($enddate){ - $enddate = C4::Dates->new($enddate)->output('iso'); -} - -if($nextacquidate) { - $nextacquidate = C4::Dates->new($nextacquidate)->output('iso'); -} else { - $nextacquidate = $firstacquidate; -} -my $date = $nextacquidate; - -my %subscription = ( - locale => $input->param('locale') // '', - lastvalue1 => $input->param('lastvalue1') // '', - lastvalue2 => $input->param('lastvalue2') // '', - lastvalue3 => $input->param('lastvalue3') // '', - innerloop1 => $input->param('innerloop1') // '', - innerloop2 => $input->param('innerloop2') // '', - innerloop3 => $input->param('innerloop3') // '', - irregularity => '', - periodicity => $frequencyid, - countissuesperunit => 1, - firstacquidate => $firstacquidate, -); - -my $issuenumber; -if(defined $subscriptionid) { - ($issuenumber) = C4::Serials::GetFictiveIssueNumber(\%subscription, $date); -} else { - $issuenumber = 1; -} - -my @predictions_loop; -my ($calculated) = GetSeq(\%subscription, \%pattern); -push @predictions_loop, { - number => $calculated, - publicationdate => $date, - issuenumber => $issuenumber, - dow => Day_of_Week(split /-/, $date), -}; -my @irreg = (); -if(defined $subscriptionid) { - @irreg = C4::Serials::GetSubscriptionIrregularities($subscriptionid); - while(@irreg && $issuenumber > $irreg[0]) { - shift @irreg; - } - if(@irreg && $issuenumber == $irreg[0]){ - $predictions_loop[0]->{'not_published'} = 1; - shift @irreg; - } -} - -my $i = 1; -while( $i < 1000 ) { - my %line; - - if(defined $date){ - $date = GetNextDate(\%subscription, $date); - } - if(defined $date){ - $line{'publicationdate'} = $date; - $line{'dow'} = Day_of_Week(split /-/, $date); - } - - # Check if we don't have exceed end date - if($sublength){ - if($subtype eq "issues" && $i >= $sublength){ - last; - } elsif($subtype eq "weeks" && $date && Delta_Days( split(/-/, $date), Add_Delta_Days( split(/-/, $firstacquidate), 7*$sublength - 1 ) ) < 0) { - last; - } elsif($subtype eq "months" && $date && (Delta_Days( split(/-/, $date), Add_Delta_YM( split(/-/, $firstacquidate), 0, $sublength) ) - 1) < 0 ) { - last; - } - } - if($enddate && $date && Delta_Days( split(/-/, $date), split(/-/, $enddate) ) <= 0 ) { - last; - } - - ($calculated, $subscription{'lastvalue1'}, $subscription{'lastvalue2'}, $subscription{'lastvalue3'}, $subscription{'innerloop1'}, $subscription{'innerloop2'}, $subscription{'innerloop3'}) = GetNextSeq(\%subscription, \%pattern); - $issuenumber++; - $line{'number'} = $calculated; - $line{'issuenumber'} = $issuenumber; - if(@irreg && $issuenumber == $irreg[0]){ - $line{'not_published'} = 1; - shift @irreg; - } - push @predictions_loop, \%line; - - $i++; -} - -$template->param( - predictions_loop => \@predictions_loop, -); - -my $frequency = GetSubscriptionFrequency($frequencyid); - -if ( $frequency->{unit} and not $custompattern ) { - $template->param( ask_for_irregularities => 1 ); - if ( $frequency->{unit} eq 'day' and $frequency->{unitsperissue} == 1 ) { - $template->param( daily_options => 1 ); - } -} - -if ( ( $date && $enddate && $date ne $enddate ) - or ( $subtype eq 'issues' && $i < $sublength ) ) -{ - $template->param( not_consistent_end_date => 1 ); -} - -output_html_with_http_headers $input, $cookie, $template->output; diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl index fd338b0e3d..10bccd187f 100755 --- a/serials/subscription-add.pl +++ b/serials/subscription-add.pl @@ -19,7 +19,7 @@ use strict; use warnings; use CGI; -use Date::Calc qw(Today Day_of_Year Week_of_Year Add_Delta_Days Add_Delta_YM); +use Date::Calc qw(Today Day_of_Year Week_of_Year Add_Delta_Days); use C4::Koha; use C4::Biblio; use C4::Auth; @@ -29,8 +29,6 @@ use C4::Output; use C4::Context; use C4::Branch; # GetBranches use C4::Serials; -use C4::Serials::Frequency; -use C4::Serials::Numberpattern; use C4::Letters; use Carp; @@ -48,7 +46,7 @@ my @budgets; my $permission = ($op eq "modify") ? "edit_subscription" : "create_subscription"; my ($template, $loggedinuser, $cookie) -= get_template_and_user({template_name => "serials/subscription-add.tt", += get_template_and_user({template_name => "serials/subscription-add.tmpl", query => $query, type => "intranet", authnotrequired => 0, @@ -59,7 +57,9 @@ my ($template, $loggedinuser, $cookie) my $sub_on; -my @subscription_types = (qw(issues weeks months)); +my @subscription_types = ( + 'issues', 'weeks', 'months' + ); my @sub_type_data; my $subs; @@ -81,7 +81,7 @@ if ($op eq 'modify' || $op eq 'dup' || $op eq 'modsubscription') { if ($subs->{$_} eq '0000-00-00') { $subs->{$_} = '' } else { - $subs->{$_} = $subs->{$_}; + $subs->{$_} = format_date($subs->{$_}); } } if (!defined $subs->{letter}) { @@ -89,32 +89,28 @@ if ($op eq 'modify' || $op eq 'dup' || $op eq 'modsubscription') { } letter_loop($subs->{'letter'}, $template); my $nextexpected = GetNextExpected($subscriptionid); - $nextexpected->{'isfirstissue'} = $nextexpected->{planneddate} eq $firstissuedate ; - $subs->{nextacquidate} = $nextexpected->{planneddate} if($op eq 'modify'); + $nextexpected->{'isfirstissue'} = $nextexpected->{planneddate}->output('iso') eq $firstissuedate ; + $subs->{nextacquidate} = $nextexpected->{planneddate}->output() if($op eq 'modify'); unless($op eq 'modsubscription') { foreach my $length_unit (qw(numberlength weeklength monthlength)) { - if ($subs->{$length_unit}) { - $sub_length=$subs->{$length_unit}; - $sub_on=$length_unit; - last; - } - } + if ($subs->{$length_unit}){ + $sub_length=$subs->{$length_unit}; + $sub_on=$length_unit; + last; + } + } $template->param( %{$subs} ); + $template->param("dow".$subs->{'dow'} => 1) if defined $subs->{'dow'}; $template->param( $op => 1, "subtype_$sub_on" => 1, sublength =>$sub_length, history => ($op eq 'modify'), + "periodicity".$subs->{'periodicity'} => 1, + "numberpattern".$subs->{'numberpattern'} => 1, firstacquiyear => substr($firstissuedate,0,4), ); - - if($op eq 'modify') { - my ($serials_number) = GetSerials($subscriptionid); - if($serials_number > 1) { - $template->param(more_than_one_serial => 1); - } - } } if ( $op eq 'dup' ) { @@ -177,48 +173,8 @@ if ($op eq 'addsubscription') { $template->param(bibliotitle => $bib->{title}); } } - - $template->param((uc(C4::Context->preference("marcflavour"))) => 1); - - my @frequencies = GetSubscriptionFrequencies; - my @frqloop; - foreach my $freq (@frequencies) { - my $selected = 0; - $selected = 1 if ($subs->{periodicity} and $freq->{id} eq $subs->{periodicity}); - my $row = { - id => $freq->{'id'}, - selected => $selected, - label => $freq->{'description'}, - }; - push @frqloop, $row; - } - $template->param(frequencies => \@frqloop); - - my @numpatterns = GetSubscriptionNumberpatterns; - my @numberpatternloop; - foreach my $numpattern (@numpatterns) { - my $selected = 0; - $selected = 1 if($subs->{numberpattern} and $numpattern->{id} eq $subs->{numberpattern}); - my $row = { - id => $numpattern->{'id'}, - selected => $selected, - label => $numpattern->{'label'}, - }; - push @numberpatternloop, $row; - } - $template->param(numberpatterns => \@numberpatternloop); - - # Get installed locales - # FIXME this will not work with all environments. - # If call to locale fails, @locales will be an empty array, which is fine. - my @locales = map { - chomp; - # we don't want POSIX and C locales - /^C|^POSIX$/ ? () : $_ - } `locale -a`; - $template->param(locales => \@locales); - - output_html_with_http_headers $query, $cookie, $template->output; + $template->param((uc(C4::Context->preference("marcflavour"))) => 1); + output_html_with_http_headers $query, $cookie, $template->output; } sub letter_loop { @@ -240,96 +196,76 @@ sub _get_sub_length { my ($type, $length) = @_; return ( - $type eq 'issues' ? $length : 0, - $type eq 'weeks' ? $length : 0, - $type eq 'months' ? $length : 0, + $type eq 'numberlength' ? $length : 0, + $type eq 'weeklength' ? $length : 0, + $type eq 'monthlength' ? $length : 0, ); } -sub _guess_enddate { - my ($startdate_iso, $frequencyid, $numberlength, $weeklength, $monthlength) = @_; - my ($year, $month, $day); - my $enddate; - if($numberlength != 0) { - my $frequency = GetSubscriptionFrequency($frequencyid); - if($frequency->{'unit'} eq 'day') { - ($year, $month, $day) = Add_Delta_Days(split(/-/, $startdate_iso), $numberlength * $frequency->{'unitsperissue'} / $frequency->{'issuesperunit'}); - } elsif($frequency->{'unit'} eq 'week') { - ($year, $month, $day) = Add_Delta_Days(split(/-/, $startdate_iso), $numberlength * 7 * $frequency->{'unitsperissue'} / $frequency->{'issuesperunit'}); - } elsif($frequency->{'unit'} eq 'month') { - ($year, $month, $day) = Add_Delta_YM(split(/-/, $startdate_iso), 0, $numberlength * $frequency->{'unitsperissue'} / $frequency->{'issuesperunit'}); - } elsif($frequency->{'unit'} eq 'year') { - ($year, $month, $day) = Add_Delta_YM(split(/-/, $startdate_iso), $numberlength * $frequency->{'unitsperissue'} / $frequency->{'issuesperunit'}, 0); - } - } elsif($weeklength != 0) { - ($year, $month, $day) = Add_Delta_Days(split(/-/, $startdate_iso), $weeklength * 7); - } elsif($monthlength != 0) { - ($year, $month, $day) = Add_Delta_YM(split(/-/, $startdate_iso), 0, $monthlength); - } - if(defined $year) { - $enddate = sprintf("%04d-%02d-%02d", $year, $month, $day); - } else { - undef $enddate; - } - return $enddate; -} - sub redirect_add_subscription { my $auser = $query->param('user'); my $branchcode = $query->param('branchcode'); my $aqbooksellerid = $query->param('aqbooksellerid'); my $cost = $query->param('cost'); my $aqbudgetid = $query->param('aqbudgetid'); - my $periodicity = $query->param('frequency'); - my @irregularity = $query->param('irregularity'); + my $periodicity = $query->param('periodicity'); + my $dow = $query->param('dow'); + my @irregularity = $query->param('irregularity_select'); my $numberpattern = $query->param('numbering_pattern'); - my $locale = $query->param('locale'); my $graceperiod = $query->param('graceperiod') || 0; - my $subtype = $query->param('subtype'); - my $sublength = $query->param('sublength'); my ( $numberlength, $weeklength, $monthlength ) - = _get_sub_length( $subtype, $sublength ); + = _get_sub_length( $query->param('subtype'), $query->param('sublength') ); my $add1 = $query->param('add1'); + my $every1 = $query->param('every1'); + my $whenmorethan1 = $query->param('whenmorethan1'); + my $setto1 = $query->param('setto1'); my $lastvalue1 = $query->param('lastvalue1'); my $innerloop1 = $query->param('innerloop1'); + my $add2 = $query->param('add2'); + my $every2 = $query->param('every2'); + my $whenmorethan2 = $query->param('whenmorethan2'); + my $setto2 = $query->param('setto2'); my $innerloop2 = $query->param('innerloop2'); my $lastvalue2 = $query->param('lastvalue2'); + my $add3 = $query->param('add3'); + my $every3 = $query->param('every3'); + my $whenmorethan3 = $query->param('whenmorethan3'); + my $setto3 = $query->param('setto3'); my $lastvalue3 = $query->param('lastvalue3'); my $innerloop3 = $query->param('innerloop3'); + my $numberingmethod = $query->param('numberingmethod'); my $status = 1; my $biblionumber = $query->param('biblionumber'); my $callnumber = $query->param('callnumber'); my $notes = $query->param('notes'); my $internalnotes = $query->param('internalnotes'); + my $hemisphere = $query->param('hemisphere') || 1; my $letter = $query->param('letter'); - my $manualhistory = $query->param('manualhist') ? 1 : 0; + my $manualhistory = $query->param('manualhist'); my $serialsadditems = $query->param('serialsadditems'); my $staffdisplaycount = $query->param('staffdisplaycount'); my $opacdisplaycount = $query->param('opacdisplaycount'); my $location = $query->param('location'); - my $skip_serialseq = $query->param('skip_serialseq'); my $startdate = format_date_in_iso( $query->param('startdate') ); my $enddate = format_date_in_iso( $query->param('enddate') ); my $firstacquidate = format_date_in_iso($query->param('firstacquidate')); - if(!defined $enddate || $enddate eq '') { - if($subtype eq "issues") { - $enddate = _guess_enddate($firstacquidate, $periodicity, $numberlength, $weeklength, $monthlength); - } else { - $enddate = _guess_enddate($startdate, $periodicity, $numberlength, $weeklength, $monthlength); - } - } - - my $subscriptionid = NewSubscription( - $auser, $branchcode, $aqbooksellerid, $cost, $aqbudgetid, $biblionumber, - $startdate, $periodicity, $numberlength, $weeklength, - $monthlength, $lastvalue1, $innerloop1, $lastvalue2, $innerloop2, - $lastvalue3, $innerloop3, $status, $notes, $letter, $firstacquidate, - join(";",@irregularity), $numberpattern, $locale, $callnumber, - $manualhistory, $internalnotes, $serialsadditems, - $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate, - $skip_serialseq - ); + my $histenddate = format_date_in_iso($query->param('histenddate')); + my $histstartdate = format_date_in_iso($query->param('histstartdate')); + my $recievedlist = $query->param('recievedlist'); + my $missinglist = $query->param('missinglist'); + my $opacnote = $query->param('opacnote'); + my $librariannote = $query->param('librariannote'); + my $subscriptionid = NewSubscription($auser,$branchcode,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber, + $startdate,$periodicity,$dow,$numberlength,$weeklength,$monthlength, + $add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1, + $add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2, + $add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3, + $numberingmethod, $status, $notes,$letter,$firstacquidate,join(",",@irregularity), + $numberpattern, $callnumber, $hemisphere,($manualhistory?$manualhistory:0),$internalnotes, + $serialsadditems,$staffdisplaycount,$opacdisplaycount,$graceperiod,$location,$enddate + ); + ModSubscriptionHistory ($subscriptionid,$histstartdate,$histenddate,$recievedlist,$missinglist,$opacnote,$librariannote); print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid"); return; @@ -337,7 +273,7 @@ sub redirect_add_subscription { sub redirect_mod_subscription { my $subscriptionid = $query->param('subscriptionid'); - my @irregularity = $query->param('irregularity'); + my @irregularity = $query->param('irregularity_select'); my $auser = $query->param('user'); my $librarian => $query->param('librarian'), my $branchcode = $query->param('branchcode'); @@ -346,66 +282,76 @@ sub redirect_mod_subscription { my $biblionumber = $query->param('biblionumber'); my $aqbudgetid = $query->param('aqbudgetid'); my $startdate = format_date_in_iso($query->param('startdate')); - my $firstacquidate = format_date_in_iso( $query->param('firstacquidate') ); my $nextacquidate = $query->param('nextacquidate') ? format_date_in_iso($query->param('nextacquidate')): - $firstacquidate; + format_date_in_iso($query->param('startdate')); my $enddate = format_date_in_iso($query->param('enddate')); - my $periodicity = $query->param('frequency'); + my $periodicity = $query->param('periodicity'); + my $dow = $query->param('dow'); - my $subtype = $query->param('subtype'); - my $sublength = $query->param('sublength'); my ($numberlength, $weeklength, $monthlength) - = _get_sub_length( $subtype, $sublength ); + = _get_sub_length( $query->param('subtype'), $query->param('sublength') ); my $numberpattern = $query->param('numbering_pattern'); - my $locale = $query->param('locale'); + my $add1 = $query->param('add1'); + my $every1 = $query->param('every1'); + my $whenmorethan1 = $query->param('whenmorethan1'); + my $setto1 = $query->param('setto1'); my $lastvalue1 = $query->param('lastvalue1'); my $innerloop1 = $query->param('innerloop1'); + my $add2 = $query->param('add2'); + my $every2 = $query->param('every2'); + my $whenmorethan2 = $query->param('whenmorethan2'); + my $setto2 = $query->param('setto2'); my $lastvalue2 = $query->param('lastvalue2'); my $innerloop2 = $query->param('innerloop2'); + my $add3 = $query->param('add3'); + my $every3 = $query->param('every3'); + my $whenmorethan3 = $query->param('whenmorethan3'); + my $setto3 = $query->param('setto3'); my $lastvalue3 = $query->param('lastvalue3'); my $innerloop3 = $query->param('innerloop3'); + my $numberingmethod = $query->param('numberingmethod'); my $status = 1; my $callnumber = $query->param('callnumber'); my $notes = $query->param('notes'); my $internalnotes = $query->param('internalnotes'); + my $hemisphere = $query->param('hemisphere'); my $letter = $query->param('letter'); - my $manualhistory = $query->param('manualhist') ? 1 : 0; + my $manualhistory = $query->param('manualhist'); my $serialsadditems = $query->param('serialsadditems'); + # subscription history + my $histenddate = format_date_in_iso($query->param('histenddate')); + my $histstartdate = format_date_in_iso($query->param('histstartdate')); + my $recievedlist = $query->param('recievedlist'); + my $missinglist = $query->param('missinglist'); + my $opacnote = $query->param('opacnote'); + my $librariannote = $query->param('librariannote'); my $staffdisplaycount = $query->param('staffdisplaycount'); my $opacdisplaycount = $query->param('opacdisplaycount'); my $graceperiod = $query->param('graceperiod') || 0; my $location = $query->param('location'); - my $skip_serialseq = $query->param('skip_serialseq'); - - # Guess end date - if(!defined $enddate || $enddate eq '') { - if($subtype eq "issues") { - $enddate = _guess_enddate($nextacquidate, $periodicity, $numberlength, $weeklength, $monthlength); - } else { - $enddate = _guess_enddate($startdate, $periodicity, $numberlength, $weeklength, $monthlength); - } - } - my $nextexpected = GetNextExpected($subscriptionid); - # If it's a mod, we need to check the current 'expected' issue, and mod it in the serials table if necessary. - if ( $nextexpected->{planneddate} && $nextacquidate ne $nextexpected->{planneddate} ) { - ModNextExpected($subscriptionid, $nextacquidate); + # If it's a mod, we need to check the current 'expected' issue, and mod it in the serials table if necessary. + if ( $nextacquidate ne $nextexpected->{planneddate}->output('iso') ) { + ModNextExpected($subscriptionid,C4::Dates->new($nextacquidate,'iso')); # if we have not received any issues yet, then we also must change the firstacquidate for the subs. $firstissuedate = $nextacquidate if($nextexpected->{isfirstissue}); } - ModSubscription( - $auser, $branchcode, $aqbooksellerid, $cost, $aqbudgetid, $startdate, - $periodicity, $firstacquidate, join(";",@irregularity), - $numberpattern, $locale, $numberlength, $weeklength, $monthlength, $lastvalue1, - $innerloop1, $lastvalue2, $innerloop2, $lastvalue3, $innerloop3, - $status, $biblionumber, $callnumber, $notes, $letter, - $manualhistory, $internalnotes, $serialsadditems, $staffdisplaycount, - $opacdisplaycount, $graceperiod, $location, $enddate, $subscriptionid, - $skip_serialseq - ); - + ModSubscription( + $auser, $branchcode, $aqbooksellerid, $cost, + $aqbudgetid, $startdate, $periodicity, $firstissuedate, + $dow, join(q{,},@irregularity), $numberpattern, $numberlength, + $weeklength, $monthlength, $add1, $every1, + $whenmorethan1, $setto1, $lastvalue1, $innerloop1, + $add2, $every2, $whenmorethan2, $setto2, + $lastvalue2, $innerloop2, $add3, $every3, + $whenmorethan3, $setto3, $lastvalue3, $innerloop3, + $numberingmethod, $status, $biblionumber, $callnumber, + $notes, $letter, $hemisphere, $manualhistory,$internalnotes, + $serialsadditems, $staffdisplaycount,$opacdisplaycount,$graceperiod,$location,$enddate,$subscriptionid + ); + ModSubscriptionHistory ($subscriptionid,$histstartdate,$histenddate,$recievedlist,$missinglist,$opacnote,$librariannote); print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid"); return; } diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl index 8a829ed0af..8bfee43e81 100755 --- a/serials/subscription-detail.pl +++ b/serials/subscription-detail.pl @@ -118,9 +118,15 @@ $template->param(%{ $subs }); $template->param(biblionumber_for_new_subscription => $subs->{bibnum}); my @irregular_issues = split /,/, $subs->{irregularity}; -my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subs->{periodicity}); -my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subs->{numberpattern}); - +if (! $subs->{numberpattern}) { + $subs->{numberpattern} = q{}; +} +if (! $subs->{dow}) { + $subs->{dow} = q{}; +} +if (! $subs->{periodicity}) { + $subs->{periodicity} = '0'; +} my $default_bib_view = get_default_view(); my ( $order, $bookseller, $tmpl_infos ); @@ -161,11 +167,9 @@ $template->param( C4::Context->userenv->{flags} % 2 !=1 && C4::Context->userenv->{branch} && $subs->{branchcode} && (C4::Context->userenv->{branch} ne $subs->{branchcode})), - frequency => $frequency, - numberpattern => $numberpattern, - has_X => ($numberpattern->{'numberingmethod'} =~ /{X}/) ? 1 : 0, - has_Y => ($numberpattern->{'numberingmethod'} =~ /{Y}/) ? 1 : 0, - has_Z => ($numberpattern->{'numberingmethod'} =~ /{Z}/) ? 1 : 0, + 'periodicity' . $subs->{periodicity} => 1, + 'arrival' . $subs->{dow} => 1, + 'numberpattern' . $subs->{numberpattern} => 1, intranetstylesheet => C4::Context->preference('intranetstylesheet'), intranetcolorstylesheet => C4::Context->preference('intranetcolorstylesheet'), irregular_issues => scalar @irregular_issues, diff --git a/serials/subscription-frequencies.pl b/serials/subscription-frequencies.pl deleted file mode 100755 index 53de1c7650..0000000000 --- a/serials/subscription-frequencies.pl +++ /dev/null @@ -1,120 +0,0 @@ -#!/usr/bin/perl - -# Copyright 2011 BibLibre SARL -# This file is part of Koha. -# -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -=head1 NAME - -subscription-frequencies.pl - -=head1 DESCRIPTION - -Manage subscription frequencies - -=cut - -use Modern::Perl; - -use CGI; - -use C4::Auth; -use C4::Output; -use C4::Serials; -use C4::Serials::Frequency; - -my $input = new CGI; -my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( { - template_name => 'serials/subscription-frequencies.tt', - query => $input, - type => 'intranet', - authnotrequired => 0, - flagsrequired => { 'parameters' => 1 }, - debug => 1, -} ); - -my $op = $input->param('op'); - -if($op && ($op eq 'new' || $op eq 'modify')) { - my @units_loop; - push @units_loop, {val => $_} for (qw/ day week month year /); - - if($op eq 'modify') { - my $frequencyid = $input->param('frequencyid'); - my $frequency = GetSubscriptionFrequency($frequencyid); - foreach (@units_loop) { - if($frequency->{unit} and $_->{val} eq $frequency->{unit}) { - $_->{selected} = 1; - last; - } - } - $template->param( %$frequency ); - } - - $template->param( - units_loop => \@units_loop, - $op => 1, - ); - output_html_with_http_headers $input, $cookie, $template->output; - exit; -} - -if($op && ($op eq 'savenew' || $op eq 'savemod')) { - my $frequency; - foreach (qw/ description unit issuesperunit unitsperissue displayorder /) { - $frequency->{$_} = $input->param($_); - } - $frequency->{unit} = undef if $frequency->{unit} eq ''; - foreach (qw/issuesperunit unitsperissue/) { - $frequency->{$_} = 1 if $frequency->{$_} !~ /\d+/; - } - $frequency->{issuesperunit} = 1 if $frequency->{issuesperunit} < 1; - $frequency->{unitsperissue} = 1 if $frequency->{issuesperunit} != 1; - - if($op eq 'savemod') { - $frequency->{id} = $input->param('id'); - ModSubscriptionFrequency($frequency); - } else { - AddSubscriptionFrequency($frequency); - } -} elsif($op && $op eq 'del') { - my $frequencyid = $input->param('frequencyid'); - - if ($frequencyid) { - my $confirm = $input->param('confirm'); - if ($confirm) { - DelSubscriptionFrequency($frequencyid); - } else { - my @subs = GetSubscriptionsWithFrequency($frequencyid); - if (@subs) { - $template->param( - frequencyid => $frequencyid, - still_used => 1, - subscriptions => \@subs - ); - } else { - DelSubscriptionFrequency($frequencyid); - } - } - } -} - - -my @frequencies = GetSubscriptionFrequencies(); - -$template->param(frequencies_loop => \@frequencies); -$template->param($op => 1) if $op; - -output_html_with_http_headers $input, $cookie, $template->output; diff --git a/serials/subscription-frequency.pl b/serials/subscription-frequency.pl deleted file mode 100755 index ddfb61681c..0000000000 --- a/serials/subscription-frequency.pl +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/perl - -use CGI; -use C4::Context; -use C4::Serials::Frequency; -use C4::Auth qw/check_cookie_auth/; -use URI::Escape; -use strict; - -my $input=new CGI; -my $frqid=$input->param("frequency_id"); -my ($auth_status, $sessionID) = check_cookie_auth($input->cookie('CGISESSID'), { serials => '*' }); -if ($auth_status ne "ok") { - exit 0; -} -my $frequencyrecord=GetSubscriptionFrequency($frqid); -binmode STDOUT, ":encoding(UTF-8)"; -print $input->header(-type => 'text/plain', -charset => 'UTF-8'); -print "{".join (",",map { "\"$_\":\"".uri_escape($frequencyrecord->{$_})."\"" }sort keys %$frequencyrecord)."}"; diff --git a/serials/subscription-history.pl b/serials/subscription-history.pl deleted file mode 100755 index 398fe4a849..0000000000 --- a/serials/subscription-history.pl +++ /dev/null @@ -1,87 +0,0 @@ -#!/usr/bin/perl - -# Copyright 2011 BibLibre SARL -# This file is part of Koha. -# -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -=head1 NAME - -subscription-history.pl - -=head1 DESCRIPTION - -Modify subscription history - -=cut - -use Modern::Perl; - -use CGI; -use C4::Auth; -use C4::Output; - -use C4::Biblio; -use C4::Dates qw(format_date_in_iso); -use C4::Serials; - -my $input = new CGI; -my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( { - template_name => 'serials/subscription-history.tt', - query => $input, - type => 'intranet', - authnotrequired => 0, - flagsrequired => { 'serials' => 'edit_subscription' }, - debug => 1, -} ); - -my $subscriptionid = $input->param('subscriptionid'); -my $op = $input->param('op'); - -if(!defined $subscriptionid || $subscriptionid eq '') { - print $input->redirect('/cgi-bin/koha/serials/serials-home.pl'); - exit; -} - -if($op && $op eq 'mod') { - my $histstartdate = $input->param('histstartdate'); - my $histenddate = $input->param('histenddate'); - my $receivedlist = $input->param('receivedlist'); - my $missinglist = $input->param('missinglist'); - my $opacnote = $input->param('opacnote'); - my $librariannote = $input->param('librariannote'); - - ModSubscriptionHistory( $subscriptionid, format_date_in_iso($histstartdate), - format_date_in_iso($histenddate), $receivedlist, $missinglist, $opacnote, - $librariannote ); - - print $input->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid"); - exit; -} else { - my $history = GetSubscriptionHistoryFromSubscriptionId($subscriptionid); - my (undef, $biblio) = GetBiblio($history->{'biblionumber'}); - - $template->param( - subscriptionid => $subscriptionid, - title => $biblio->{'title'}, - histstartdate => $history->{'histstartdate'}, - histenddate => $history->{'histenddate'}, - receivedlist => $history->{'recievedlist'}, - missinglist => $history->{'missinglist'}, - opacnote => $history->{'opacnote'}, - librariannote => $history->{'librariannote'}, - ); - - output_html_with_http_headers $input, $cookie, $template->output; -} diff --git a/serials/subscription-numberpattern.pl b/serials/subscription-numberpattern.pl deleted file mode 100755 index c54f2648a3..0000000000 --- a/serials/subscription-numberpattern.pl +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/perl - -use CGI; -use C4::Serials::Numberpattern; -use URI::Escape; -use strict; -use warnings; - -my $input=new CGI; -my $numpatternid=$input->param("numberpattern_id"); - -my $numberpatternrecord=GetSubscriptionNumberpattern($numpatternid); -binmode STDOUT, ":encoding(UTF-8)"; -print $input->header(-type => 'text/plain', -charset => 'UTF-8'); -print "{",join (",",map {"\"$_\":\"".(uri_escape($numberpatternrecord->{$_}) // '')."\"" }sort keys %$numberpatternrecord),"}"; diff --git a/serials/subscription-numberpatterns.pl b/serials/subscription-numberpatterns.pl deleted file mode 100755 index 2647672f47..0000000000 --- a/serials/subscription-numberpatterns.pl +++ /dev/null @@ -1,150 +0,0 @@ -#!/usr/bin/perl - -# Copyright 2011 BibLibre SARL -# This file is part of Koha. -# -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -=head1 NAME - -subscription-numberpatterns.pl - -=head1 DESCRIPTION - -Manage numbering patterns - -=cut - -use Modern::Perl; -use CGI; - -use C4::Auth; -use C4::Output; -use C4::Serials::Numberpattern; -use C4::Serials::Frequency; - -my $input = new CGI; -my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( { - template_name => 'serials/subscription-numberpatterns.tt', - query => $input, - type => 'intranet', - authnotrequired => 0, - flagsrequired => { 'parameters' => 1 } -} ); - -my $op = $input->param('op'); - -if($op && $op eq 'savenew') { - my $label = $input->param('label'); - my $numberpattern; - foreach(qw/ label description numberingmethod displayorder - label1 label2 label3 add1 add2 add3 every1 every2 every3 - setto1 setto2 setto3 whenmorethan1 whenmorethan2 whenmorethan3 - numbering1 numbering2 numbering3 /) { - $numberpattern->{$_} = $input->param($_); - if($numberpattern->{$_} and $numberpattern->{$_} eq '') { - $numberpattern->{$_} = undef; - } - } - my $numberpattern2 = GetSubscriptionNumberpatternByName($label); - - if(!defined $numberpattern2) { - AddSubscriptionNumberpattern($numberpattern); - } else { - $op = 'new'; - $template->param(error_existing_numberpattern => 1); - $template->param(%$numberpattern); - } -} elsif ($op && $op eq 'savemod') { - my $id = $input->param('id'); - my $label = $input->param('label'); - my $numberpattern = GetSubscriptionNumberpattern($id); - my $mod_ok = 1; - if($numberpattern->{'label'} ne $label) { - my $numberpattern2 = GetSubscriptionNumberpatternByName($label); - if(defined $numberpattern2 && $id != $numberpattern2->{'id'}) { - $mod_ok = 0; - } - } - if($mod_ok) { - foreach(qw/ id label description numberingmethod displayorder - label1 label2 label3 add1 add2 add3 every1 every2 every3 - setto1 setto2 setto3 whenmorethan1 whenmorethan2 whenmorethan3 - numbering1 numbering2 numbering3 /) { - $numberpattern->{$_} = $input->param($_) || undef; - } - ModSubscriptionNumberpattern($numberpattern); - } else { - $op = 'modify'; - $template->param(error_existing_numberpattern => 1); - } -} - -if($op && ($op eq 'new' || $op eq 'modify')) { - if($op eq 'modify') { - my $id = $input->param('id'); - if(defined $id) { - my $numberpattern = GetSubscriptionNumberpattern($id); - $template->param(%$numberpattern); - } else { - $op = 'new'; - } - } - my @frequencies = GetSubscriptionFrequencies(); - my @subtypes; - push @subtypes, { value => $_ } for (qw/ issues weeks months /); - my @locales = map { - chomp; - /^C|^POSIX$/ ? () : $_ - } `locale -a`; - - $template->param( - $op => 1, - frequencies_loop => \@frequencies, - subtypes_loop => \@subtypes, - locales => \@locales, - DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), - ); - output_html_with_http_headers $input, $cookie, $template->output; - exit; -} - -if($op && $op eq 'del') { - my $id = $input->param('id'); - if ($id) { - my $confirm = $input->param('confirm'); - if ($confirm) { - DelSubscriptionNumberpattern($id); - } else { - my @subs = GetSubscriptionsWithNumberpattern($id); - if (@subs) { - $template->param( - id => $id, - still_used => 1, - subscriptions => \@subs - ); - } else { - DelSubscriptionNumberpattern($id); - } - } - } -} - -my @numberpatterns_loop = GetSubscriptionNumberpatterns(); - -$template->param( - numberpatterns_loop => \@numberpatterns_loop, -); - -output_html_with_http_headers $input, $cookie, $template->output; -- 2.11.0