X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=tools%2FbatchMod.pl;h=69762b1008abd09a0675cfc2e12b24d7893a9357;hb=85642ededaf71b0a67805151937014f42deea2dd;hp=e416d444da46cb79a1f9b997856839cb9abe3f56;hpb=11feabf09b56c4a8756c882b289bc9d3bbf10ab0;p=koha_fer

diff --git a/tools/batchMod.pl b/tools/batchMod.pl
index e416d444da..69762b1008 100755
--- a/tools/batchMod.pl
+++ b/tools/batchMod.pl
@@ -47,7 +47,7 @@ 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;
@@ -78,13 +78,14 @@ 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);
+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;
@@ -161,7 +162,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++;
@@ -185,14 +186,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};
+                        }
+                    };
+                }
+                if ( $runinbackground ) {
+                    $modified_items++ if $modified;
+                    $modified_fields += $modified;
+                    $job->set({
+                        modified_items  => $modified_items,
+                        modified_fields => $modified_fields,
+                    });
+                }
 		    }
 		}
 		$i++;
@@ -261,8 +273,7 @@ if ($op eq "show"){
     } 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 =();
@@ -309,7 +320,7 @@ foreach my $tag (sort keys %{$tagslib}) {
 	$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!
@@ -318,7 +329,7 @@ foreach my $tag (sort keys %{$tagslib}) {
 	    $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.
+    # 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" );
@@ -492,7 +503,7 @@ 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))){
@@ -547,6 +558,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;
@@ -561,21 +574,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]) ~~ $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 {
@@ -610,6 +627,13 @@ 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 {