[Koha-patches] [3.2] Bug 5026 Undefined dates formatted poorly in serials-edit
Chris Nighswonger
cnighswonger at foundations.edu
Mon Jan 17 23:55:54 CET 2011
This patch does not apply to 3.2.x cleanly. Please fix up and resubmit
with [3.2.x] in the subject line.
Kind Regards,
Chris
cnighs at li24-93:~/koha.3.2.test (3.2.x *+)$ git status
# On branch 3.2.x
# Your branch is ahead of 'origin/3.2.x' by 3 commits.
#
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: C4/Serials.pm
#
# Unmerged paths:
# (use "git reset HEAD <file>..." to unstage)
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: serials/serials-collection.pl
# both modified: serials/serials-edit.pl
#
On Thu, Jan 13, 2011 at 11:11 AM, Colin Campbell
<colin.campbell at ptfs-europe.com> wrote:
> Don't display junk in empty fields
> Don't generate errors
>
> Merged some changes to make variable names moremeaningful
> in loops ( within loops)
>
> Thanks to M De Rooy for spotting a couple of issues in the
> original patch
> ---
> C4/Serials.pm | 13 ++++-
> serials/serials-collection.pl | 4 +-
> serials/serials-edit.pl | 97 ++++++++++++++++++++++-------------------
> 3 files changed, 65 insertions(+), 49 deletions(-)
>
> diff --git a/C4/Serials.pm b/C4/Serials.pm
> index bf4a2e6..977094c 100644
> --- a/C4/Serials.pm
> +++ b/C4/Serials.pm
> @@ -723,9 +723,16 @@ sub GetSerials2 {
> my @serials;
>
> while ( my $line = $sth->fetchrow_hashref ) {
> - $line->{ "status" . $line->{status} } = 1; # fills a "statusX" value, used for template status select list
> - $line->{"planneddate"} = format_date( $line->{"planneddate"} );
> - $line->{"publisheddate"} = format_date( $line->{"publisheddate"} );
> + $line->{ "status" . $line->{status} } = 1; # fills a "statusX" value, used for template status select list
> + # Format dates for display
> + for my $datefield ( qw( planneddate publisheddate ) ) {
> + if ($line->{$datefield} =~m/^00/) {
> + $line->{$datefield} = q{};
> + }
> + else {
> + $line->{$datefield} = format_date( $line->{$datefield} );
> + }
> + }
> push @serials, $line;
> }
> return @serials;
> diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl
> index 23e2abc..89e66bd 100755
> --- a/serials/serials-collection.pl
> +++ b/serials/serials-collection.pl
> @@ -46,7 +46,9 @@ my ($template, $loggedinuser, $cookie);
> my $biblionumber = $query->param('biblionumber');
> my @subscriptionid = $query->param('subscriptionid');
>
> -my $subscriptiondescs ;
> + at subscriptionid= uniq @subscriptionid;
> + at subscriptionid= sort @subscriptionid;
> +my $subscriptiondescs;
> my $subscriptions;
>
> if($op eq 'gennext' && @subscriptionid){
> diff --git a/serials/serials-edit.pl b/serials/serials-edit.pl
> index aaa0574..190b4ee 100755
> --- a/serials/serials-edit.pl
> +++ b/serials/serials-edit.pl
> @@ -90,20 +90,18 @@ my @errseq;
>
> # If user comes from subscription details
> unless (@serialids) {
> - foreach my $subscriptionid (@subscriptionids) {
> - my $serstatus = $query->param('serstatus');
> - if ($serstatus) {
> + my $serstatus = $query->param('serstatus');
> + if ($serstatus) {
> + foreach my $subscriptionid (@subscriptionids) {
> my @tmpser = GetSerials2( $subscriptionid, $serstatus );
> - foreach (@tmpser) {
> - push @serialids, $_->{'serialid'};
> - }
> + push @serialids, map { $_->{serialid} } @tmpser;
> }
> }
> }
>
> -unless ( scalar(@serialids) ) {
> +unless ( @serialids ) {
> my $string =
> - "serials-collection.pl?subscriptionid=" . join( ",", @subscriptionids );
> + 'serials-collection.pl?subscriptionid=' . join ',', uniq @subscriptionids;
> $string =~ s/,$//;
>
> print $query->redirect($string);
> @@ -111,12 +109,12 @@ unless ( scalar(@serialids) ) {
>
> my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
> {
> - template_name => "serials/serials-edit.tmpl",
> - query => $query,
> - type => "intranet",
> - authnotrequired => 0,
> - flagsrequired => {serials => 'receive_serials'},
> - debug => 1,
> + template_name => 'serials/serials-edit.tmpl',
> + query => $query,
> + type => 'intranet',
> + authnotrequired => 0,
> + flagsrequired => { serials => 1 },
> + debug => 1,
> }
> );
>
> @@ -124,36 +122,37 @@ my @serialdatalist;
> my %processedserialid;
>
> my $today = C4::Dates->new();
> -foreach my $tmpserialid (@serialids) {
> +foreach my $serialid (@serialids) {
>
> #filtering serialid for duplication
> #NEW serial should appear only once and are created afterwards
> - if ( defined($tmpserialid)
> - && $tmpserialid =~ /^[0-9]+$/
> - && !$processedserialid{$tmpserialid} )
> + if ( $serialid
> + && $serialid =~ /^[0-9]+$/
> + && !$processedserialid{$serialid} )
> {
> - my $data = GetSerialInformation($tmpserialid);
> - for my $datefield ( qw( publisheddate planneddate) ) {
> - if ($data->{$datefield} && $data->{$datefield}!~m/^00/) {
> - $data->{$datefield} = format_date( $data->{$datefield} );
> + my $serinfo = GetSerialInformation($serialid); #TODO duplicates work done by GetSerials2 above
> + for my $d ( qw( publisheddate planneddate )){
> + if ( $serinfo->{$d} =~m/^00/ ) {
> + $serinfo->{$d} = q{};
> }
> else {
> - $data->{$datefield} = q{};
> + $serinfo->{$d} = format_date( $serinfo->{$d} );
> }
> }
> - $data->{arriveddate}=$today->output('syspref');
> - $data->{'editdisable'} = (
> + $serinfo->{arriveddate}=$today->output('syspref');
> +
> + $serinfo->{'editdisable'} = (
> (
> - HasSubscriptionExpired( $data->{subscriptionid} ) == 1
> - && $data->{'status1'}
> + HasSubscriptionExpired( $serinfo->{subscriptionid} )
> + && $serinfo->{'status1'}
> )
> - || $data->{'cannotedit'}
> + || $serinfo->{'cannotedit'}
> );
> - push @serialdatalist, $data;
> - $processedserialid{$tmpserialid} = 1;
> + push @serialdatalist, $serinfo;
> + $processedserialid{$serialid} = 1;
> }
> }
> -my $bibdata = GetBiblioData( $serialdatalist[0]->{'biblionumber'} );
> +my $biblio = GetBiblioData( $serialdatalist[0]->{'biblionumber'} );
>
> my @newserialloop;
> my @subscriptionloop;
> @@ -163,8 +162,7 @@ my %processedsubscriptionid;
> foreach my $subscriptionid (@subscriptionids) {
>
> #Do not process subscriptionid twice if it was already processed.
> - if ( defined($subscriptionid)
> - && !$processedsubscriptionid{$subscriptionid} )
> + if ( $subscriptionid && !$processedsubscriptionid{$subscriptionid} )
> {
> my $cell;
> if ( $serialdatalist[0]->{'serialsadditems'} ) {
> @@ -176,8 +174,8 @@ foreach my $subscriptionid (@subscriptionids) {
> $cell->{serialsadditems} = 1;
> }
> $cell->{'subscriptionid'} = $subscriptionid;
> - $cell->{'itemid'} = "NNEW";
> - $cell->{'serialid'} = "NEW";
> + $cell->{'itemid'} = 'NNEW';
> + $cell->{'serialid'} = 'NEW';
> $cell->{'issuesatonce'} = 1;
> $cell->{arriveddate}=$today->output('syspref');
>
> @@ -198,8 +196,16 @@ if ( $op and $op eq 'serialchangestatus' ) {
>
> my $newserial;
> for ( my $i = 0 ; $i <= $#serialids ; $i++ ) {
> + my ($plan_date, $pub_date);
> +
> + if (defined $planneddates[$i] && $planneddates[$i] ne 'XXX') {
> + $plan_date = format_date_in_iso( $planneddates[$i] );
> + }
> + if (defined $publisheddates[$i] && $publisheddates[$i] ne 'XXX') {
> + $pub_date = format_date_in_iso( $publisheddates[$i] );
> + }
>
> - if ( $serialids[$i] && $serialids[$i] eq "NEW" ) {
> + if ( $serialids[$i] && $serialids[$i] eq 'NEW' ) {
> if ( $serialseqs[$i] ) {
>
> #IF newserial was provided a name Then we have to create a newSerial
> @@ -209,8 +215,8 @@ if ( $op and $op eq 'serialchangestatus' ) {
> $subscriptionids[0],
> $serialdatalist[0]->{'biblionumber'},
> $status[$i],
> - format_date_in_iso( $planneddates[$i] ),
> - format_date_in_iso( $publisheddates[$i] ),
> + $plan_date,
> + $pub_date,
> $notes[$i]
> );
> }
> @@ -219,8 +225,8 @@ if ( $op and $op eq 'serialchangestatus' ) {
> ModSerialStatus(
> $serialids[$i],
> $serialseqs[$i],
> - format_date_in_iso( $planneddates[$i] ),
> - format_date_in_iso( $publisheddates[$i] ),
> + $plan_date,
> + $pub_date,
> $status[$i],
> $notes[$i]
> );
> @@ -299,14 +305,14 @@ if ( $op and $op eq 'serialchangestatus' ) {
> $serialdatalist[0]->{'biblionumber'}
> )
> );
> - if ( C4::Context->preference("autoBarcode") eq
> + if ( C4::Context->preference('autoBarcode') eq
> 'incremental' )
> {
> if ( !$bib_record->field($barcodetagfield)
> ->subfield($barcodetagsubfield) )
> {
> my $sth_barcode = $dbh->prepare(
> - "select max(abs(barcode)) from items");
> + 'select max(abs(barcode)) from items');
> $sth_barcode->execute;
> my ($newbarcode) = $sth_barcode->fetchrow;
>
> @@ -364,8 +370,8 @@ if ( $op and $op eq 'serialchangestatus' ) {
> }
> }
> else {
> - my $redirect = "serials-collection.pl?";
> - $redirect .= join( '&', map { "subscriptionid=" . $_ } sort @subscriptionids );# ID The sort necessary
> + my $redirect = 'serials-collection.pl?';
> + $redirect .= join( '&', map { 'subscriptionid=' . $_ } @subscriptionids );
> print $query->redirect($redirect);
> }
> }
> @@ -373,7 +379,8 @@ my $default_bib_view = get_default_view();
>
> $template->param(
> serialsadditems => $serialdatalist[0]->{'serialsadditems'},
> - bibliotitle => $bibdata->{'title'},
> + callnumber => $serialdatalist[0]->{'callnumber'},
> + bibliotitle => $biblio->{'title'},
> biblionumber => $serialdatalist[0]->{'biblionumber'},
> serialslist => \@serialdatalist,
> default_bib_view => $default_bib_view,
> --
> 1.7.3.4
>
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/
>
More information about the Koha-patches
mailing list