Bug 10403: (follow-up) fix test to use vendor created earlier during test

[koha.git] / tools / marc_modification_templates.pl

diff --git a/tools/marc_modification_templates.pl b/tools/marc_modification_templates.pl
index dde2476..4f9323f 100755 (executable)
--- a/tools/marc_modification_templates.pl
+++ b/tools/marc_modification_templates.pl
@@ -1,23 +1,22 @@
 #!/usr/bin/perl
-# Copyright 2010 Kyle M Hall <kyle.m.hall@gmail.com>
-#
 # 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.
+# Copyright 2010 Kyle M Hall <kyle.m.hall@gmail.com>
+#
+# 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 <http://www.gnu.org/licenses>.
 
-use strict;
-use warnings;
+use Modern::Perl;
 
 use CGI;
 
@@ -28,12 +27,12 @@ use C4::MarcModificationTemplates;
 
 my $cgi = new CGI;
 
-my $op = $cgi->param('op');
+my $op = $cgi->param('op') || q{};
 my $template_id = $cgi->param('template_id');
 
 my ($template, $loggedinuser, $cookie)
     = get_template_and_user({
-            template_name => "tools/marc_modification_templates.tmpl",
+            template_name => "tools/marc_modification_templates.tt",
             query => $cgi,
             type => "intranet",
             authnotrequired => 0,
@@ -60,55 +59,48 @@ if ( $op eq "create_template" ) {
   my $field_value = $cgi->param('field_value');
   my $to_field = $cgi->param('to_field');
   my $to_subfield = $cgi->param('to_subfield');
-  my $to_regex = $cgi->param('to_regex');
+  my $to_regex_search = $cgi->param('to_regex_search');
+  my $to_regex_replace = $cgi->param('to_regex_replace');
+  my $to_regex_modifiers = $cgi->param('to_regex_modifiers');
   my $conditional = $cgi->param('conditional');
   my $conditional_field = $cgi->param('conditional_field');
   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,
-      $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,
-      $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') );