X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=tools%2FbatchMod.pl;h=f24b2f6987827b5cd2b61494c3c7f761fffd7eac;hb=23aa9866124064cbea8d52c1ec8f72089b4e8626;hp=4ed0f106f5d8dcd3439e59c4229effbf53e8d265;hpb=a6c9bd0eb55c32d5632625144775271f20aa15f7;p=koha.git diff --git a/tools/batchMod.pl b/tools/batchMod.pl index 4ed0f106f5..f24b2f6987 100755 --- a/tools/batchMod.pl +++ b/tools/batchMod.pl @@ -19,28 +19,31 @@ # along with Koha; if not, see . use CGI qw ( -utf8 ); -use strict; -#use warnings; FIXME - Bug 2505 +use Modern::Perl; use C4::Auth; use C4::Output; use C4::Biblio; use C4::Items; use C4::Circulation; use C4::Context; -use C4::Koha; # XXX subfield_is_koha_internal_p -use C4::Branch; # XXX subfield_is_koha_internal_p +use C4::Koha; use C4::BackgroundJob; use C4::ClassSource; -use C4::Dates; use C4::Debug; use C4::Members; use MARC::File::XML; use List::MoreUtils qw/uniq/; +use Koha::Biblios; +use Koha::DateUtils; +use Koha::Items; +use Koha::ItemTypes; +use Koha::Patrons; + my $input = new CGI; my $dbh = C4::Context->dbh; my $error = $input->param('error'); -my @itemnumbers = $input->param('itemnumber'); +my @itemnumbers = $input->multi_param('itemnumber'); my $biblionumber = $input->param('biblionumber'); my $op = $input->param('op'); my $del = $input->param('del'); @@ -71,20 +74,18 @@ my ($template, $loggedinuser, $cookie) }); # Does the user have a restricted item edition permission? -my $uid = $loggedinuser ? GetMember( borrowernumber => $loggedinuser )->{userid} : undef; +my $uid = $loggedinuser ? Koha::Patrons->find( $loggedinuser )->userid : undef; my $restrictededition = $uid ? haspermission($uid, {'tools' => 'items_batchmod_restricted'}) : undef; # In case user is a superlibrarian, edition is not restricted $restrictededition = 0 if ($restrictededition != 0 && C4::Context->IsSuperLibrarian()); -my $today_iso = C4::Dates->today('iso'); -$template->param(today_iso => $today_iso); $template->param(del => $del); my $itemrecord; my $nextop=""; my @errors; # store errors found while checking data BEFORE saving item. my $items_display_hashref; -my $tagslib = &GetMarcStructure(1); +our $tagslib = &GetMarcStructure(1); my $deleted_items = 0; # Number of deleted items my $deleted_records = 0; # Number of deleted records ( with no items attached ) @@ -100,13 +101,13 @@ my $sessionID = $cookies{'CGISESSID'}->value; #--- ---------------------------------------------------------------------------- if ($op eq "action") { #------------------------------------------------------------------------------- - my @tags = $input->param('tag'); - my @subfields = $input->param('subfield'); - my @values = $input->param('field_value'); - my @disabled = $input->param('disable_input'); + my @tags = $input->multi_param('tag'); + my @subfields = $input->multi_param('subfield'); + my @values = $input->multi_param('field_value'); + my @disabled = $input->multi_param('disable_input'); # build indicator hash. - my @ind_tag = $input->param('ind_tag'); - my @indicator = $input->param('indicator'); + my @ind_tag = $input->multi_param('ind_tag'); + my @indicator = $input->multi_param('indicator'); # Is there something to modify ? # TODO : We shall use this var to warn the user in case no modification was done to the items @@ -117,11 +118,19 @@ if ($op eq "action") { # Once the job is done if ($completedJobID) { # If we have a reasonable amount of items, we display them - if (scalar(@itemnumbers) <= ( C4::Context->preference("MaxItemsForBatch") // 1000 ) ) { + if (scalar(@itemnumbers) <= ( C4::Context->preference("MaxItemsToDisplayForBatchDel") // 1000 ) ) { $items_display_hashref=BuildItemsData(@itemnumbers); } else { # Else, we only display the barcode - my @simple_items_display = map {{ itemnumber => $_, barcode => (GetBarcodeFromItemnumber($_) or ""), biblionumber => (GetBiblionumberFromItemnumber($_) or "") }} @itemnumbers; + my @simple_items_display = map { + my $itemnumber = $_; + my $item = Koha::Items->find($itemnumber); + { + itemnumber => $itemnumber, + barcode => $item ? ( $item->barcode // q{} ) : q{}, + biblionumber => $item ? $item->biblio->biblionumber : q{}, + }; + } @itemnumbers; $template->param("simple_items_display" => \@simple_items_display); } @@ -168,7 +177,7 @@ if ($op eq "action") { $job->progress($i) if $runinbackground; my $itemdata = GetItem($itemnumber); if ( $del ){ - my $return = DelItemCheck(C4::Context->dbh, $itemdata->{'biblionumber'}, $itemdata->{'itemnumber'}); + my $return = DelItemCheck( $itemdata->{'biblionumber'}, $itemdata->{'itemnumber'}); if ($return == 1) { $deleted_items++; } else { @@ -184,7 +193,7 @@ if ($op eq "action") { # If there are no items left, delete the biblio if ( $del_records ) { - my $itemscount = GetItemsCount($itemdata->{'biblionumber'}); + my $itemscount = Koha::Biblios->find( $itemdata->{'biblionumber'} )->items->count; if ( $itemscount == 0 ) { my $error = DelBiblio($itemdata->{'biblionumber'}); $deleted_records++ unless ( $error ); @@ -198,7 +207,7 @@ if ($op eq "action") { if ( $modified ) { eval { if ( my $item = ModItemFromMarc( $localmarcitem, $itemdata->{biblionumber}, $itemnumber ) ) { - LostItem($itemnumber, 'MARK RETURNED') if $item->{itemlost}; + LostItem($itemnumber, 'batchmod') if $item->{itemlost} and not $itemdata->{itemlost}; } }; } @@ -233,6 +242,7 @@ if ($op eq "show"){ push @contentlist, $content if $content; } + @contentlist = uniq @contentlist; if ($filecontent eq 'barcode_file') { foreach my $barcode (@contentlist) { @@ -272,8 +282,11 @@ if ($op eq "show"){ # Flag to tell the template there are valid results, hidden or not if(scalar(@itemnumbers) > 0){ $template->param("itemresults" => 1); } - # Only display the items if there are no more than pref MaxItemsForBatch - if (scalar(@itemnumbers) <= ( C4::Context->preference("MaxItemsForBatch") // 1000 ) ) { + # Only display the items if there are no more than pref MaxItemsToProcessForBatchMod or MaxItemsToDisplayForBatchDel + my $max_items = $del + ? C4::Context->preference("MaxItemsToDisplayForBatchDel") + : C4::Context->preference("MaxItemsToProcessForBatchMod"); + if (scalar(@itemnumbers) <= ( $max_items // 1000 ) ) { $items_display_hashref=BuildItemsData(@itemnumbers); } else { $template->param("too_many_items" => scalar(@itemnumbers)); @@ -291,11 +304,11 @@ $query .= qq{ AND ( branchcode = ? OR branchcode IS NULL ) } if $branch_limit; $query .= qq{ GROUP BY lib ORDER BY lib, lib_opac}; my $authorised_values_sth = $dbh->prepare( $query ); -my $branches = GetBranchesLoop(); # build once ahead of time, instead of multiple times later. +my $libraries = Koha::Libraries->search({}, { order_by => ['branchname'] })->unblessed;# build once ahead of time, instead of multiple times later. # Adding a default choice, in case the user does not want to modify the branch my $nochange_branch = { branchname => '', value => '', selected => 1 }; -unshift (@$branches, $nochange_branch); +unshift (@$libraries, $nochange_branch); my $pref_itemcallnumber = C4::Context->preference('itemcallnumber'); @@ -303,14 +316,14 @@ my $pref_itemcallnumber = C4::Context->preference('itemcallnumber'); my $subfieldsToAllowForBatchmod = C4::Context->preference('SubfieldsToAllowForRestrictedBatchmod'); my $allowAllSubfields = ( not defined $subfieldsToAllowForBatchmod - or $subfieldsToAllowForBatchmod == q|| + or $subfieldsToAllowForBatchmod eq q|| ) ? 1 : 0; my @subfieldsToAllow = split(/ /, $subfieldsToAllowForBatchmod); foreach my $tag (sort keys %{$tagslib}) { # loop through each subfield foreach my $subfield (sort keys %{$tagslib->{$tag}}) { - next if subfield_is_koha_internal_p($subfield); + next if IsMarcStructureInternal( $tagslib->{$tag}{$subfield} ); next if (not $allowAllSubfields and $restrictededition && !grep { $tag . '$' . $subfield eq $_ } @subfieldsToAllow ); next if ($tagslib->{$tag}->{$subfield}->{'tab'} ne "10"); # barcode and stocknumber are not meant to be batch-modified @@ -334,10 +347,13 @@ foreach my $tag (sort keys %{$tagslib}) { if ( !$value && $use_default_values) { $value = $tagslib->{$tag}->{$subfield}->{defaultvalue}; # get today date & replace YYYY, MM, DD if provided in the default value - my ( $year, $month, $day ) = split ',', $today_iso; # FIXME: iso dates don't have commas! - $value =~ s/YYYY/$year/g; - $value =~ s/MM/$month/g; - $value =~ s/DD/$day/g; + my $today = dt_from_string; + my $year = $today->year; + my $month = $today->month; + my $day = $today->day; + $value =~ s/YYYY/$year/g; + $value =~ s/MM/$month/g; + $value =~ s/DD/$day/g; } $subfield_data{visibility} = "display:none;" if (($tagslib->{$tag}->{$subfield}->{hidden} > 4) || ($tagslib->{$tag}->{$subfield}->{hidden} < -4)); # testing branch value if IndependentBranches. @@ -346,22 +362,21 @@ foreach my $tag (sort keys %{$tagslib}) { my @authorised_values; my %authorised_lib; # builds list, depending on authorised value... - - if ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "branches" ) { - foreach my $thisbranch (@$branches) { - push @authorised_values, $thisbranch->{value}; - $authorised_lib{$thisbranch->{value}} = $thisbranch->{branchname}; - } + + if ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "branches" ) { + foreach my $library (@$libraries) { + push @authorised_values, $library->{branchcode}; + $authorised_lib{$library->{branchcode}} = $library->{branchname}; + } $value = ""; - } - elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) { - push @authorised_values, ""; - my $sth = $dbh->prepare("select itemtype,description from itemtypes order by description"); - $sth->execute; - while ( my ( $itemtype, $description ) = $sth->fetchrow_array ) { - push @authorised_values, $itemtype; - $authorised_lib{$itemtype} = $description; - } + } + elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) { + push @authorised_values, ""; + my $itemtypes = Koha::ItemTypes->search_with_localization; + while ( my $itemtype = $itemtypes->next ) { + push @authorised_values, $itemtype->itemtype; + $authorised_lib{$itemtype->itemtype} = $itemtype->translated_description; + } $value = ""; #---- class_sources @@ -561,11 +576,11 @@ sub BuildItemsData{ # grab title, author, and ISBN to identify bib that the item # belongs to in the display - my $biblio=GetBiblioData($$itemdata{biblionumber}); - $this_row{title} = $biblio->{title}; - $this_row{author} = $biblio->{author}; - $this_row{isbn} = $biblio->{isbn}; - $this_row{biblionumber} = $biblio->{biblionumber}; + my $biblio = Koha::Biblios->find( $itemdata->{biblionumber} ); + $this_row{title} = $biblio->title; + $this_row{author} = $biblio->author; + $this_row{isbn} = $biblio->biblioitem->isbn; + $this_row{biblionumber} = $biblio->biblionumber; if (%this_row) { push(@big_array, \%this_row); @@ -670,7 +685,7 @@ sub add_saved_job_results_to_template { sub put_in_background { my $job_size = shift; - my $job = C4::BackgroundJob->new($sessionID, "test", $ENV{'SCRIPT_NAME'}, $job_size); + my $job = C4::BackgroundJob->new($sessionID, "test", '/cgi-bin/koha/tools/batchMod.pl', $job_size); my $jobID = $job->id(); # fork off @@ -695,7 +710,7 @@ sub put_in_background { close STDERR; } else { # fork failed, so exit immediately - warn "fork failed while attempting to run $ENV{'SCRIPT_NAME'} as a background job"; + warn "fork failed while attempting to run tools/batchMod.pl as a background job"; exit 0; } return $job;