X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=tools%2FbatchMod.pl;h=921c4d66b03839c97bae22e578e83ea70ff56efe;hb=718473bdd2f156544e7f254fa7adce2890c51e2a;hp=12e7eea49c3cc751a521f4d12bcea452ef0dcaa6;hpb=9b98fc778dd74bc209f03c2858cbd0a8219babe8;p=koha_fer diff --git a/tools/batchMod.pl b/tools/batchMod.pl index 12e7eea49c..921c4d66b0 100755 --- a/tools/batchMod.pl +++ b/tools/batchMod.pl @@ -14,12 +14,13 @@ # 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., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# 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 CGI; use strict; +#use warnings; FIXME - Bug 2505 use C4::Auth; use C4::Output; use C4::Biblio; @@ -27,11 +28,10 @@ use C4::Items; use C4::Context; use C4::Koha; # XXX subfield_is_koha_internal_p use C4::Branch; # XXX subfield_is_koha_internal_p +use C4::BackgroundJob; use C4::ClassSource; use C4::Dates; use C4::Debug; -use YAML; -use Switch; use MARC::File::XML; my $input = new CGI; @@ -40,6 +40,9 @@ my $error = $input->param('error'); my @itemnumbers = $input->param('itemnumber'); my $op = $input->param('op'); my $del = $input->param('del'); +my $completedJobID = $input->param('completedJobID'); +my $runinbackground = $input->param('runinbackground'); + my $template_name; my $template_flag; @@ -48,7 +51,7 @@ if (!defined $op) { $template_flag = { tools => '*' }; } else { $template_name = ($del) ? "tools/batchMod-del.tmpl" : "tools/batchMod-edit.tmpl"; - $template_flag = ($del) ? { tools => 'batchdel' } : { tools => 'batchmod' }; + $template_flag = ($del) ? { tools => 'items_batchdel' } : { tools => 'items_batchmod' }; } @@ -76,6 +79,10 @@ my $deleted_items = 0; # Numbers of deleted items my $not_deleted_items = 0; # Numbers of items that could not be deleted my @not_deleted; # List of the itemnumbers that could not be deleted +my %cookies = parse CGI::Cookie($cookie); +my $sessionID = $cookies{'CGISESSID'}->value; + + #--- ---------------------------------------------------------------------------- if ($op eq "action") { #------------------------------------------------------------------------------- @@ -86,88 +93,139 @@ if ($op eq "action") { my @ind_tag = $input->param('ind_tag'); my @indicator = $input->param('indicator'); - my $xml = TransformHtmlToXml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag, 'ITEM'); - my $marcitem = MARC::Record::new_from_xml($xml, 'UTF-8'); - my $localitem = TransformMarcToKoha( $dbh, $marcitem, "", 'items' ); - - foreach my $itemnumber(@itemnumbers){ - my $itemdata=GetItem($itemnumber); - if ($input->param("del")){ - my $return = DelItemCheck(C4::Context->dbh, $itemdata->{'biblionumber'}, $itemdata->{'itemnumber'}); - if ($return == 1) { - $deleted_items++; - } else { - $not_deleted_items++; - push @not_deleted, { itemnumber => $itemdata->{'itemnumber'}, barcode => $itemdata->{'barcode'}, title => $itemdata->{'title'}, $return => 1 }; + # Is there something to modify ? + # TODO : We shall use this var to warn the user in case no modification was done to the items + my $something_to_modify = scalar(grep {!/^$/} @values); + + # Once the job is done + if ($completedJobID) { + # If we have a reasonable amount of items, we display them + if (scalar(@itemnumbers) <= 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; + $template->param("simple_items_display" => \@simple_items_display); + } + + # Setting the job as done + my $job = C4::BackgroundJob->fetch($sessionID, $completedJobID); + + # Calling the template + add_saved_job_results_to_template($template, $completedJobID); + + # While the job is getting done + } else { + + # Job size is the number of items we have to process + my $job_size = scalar(@itemnumbers); + my $job = undef; + my $callback = sub {}; + + # If we asked for background processing + if ($runinbackground) { + $job = put_in_background($job_size); + $callback = progress_callback($job, $dbh); + } + + # For each item + my $i = 1; + foreach my $itemnumber(@itemnumbers){ + + $job->progress($i) if $runinbackground; + my $itemdata=GetItem($itemnumber); + if ($input->param("del")){ + my $return = DelItemCheck(C4::Context->dbh, $itemdata->{'biblionumber'}, $itemdata->{'itemnumber'}); + if ($return == 1) { + $deleted_items++; + } else { + $not_deleted_items++; + push @not_deleted, { biblionumber => $itemdata->{'biblionumber'}, itemnumber => $itemdata->{'itemnumber'}, barcode => $itemdata->{'barcode'}, title => $itemdata->{'title'}, $return => 1 }; + } + } else { + if ($something_to_modify) { + my $xml = TransformHtmlToXml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag, 'ITEM'); + my $marcitem = MARC::Record::new_from_xml($xml, 'UTF-8'); + my $localitem = TransformMarcToKoha( $dbh, $marcitem, "", 'items' ); + my $localmarcitem=Item2Marc($itemdata); + UpdateMarcWith($marcitem,$localmarcitem); + eval{my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = ModItemFromMarc($localmarcitem,$itemdata->{biblionumber},$itemnumber)}; } - } else { - my $localmarcitem=Item2Marc($itemdata); - UpdateMarcWith($marcitem,$localmarcitem); - eval{my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = ModItemFromMarc($localmarcitem,$itemdata->{biblionumber},$itemnumber)}; - } + } + $i++; + } } - $items_display_hashref=BuildItemsData(@itemnumbers); } - # #------------------------------------------------------------------------------- # build screen with existing items. and "new" one #------------------------------------------------------------------------------- if ($op eq "show"){ - my $filefh = $input->upload('uploadfile'); - my $filecontent = $input->param('filecontent'); - my @notfoundbarcodes; + my $filefh = $input->upload('uploadfile'); + my $filecontent = $input->param('filecontent'); + my @notfoundbarcodes; my @contentlist; if ($filefh){ while (my $content=<$filefh>){ - chomp $content; - push @contentlist, $content; + $content =~ s/[\r\n]*$//; + push @contentlist, $content if $content; } - switch ($filecontent) { - case "barcode_file" { - foreach my $barcode (@contentlist) { + if ($filecontent eq 'barcode_file') { + foreach my $barcode (@contentlist) { - my $itemnumber = GetItemnumberFromBarcode($barcode); - if ($itemnumber) { - push @itemnumbers,$itemnumber; - } else { - push @notfoundbarcodes, $barcode; - } - } - - } - - case "itemid_file" { - @itemnumbers = @contentlist; - } - } + my $itemnumber = GetItemnumberFromBarcode($barcode); + if ($itemnumber) { + push @itemnumbers,$itemnumber; + } else { + push @notfoundbarcodes, $barcode; + } + } + } + elsif ( $filecontent eq 'itemid_file') { + @itemnumbers = @contentlist; + } } else { - if ( my $list=$input->param('barcodelist')){ - push my @barcodelist, split(/\s\n/, $list); + if ( my $list=$input->param('barcodelist')){ + push my @barcodelist, split(/\s\n/, $list); - foreach my $barcode (@barcodelist) { + foreach my $barcode (@barcodelist) { - my $itemnumber = GetItemnumberFromBarcode($barcode); - if ($itemnumber) { - push @itemnumbers,$itemnumber; - } else { - push @notfoundbarcodes, $barcode; - } - } + my $itemnumber = GetItemnumberFromBarcode($barcode); + if ($itemnumber) { + push @itemnumbers,$itemnumber; + } else { + push @notfoundbarcodes, $barcode; + } + } + } } -} - $items_display_hashref=BuildItemsData(@itemnumbers); + # 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 1000 + if (scalar(@itemnumbers) <= 1000) { + $items_display_hashref=BuildItemsData(@itemnumbers); + } else { + $template->param("too_many_items" => scalar(@itemnumbers)); + # Even if we do not display the items, we need the itemnumbers + my @itemnumbers_hashref = map {{itemnumber => $_}} @itemnumbers; + $template->param("itemnumbers_hashref" => \@itemnumbers_hashref); + } # now, build the item form for entering a new item my @loop_data =(); my $i=0; my $authorised_values_sth = $dbh->prepare("SELECT authorised_value,lib FROM authorised_values WHERE category=? ORDER BY lib"); my $branches = GetBranchesLoop(); # 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); + my $pref_itemcallnumber = C4::Context->preference('itemcallnumber'); @@ -219,17 +277,18 @@ foreach my $tag (sort keys %{$tagslib}) { foreach my $thisbranch (@$branches) { push @authorised_values, $thisbranch->{value}; $authorised_lib{$thisbranch->{value}} = $thisbranch->{branchname}; - $value = $thisbranch->{value} if $thisbranch->{selected}; } + $value = ""; } elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) { - push @authorised_values, "" unless ( $tagslib->{$tag}->{$subfield}->{mandatory} ); + 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; } + $value = ""; #---- class_sources } @@ -246,7 +305,7 @@ foreach my $tag (sort keys %{$tagslib}) { push @authorised_values, $class_source; $authorised_lib{$class_source} = $class_sources->{$class_source}->{'description'}; } - $value = $default_source unless ($value); + $value = ''; #---- "true" authorised value } @@ -397,8 +456,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{bibinfo} = join("\n", @$biblio{qw(title author ISBN)}); + 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}; if (%this_row) { push(@big_array, \%this_row); @@ -417,7 +479,11 @@ sub BuildItemsData{ $row_data{itemnumber} = $row->{itemnumber}; #reporting this_row values $row_data{'nomod'} = $row->{'nomod'}; - $row_data{bibinfo} = $row->{bibinfo}; + $row_data{bibinfo} = $row->{bibinfo}; + $row_data{author} = $row->{author}; + $row_data{title} = $row->{title}; + $row_data{isbn} = $row->{isbn}; + $row_data{biblionumber} = $row->{biblionumber}; push(@item_value_loop,\%row_data); } my @header_loop=map { { header_value=> $witness{$_}} } @witnesscodessorted; @@ -430,7 +496,7 @@ sub BuildItemsData{ # Where subfield is not repeated # And where we are sure that field should correspond # And $tag>10 -sub UpdateMarcWith($$){ +sub UpdateMarcWith { my ($marcfrom,$marcto)=@_; #warn "FROM :",$marcfrom->as_formatted; my ( $itemtag, $itemtagsubfield) = &GetMarcFromKohaField("items.itemnumber", ""); @@ -438,7 +504,7 @@ sub UpdateMarcWith($$){ my @fields_to=$marcto->field($itemtag); foreach my $subfield ($fieldfrom->subfields()){ foreach my $field_to_update (@fields_to){ - $field_to_update->update($$subfield[0]=>$$subfield[1]) if ($$subfield[1]); + $field_to_update->update($$subfield[0]=>$$subfield[1]) if ($$subfield[1] != '' or $$subfield[1] == '0'); } } #warn "TO edited:",$marcto->as_formatted; @@ -460,5 +526,65 @@ sub find_value { return($indicator,$result); } +# ---------------------------- +# Background functions + + +sub add_results_to_template { + my $template = shift; + my $results = shift; + $template->param(map { $_ => $results->{$_} } keys %{ $results }); +} + +sub add_saved_job_results_to_template { + my $template = shift; + my $completedJobID = shift; + my $job = C4::BackgroundJob->fetch($sessionID, $completedJobID); + my $results = $job->results(); + add_results_to_template($template, $results); +} + +sub put_in_background { + my $job_size = shift; + + my $job = C4::BackgroundJob->new($sessionID, "test", $ENV{'SCRIPT_NAME'}, $job_size); + my $jobID = $job->id(); + + # fork off + if (my $pid = fork) { + # parent + # return job ID as JSON + + # prevent parent exiting from + # destroying the kid's database handle + # FIXME: according to DBI doc, this may not work for Oracle + $dbh->{InactiveDestroy} = 1; + + my $reply = CGI->new(""); + print $reply->header(-type => 'text/html'); + print "{ jobID: '$jobID' }"; + exit 0; + } elsif (defined $pid) { + # child + # close STDOUT to signal to Apache that + # we're now running in the background + close STDOUT; + close STDERR; + } else { + # fork failed, so exit immediately + warn "fork failed while attempting to run $ENV{'SCRIPT_NAME'} as a background job"; + exit 0; + } + return $job; +} + +sub progress_callback { + my $job = shift; + my $dbh = shift; + return sub { + my $progress = shift; + $job->progress($progress); + } +}