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' };
}
my $nextop="";
my @errors; # store errors found while checking data BEFORE saving item.
my $items_display_hashref;
-my $frameworkcode="";
-my $tagslib = &GetMarcStructure(1,$frameworkcode);
+my $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;
# 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
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){
$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++;
}
}
} 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};
+ }
+ };
+ }
+ if ( $runinbackground ) {
+ $modified_items++ if $modified;
+ $modified_fields += $modified;
+ $job->set({
+ modified_items => $modified_items,
+ modified_fields => $modified_fields,
+ });
+ }
}
}
$i++;
# 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));
$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!
$subfield_data{visibility} = "display:none;" if (($tagslib->{$tag}->{$subfield}->{hidden} > 4) || ($tagslib->{$tag}->{$subfield}->{hidden} < -4));
# testing branch value if IndependentBranches.
- 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" );
-
if ( $tagslib->{$tag}->{$subfield}->{authorised_value} ) {
my @authorised_values;
my %authorised_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} = "<input type=\"text\" $attributes />
- <a href=\"#\" class=\"buttonDot\"
- onclick=\"Dopop('/cgi-bin/koha/authorities/auth_finder.pl?authtypecode=".$tagslib->{$tag}->{$subfield}->{authtypecode}."&index=$subfield_data{id}','$subfield_data{id}'); return false;\" title=\"Tag Editor\">...</a>
- ";
+ $subfield_data{marc_value} = {
+ type => 'text1',
+ id => $subfield_data{id},
+ value => $value,
+ authtypecode => $tagslib->{$tag}->{$subfield}->{authtypecode},
+ }
# it's a plugin field
}
elsif ( $tagslib->{$tag}->{$subfield}->{value_builder} ) {
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[<input type="text" $attributes
- onfocus="Focus$function_name($subfield_data{random}, '$subfield_data{id}');"
- onblur=" Blur$function_name($subfield_data{random}, '$subfield_data{id}');" />
- <a href="#" class="buttonDot" onclick="Clic$function_name('$subfield_data{id}'); return false;" title="Tag Editor">...</a>
- $javascript];
+ $subfield_data{marc_value} = {
+ type => 'text2',
+ id => $subfield_data{id},
+ value => $value,
+ function => $function_name,
+ random => $subfield_data{random},
+ javascript => $javascript,
+ };
} else {
warn "Plugin Failed: $plugin";
- $subfield_data{marc_value} = "<input type=\"text\" $attributes />"; # supply default input form
+ $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(<input type="hidden" $attributes />);
+ $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(<input type="text" $attributes />);
+ $subfield_data{marc_value} = {
+ type => 'text',
+ id => $subfield_data{id},
+ value => $value,
+ };
}
elsif ( length($value) > 100
or (C4::Context->preference("marcflavour") eq "UNIMARC" and
500 <= $tag && $tag < 600 )
) {
# oversize field (textarea)
- $subfield_data{marc_value} = "<textarea $attributes_no_value>$value</textarea>\n";
+ $subfield_data{marc_value} = {
+ type => 'textarea',
+ id => $subfield_data{id},
+ value => $value,
+ };
} else {
# it's a standard field
- $subfield_data{marc_value} = "<input type=\"text\" $attributes />";
+ $subfield_data{marc_value} = {
+ type => 'text',
+ id => $subfield_data{id},
+ value => $value,
+ };
}
# $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\">";
push (@loop_data, \%subfield_data);
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;
}
}
$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;
# 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 {
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 {