Bug 14788: Move opac-topissues.pl code into C4::Circulation

[koha.git] / tools / marc_modification_templates.pl

diff --git a/tools/marc_modification_templates.pl b/tools/marc_modification_templates.pl
index f9c3ee1..10589e4 100755 (executable)
--- a/tools/marc_modification_templates.pl
+++ b/tools/marc_modification_templates.pl
@@ -18,7 +18,7 @@
 
 use Modern::Perl;
 
-use CGI;
+use CGI qw ( -utf8 );
 
 use C4::Auth;
 use C4::Koha;
@@ -67,53 +67,40 @@ if ( $op eq "create_template" ) {
   my $conditional_subfield = $cgi->param('conditional_subfield');
   my $conditional_comparison = $cgi->param('conditional_comparison');
   my $conditional_value = $cgi->param('conditional_value');
-  my $conditional_regex = $cgi->param('conditional_regex') eq 'on';
+  my $conditional_regex = ( $cgi->param('conditional_regex') eq 'on' ) ? 1 : 0;
   my $description = $cgi->param('description');
 
-  unless ( $mmta_id ) {
-    AddModificationTemplateAction(
-      $template_id,
-      $action,
-      $field_number,
-      $from_field,
-      $from_subfield,
-      $field_value,
-      $to_field,
-      $to_subfield,
-      $to_regex_search,
-      $to_regex_replace,
-      $to_regex_modifiers,
-      $conditional,
-      $conditional_field,
-      $conditional_subfield,
-      $conditional_comparison,
-      $conditional_value,
-      $conditional_regex,
-      $description
-    );
-  } else {
-    ModModificationTemplateAction(
-      $mmta_id,
-      $action,
-      $field_number,
-      $from_field,
-      $from_subfield,
-      $field_value,
-      $to_field,
-      $to_subfield,
-      $to_regex_search,
-      $to_regex_replace,
-      $to_regex_modifiers,
-      $conditional,
-      $conditional_field,
-      $conditional_subfield,
-      $conditional_comparison,
-      $conditional_value,
-      $conditional_regex,
-      $description
-    );
-
-  }
+    if ($from_field) {
+        unless ($mmta_id) {
+            AddModificationTemplateAction(
+                $template_id,            $action,
+                $field_number,           $from_field,
+                $from_subfield,          $field_value,
+                $to_field,               $to_subfield,
+                $to_regex_search,        $to_regex_replace,
+                $to_regex_modifiers,     $conditional,
+                $conditional_field,      $conditional_subfield,
+                $conditional_comparison, $conditional_value,
+                $conditional_regex,      $description
+            );
+        }
+        else {
+            ModModificationTemplateAction(
+                $mmta_id,                $action,
+                $field_number,           $from_field,
+                $from_subfield,          $field_value,
+                $to_field,               $to_subfield,
+                $to_regex_search,        $to_regex_replace,
+                $to_regex_modifiers,     $conditional,
+                $conditional_field,      $conditional_subfield,
+                $conditional_comparison, $conditional_value,
+                $conditional_regex,      $description
+            );
+        }
+    }
+    else {
+        $template->param( error => 'no_from_field' );
+    }
 
 } elsif ( $op eq "delete_action" ) {
   DelModificationTemplateAction( $cgi->param('mmta_id') );
@@ -137,6 +124,7 @@ foreach my $action ( @actions ) {
   $action->{'action_update_field'} = ( $action->{'action'} eq 'update_field' );
   $action->{'action_move_field'} = ( $action->{'action'} eq 'move_field' );
   $action->{'action_copy_field'} = ( $action->{'action'} eq 'copy_field' );
+  $action->{'action_copy_and_replace_field'} = ( $action->{'action'} eq 'copy_and_replace_field' );
 
   $action->{'conditional_if'} = ( $action->{'conditional'} eq 'if' );
   $action->{'conditional_unless'} = ( $action->{'conditional'} eq 'unless' );