X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=tools%2FbatchMod.pl;h=320b4f1f1b34fb8707761cb583c947aa034a7a43;hb=0124a6269d344e3e93f1c892f74629fba501a61f;hp=5469496302b5d8990e0dad6bf697480c3b99a1fc;hpb=e584ba169e3301182196e5aca66a32e0bcd229a9;p=koha.git diff --git a/tools/batchMod.pl b/tools/batchMod.pl index 5469496302..320b4f1f1b 100755 --- a/tools/batchMod.pl +++ b/tools/batchMod.pl @@ -5,20 +5,20 @@ # # 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 free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# 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. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . -use CGI; +use CGI qw ( -utf8 ); use strict; #use warnings; FIXME - Bug 2505 use C4::Auth; @@ -27,32 +27,37 @@ 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::Branch; 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::DateUtils; 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'); my $del_records = $input->param('del_records'); my $completedJobID = $input->param('completedJobID'); my $runinbackground = $input->param('runinbackground'); - +my $src = $input->param('src'); +my $use_default_values = $input->param('use_default_values'); my $template_name; my $template_flag; if (!defined $op) { - $template_name = "tools/batchMod.tmpl"; + $template_name = "tools/batchMod.tt"; $template_flag = { tools => '*' }; + $op = q{}; } else { - $template_name = ($del) ? "tools/batchMod-del.tmpl" : "tools/batchMod-edit.tmpl"; + $template_name = ($del) ? "tools/batchMod-del.tt" : "tools/batchMod-edit.tt"; $template_flag = ($del) ? { tools => 'items_batchdel' } : { tools => 'items_batchmod' }; } @@ -65,22 +70,26 @@ my ($template, $loggedinuser, $cookie) flagsrequired => $template_flag, }); +# Does the user have a restricted item edition permission? +my $uid = $loggedinuser ? GetMember( borrowernumber => $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 $frameworkcode=""; -my $tagslib = &GetMarcStructure(1,$frameworkcode); +our $tagslib = &GetMarcStructure(1); my $deleted_items = 0; # Number of deleted items my $deleted_records = 0; # Number of deleted records ( with no items attached ) my $not_deleted_items = 0; # Number of items that could not be deleted my @not_deleted; # List of the itemnumbers that could not be deleted +my $modified_items = 0; # Numbers of modified items +my $modified_fields = 0; # Numbers of modified fields my %cookies = parse CGI::Cookie($cookie); my $sessionID = $cookies{'CGISESSID'}->value; @@ -89,13 +98,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 @@ -106,7 +115,7 @@ 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) <= 1000) { + if (scalar(@itemnumbers) <= ( C4::Context->preference("MaxItemsForBatch") // 1000 ) ) { $items_display_hashref=BuildItemsData(@itemnumbers); } else { # Else, we only display the barcode @@ -136,7 +145,6 @@ if ($op eq "action") { my ( $itemtagfield, $itemtagsubfield) = &GetMarcFromKohaField("items.itemnumber", ""); if ($values_to_modify){ my $xml = TransformHtmlToXml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag, 'ITEM'); - utf8::encode($xml); $marcitem = MARC::Record::new_from_xml($xml, 'UTF-8'); } if ($values_to_blank){ @@ -157,7 +165,7 @@ if ($op eq "action") { $job->progress($i) if $runinbackground; my $itemdata = GetItem($itemnumber); - if ($input->param("del")){ + if ( $del ){ my $return = DelItemCheck(C4::Context->dbh, $itemdata->{'biblionumber'}, $itemdata->{'itemnumber'}); if ($return == 1) { $deleted_items++; @@ -181,14 +189,25 @@ if ($op eq "action") { } } } else { - if ($values_to_modify || $values_to_blank) { - my $localmarcitem = Item2Marc($itemdata); - UpdateMarcWith( $marcitem, $localmarcitem ); - eval{ - if ( my $item = ModItemFromMarc( $localmarcitem, $itemdata->{biblionumber}, $itemnumber ) ) { - LostItem($itemnumber, 'MARK RETURNED', 'CHARGE FEE') if $item->{itemlost}; - } - }; + if ($values_to_modify || $values_to_blank) { + my $localmarcitem = Item2Marc($itemdata); + + my $modified = UpdateMarcWith( $marcitem, $localmarcitem ); + if ( $modified ) { + eval { + if ( my $item = ModItemFromMarc( $localmarcitem, $itemdata->{biblionumber}, $itemnumber ) ) { + LostItem($itemnumber, 'MARK RETURNED') if $item->{itemlost} and not $itemdata->{itemlost}; + } + }; + } + if ( $runinbackground ) { + $modified_items++ if $modified; + $modified_fields += $modified; + $job->set({ + modified_items => $modified_items, + modified_fields => $modified_fields, + }); + } } } $i++; @@ -227,8 +246,14 @@ if ($op eq "show"){ @itemnumbers = @contentlist; } } else { + if (defined $biblionumber){ + my @all_items = GetItemsInfo( $biblionumber ); + foreach my $itm (@all_items) { + push @itemnumbers, $itm->{itemnumber}; + } + } if ( my $list=$input->param('barcodelist')){ - push my @barcodelist, split(/\s\n/, $list); + push my @barcodelist, uniq( split(/\s\n/, $list) ); foreach my $barcode (@barcodelist) { @@ -245,19 +270,24 @@ 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 1000 - if (scalar(@itemnumbers) <= 1000) { + # Only display the items if there are no more than pref MaxItemsForBatch + if (scalar(@itemnumbers) <= ( C4::Context->preference("MaxItemsForBatch") // 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); + $template->param(itemnumbers_array => \@itemnumbers); } # 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 $branch_limit = C4::Context->userenv ? C4::Context->userenv->{"branch"} : ""; +my $query = qq{SELECT authorised_value, lib FROM authorised_values}; +$query .= qq{ LEFT JOIN authorised_values_branches ON ( id = av_id ) } if $branch_limit; +$query .= qq{ WHERE category = ?}; +$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. @@ -267,11 +297,19 @@ unshift (@$branches, $nochange_branch); my $pref_itemcallnumber = C4::Context->preference('itemcallnumber'); +# Getting list of subfields to keep when restricted batchmod edit is enabled +my $subfieldsToAllowForBatchmod = C4::Context->preference('SubfieldsToAllowForRestrictedBatchmod'); +my $allowAllSubfields = ( + not defined $subfieldsToAllowForBatchmod + or $subfieldsToAllowForBatchmod == 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 next if $tagslib->{$tag}->{$subfield}->{'kohafield'} eq 'items.barcode'; @@ -286,26 +324,24 @@ foreach my $tag (sort keys %{$tagslib}) { } $subfield_data{tag} = $tag; $subfield_data{subfield} = $subfield; - $subfield_data{random} = int(rand(1000000)); # why do we need 2 different randoms? - # $subfield_data{marc_lib} = $tagslib->{$tag}->{$subfield}->{lib}; $subfield_data{marc_lib} ="{$tag}->{$subfield}->{lib}."\">".$tagslib->{$tag}->{$subfield}->{lib}.""; $subfield_data{mandatory} = $tagslib->{$tag}->{$subfield}->{mandatory}; $subfield_data{repeatable} = $tagslib->{$tag}->{$subfield}->{repeatable}; my ($x,$value); $value =~ s/"/"/g; - unless ($value) { + 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 IndependantBranches. - - my $attributes_no_value = qq(tabindex="1" id="$subfield_data{id}" name="field_value" class="input_marceditor" size="67" maxlength="255" ); - my $attributes = qq($attributes_no_value value="$value" ); + # testing branch value if IndependentBranches. if ( $tagslib->{$tag}->{$subfield}->{authorised_value} ) { my @authorised_values; @@ -319,14 +355,13 @@ foreach my $tag (sort keys %{$tagslib}) { } $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 = GetItemTypes( style => 'array' ); + for my $itemtype ( @$itemtypes ) { + push @authorised_values, $itemtype->{itemtype}; + $authorised_lib{$itemtype->{itemtype}} = $itemtype->{translated_description}; + } $value = ""; #---- class_sources @@ -350,56 +385,71 @@ foreach my $tag (sort keys %{$tagslib}) { } else { push @authorised_values, ""; # unless ( $tagslib->{$tag}->{$subfield}->{mandatory} ); - $authorised_values_sth->execute( $tagslib->{$tag}->{$subfield}->{authorised_value} ); + $authorised_values_sth->execute( $tagslib->{$tag}->{$subfield}->{authorised_value}, $branch_limit ? $branch_limit : () ); while ( my ( $value, $lib ) = $authorised_values_sth->fetchrow_array ) { push @authorised_values, $value; $authorised_lib{$value} = $lib; } $value=""; } - $subfield_data{marc_value} =CGI::scrolling_list( # FIXME: factor out scrolling_list - -name => "field_value", - -values => \@authorised_values, - -default => $value, - -labels => \%authorised_lib, - -override => 1, - -size => 1, - -multiple => 0, - -tabindex => 1, - -id => "tag_".$tag."_subfield_".$subfield."_".$index_subfield, - -class => "input_marceditor", - ); + $subfield_data{marc_value} = { + type => 'select', + id => "tag_".$tag."_subfield_".$subfield."_".$index_subfield, + name => "field_value", + values => \@authorised_values, + labels => \%authorised_lib, + default => $value, + }; # it's a thesaurus / authority field } elsif ( $tagslib->{$tag}->{$subfield}->{authtypecode} ) { - $subfield_data{marc_value} = " - {$tag}->{$subfield}->{authtypecode}."&index=$subfield_data{id}','$subfield_data{id}'); return false;\" title=\"Tag Editor\">... - "; - # it's a plugin field + $subfield_data{marc_value} = { + type => 'text1', + id => $subfield_data{id}, + value => $value, + authtypecode => $tagslib->{$tag}->{$subfield}->{authtypecode}, + } } - elsif ( $tagslib->{$tag}->{$subfield}->{value_builder} ) { - # opening plugin - my $plugin = C4::Context->intranetdir . "/cataloguing/value_builder/" . $tagslib->{$tag}->{$subfield}->{'value_builder'}; - if (do $plugin) { - my $temp; - my $extended_param = plugin_parameters( $dbh, $temp, $tagslib, $subfield_data{id}, \@loop_data ); - my ( $function_name, $javascript ) = plugin_javascript( $dbh, $temp, $tagslib, $subfield_data{id}, \@loop_data ); - $subfield_data{marc_value} = qq[ - ... - $javascript]; + elsif ( $tagslib->{$tag}->{$subfield}->{value_builder} ) { # plugin + require Koha::FrameworkPlugin; + my $plugin = Koha::FrameworkPlugin->new( { + name => $tagslib->{$tag}->{$subfield}->{'value_builder'}, + item_style => 1, + }); + my $temp; + my $pars= { dbh => $dbh, record => $temp, tagslib => $tagslib, + id => $subfield_data{id}, tabloop => \@loop_data }; + $plugin->build( $pars ); + if( !$plugin->errstr ) { + $subfield_data{marc_value} = { + type => 'text2', + id => $subfield_data{id}, + value => $value, + javascript => $plugin->javascript, + noclick => $plugin->noclick, + }; } else { - warn "Plugin Failed: $plugin"; - $subfield_data{marc_value} = ""; # supply default input form + warn $plugin->errstr; + $subfield_data{marc_value} = { # supply default input form + type => 'text', + id => $subfield_data{id}, + value => $value, + }; } } elsif ( $tag eq '' ) { # it's an hidden field - $subfield_data{marc_value} = qq(); + $subfield_data{marc_value} = { + type => 'hidden', + id => $subfield_data{id}, + value => $value, + }; } elsif ( $tagslib->{$tag}->{$subfield}->{'hidden'} ) { # FIXME: shouldn't input type be "hidden" ? - $subfield_data{marc_value} = qq(); + $subfield_data{marc_value} = { + type => 'text', + id => $subfield_data{id}, + value => $value, + }; } elsif ( length($value) > 100 or (C4::Context->preference("marcflavour") eq "UNIMARC" and @@ -408,16 +458,26 @@ foreach my $tag (sort keys %{$tagslib}) { 500 <= $tag && $tag < 600 ) ) { # oversize field (textarea) - $subfield_data{marc_value} = "\n"; + $subfield_data{marc_value} = { + type => 'textarea', + id => $subfield_data{id}, + value => $value, + }; } else { # it's a standard field - $subfield_data{marc_value} = ""; + $subfield_data{marc_value} = { + type => 'text', + id => $subfield_data{id}, + value => $value, + }; } # $subfield_data{marc_value}=""; push (@loop_data, \%subfield_data); $i++ } } # -- End foreach tag +$authorised_values_sth->finish; + # what's the next op ? it's what we are not in : an add if we're editing, otherwise, and edit. @@ -432,8 +492,8 @@ foreach my $tag (sort keys %{$tagslib}) { $template->param(%$items_display_hashref) if $items_display_hashref; $template->param( op => $nextop, - $op => 1, ); +$template->param( $op => 1 ) if $op; if ($op eq "action") { @@ -449,8 +509,10 @@ if ($op eq "action") { } foreach my $error (@errors) { - $template->param($error => 1); + $template->param($error => 1) if $error; } +$template->param(src => $src); +$template->param(biblionumber => $biblionumber); output_html_with_http_headers $input, $cookie, $template->output; exit; @@ -472,10 +534,10 @@ sub BuildItemsData{ foreach my $field (grep {$_->tag() eq $itemtagfield} $itemmarc->fields()) { # loop through each subfield my $itembranchcode=$field->subfield($branchtagsubfield); - if ($itembranchcode && C4::Context->preference("IndependantBranches")) { + if ($itembranchcode && C4::Context->preference("IndependentBranches")) { #verifying rights my $userenv = C4::Context->userenv(); - unless (($userenv->{'flags'} == 1) or (($userenv->{'branch'} eq $itembranchcode))){ + unless (C4::Context->IsSuperLibrarian() or (($userenv->{'branch'} eq $itembranchcode))){ $this_row{'nomod'}=1; } } @@ -527,6 +589,8 @@ sub BuildItemsData{ $row_data{title} = $row->{title}; $row_data{isbn} = $row->{isbn}; $row_data{biblionumber} = $row->{biblionumber}; + my $is_on_loan = C4::Circulation::IsItemIssued( $row->{itemnumber} ); + $row_data{onloan} = $is_on_loan ? 1 : 0; push(@item_value_loop,\%row_data); } my @header_loop=map { { header_value=> $witness{$_}} } @witnesscodessorted; @@ -541,21 +605,25 @@ sub BuildItemsData{ # And $tag>10 sub UpdateMarcWith { my ($marcfrom,$marcto)=@_; - #warn "FROM :",$marcfrom->as_formatted; - my ( $itemtag, $itemtagsubfield) = &GetMarcFromKohaField("items.itemnumber", ""); - my $fieldfrom=$marcfrom->field($itemtag); - my @fields_to=$marcto->field($itemtag); - foreach my $subfield ($fieldfrom->subfields()){ - foreach my $field_to_update (@fields_to){ - if ($subfield->[1]){ - $field_to_update->update($subfield->[0]=>$subfield->[1]); - } - else { - $field_to_update->delete_subfield(code=> $subfield->[0]); - } - } + my ( $itemtag, $itemtagsubfield) = &GetMarcFromKohaField("items.itemnumber", ""); + my $fieldfrom=$marcfrom->field($itemtag); + my @fields_to=$marcto->field($itemtag); + my $modified = 0; + foreach my $subfield ( $fieldfrom->subfields() ) { + foreach my $field_to_update ( @fields_to ) { + if ( $subfield->[1] ) { + unless ( $field_to_update->subfield($subfield->[0]) eq $subfield->[1] ) { + $modified++; + $field_to_update->update( $subfield->[0] => $subfield->[1] ); + } + } + else { + $modified++; + $field_to_update->delete_subfield( code => $subfield->[0] ); + } + } } - #warn "TO edited:",$marcto->as_formatted; + return $modified; } sub find_value { @@ -590,12 +658,19 @@ sub add_saved_job_results_to_template { my $job = C4::BackgroundJob->fetch($sessionID, $completedJobID); my $results = $job->results(); add_results_to_template($template, $results); + + my $fields = $job->get("modified_fields"); + my $items = $job->get("modified_items"); + $template->param( + modified_items => $items, + modified_fields => $fields, + ); } 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 @@ -620,7 +695,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;