X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=admin%2Fmatching-rules.pl;h=3c30e94288ba7f6c611f9881a335bc0d5a57a3de;hb=e520d699109958712212ead8b8935a63402e5b37;hp=b1670260a63a9c1be7944912022e4d5e728782a0;hpb=413a1e1e61b343db47b9b6fdecf3d981d87013ef;p=koha.git

diff --git a/admin/matching-rules.pl b/admin/matching-rules.pl
index b1670260a6..3c30e94288 100755
--- a/admin/matching-rules.pl
+++ b/admin/matching-rules.pl
@@ -4,29 +4,28 @@
 #
 # 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 <http://www.gnu.org/licenses>.
 #
 
-use strict;
-use warnings;
+use Modern::Perl;
 
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Context;
 use C4::Output;
 use C4::Koha;
-use C4::Matcher;
+use C4::Matcher qw/valid_normalization_routines/;
 
 my $script_name = "/cgi-bin/koha/admin/matching-rules.pl";
 
@@ -35,11 +34,11 @@ my $op = $input->param('op') || '';
 
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/matching-rules.tmpl",
+    = get_template_and_user({template_name => "admin/matching-rules.tt",
                  query => $input,
                  type => "intranet",
                  authnotrequired => 0,
-                 flagsrequired => {parameters => 1},
+                 flagsrequired => {parameters => 'parameters_remaining_permissions'},
                  debug => 1,
                  });
 
@@ -47,8 +46,12 @@ $template->param(script_name => $script_name);
 
 my $matcher_id = $input->param("matcher_id");
 
-$template->param(max_matchpoint => 0);
-$template->param(max_matchcheck => 0);
+$template->param( max_matchpoint => 0 );
+$template->param( max_matchcheck => 0 );
+my @valid_norms = C4::Matcher::valid_normalization_routines();
+unshift @valid_norms, 'none';
+$template->param( valid_norms => \@valid_norms );
+
 my $display_list = 0;
 if ($op eq "edit_matching_rule") {
     edit_matching_rule_form($template, $matcher_id);
@@ -92,21 +95,22 @@ sub add_matching_rule_form {
 sub add_update_matching_rule {
     my $template = shift;
     my $matcher_id = shift;
+    my $record_type = $input->param('record_type') || 'biblio';
 
     # do parsing
-    my $matcher = C4::Matcher->new('biblio', 1000); # FIXME biblio only for now
-    $matcher->code($input->param('code'));
-    $matcher->description($input->param('description'));
-    $matcher->threshold($input->param('threshold'));
+    my $matcher = C4::Matcher->new($record_type, 1000);
+    $matcher->code(scalar $input->param('code'));
+    $matcher->description(scalar $input->param('description'));
+    $matcher->threshold(scalar $input->param('threshold'));
 
     # matchpoints
-    my @mp_nums = sort map { /^mp_(\d+)_search_index/ ? int($1): () } $input->param;
+    my @mp_nums = sort map { /^mp_(\d+)_search_index/ ? int($1): () } $input->multi_param;
     foreach my $mp_num (@mp_nums) {
         my $index = $input->param("mp_${mp_num}_search_index");
         my $score = $input->param("mp_${mp_num}_score");
         # components
         my $components = [];
-        my @comp_nums = sort map { /^mp_${mp_num}_c_(\d+)_tag/ ? int($1): () } $input->param;
+        my @comp_nums = sort map { /^mp_${mp_num}_c_(\d+)_tag/ ? int($1): () } $input->multi_param;
         foreach my $comp_num (@comp_nums) {
             my $component = {};
             $component->{'tag'} = $input->param("mp_${mp_num}_c_${comp_num}_tag");
@@ -115,9 +119,9 @@ sub add_update_matching_rule {
             $component->{'length'} = $input->param("mp_${mp_num}_c_${comp_num}_length");
             # norms
             $component->{'norms'} = [];
-            my @norm_nums = sort map { /^mp_${mp_num}_c_${comp_num}_n_(\d+)_norm/ ? int($1): () } $input->param;
+            my @norm_nums = sort map { /^mp_${mp_num}_c_${comp_num}_n_(\d+)_norm/ ? int($1): () } $input->multi_param;
             foreach my $norm_num (@norm_nums) {
-                push @{ $component->{'norms'} }, $input->param("mp_${mp_num}_c_${comp_num}_n_${norm_num}_norm");
+                push @{ $component->{'norms'} }, $input->multi_param("mp_${mp_num}_c_${comp_num}_n_${norm_num}_norm");
             }
             push @$components, $component;
         }
@@ -125,11 +129,11 @@ sub add_update_matching_rule {
     }
 
     # match checks
-    my @mc_nums = sort map { /^mc_(\d+)_id/ ? int($1): () } $input->param;
+    my @mc_nums = sort map { /^mc_(\d+)_id/ ? int($1): () } $input->multi_param;
     foreach my $mc_num (@mc_nums) {
         # source components
         my $src_components = [];
-        my @src_comp_nums = sort map { /^mc_${mc_num}_src_c_(\d+)_tag/ ? int($1): () } $input->param;
+        my @src_comp_nums = sort map { /^mc_${mc_num}_src_c_(\d+)_tag/ ? int($1): () } $input->multi_param;
         foreach my $comp_num (@src_comp_nums) {
             my $component = {};
             $component->{'tag'} = $input->param("mc_${mc_num}_src_c_${comp_num}_tag");
@@ -138,15 +142,15 @@ sub add_update_matching_rule {
             $component->{'length'} = $input->param("mc_${mc_num}_src_c_${comp_num}_length");
             # norms
             $component->{'norms'} = [];
-            my @norm_nums = sort map { /^mc_${mc_num}_src_c_${comp_num}_n_(\d+)_norm/ ? int($1): () } $input->param;
+            my @norm_nums = sort map { /^mc_${mc_num}_src_c_${comp_num}_n_(\d+)_norm/ ? int($1): () } $input->multi_param;
             foreach my $norm_num (@norm_nums) {
-                push @{ $component->{'norms'} }, $input->param("mc_${mc_num}_src_c_${comp_num}_n_${norm_num}_norm");
+                push @{ $component->{'norms'} }, $input->multi_param("mc_${mc_num}_src_c_${comp_num}_n_${norm_num}_norm");
             }
             push @$src_components, $component;
         }
         # target components
         my $tgt_components = [];
-        my @tgt_comp_nums = sort map { /^mc_${mc_num}_tgt_c_(\d+)_tag/ ? int($1): () } $input->param;
+        my @tgt_comp_nums = sort map { /^mc_${mc_num}_tgt_c_(\d+)_tag/ ? int($1): () } $input->multi_param;
         foreach my $comp_num (@tgt_comp_nums) {
             my $component = {};
             $component->{'tag'} = $input->param("mc_${mc_num}_tgt_c_${comp_num}_tag");
@@ -155,9 +159,9 @@ sub add_update_matching_rule {
             $component->{'length'} = $input->param("mc_${mc_num}_tgt_c_${comp_num}_length");
             # norms
             $component->{'norms'} = [];
-            my @norm_nums = sort map { /^mc_${mc_num}_tgt_c_${comp_num}_n_(\d+)_norm/ ? int($1): () } $input->param;
+            my @norm_nums = sort map { /^mc_${mc_num}_tgt_c_${comp_num}_n_(\d+)_norm/ ? int($1): () } $input->multi_param;
             foreach my $norm_num (@norm_nums) {
-                push @{ $component->{'norms'} }, $input->param("mc_${mc_num}_tgt_c_${comp_num}_n_${norm_num}_norm");
+                push @{ $component->{'norms'} }, $input->multi_param("mc_${mc_num}_tgt_c_${comp_num}_n_${norm_num}_norm");
             }
             push @$tgt_components, $component;
         }
@@ -203,10 +207,11 @@ sub edit_matching_rule_form {
 
     my $matcher = C4::Matcher->fetch($matcher_id);
 
-    $template->param(matcher_id => $matcher_id);
-    $template->param(code => $matcher->code());
-    $template->param(description => $matcher->description());
-    $template->param(threshold => $matcher->threshold());
+    $template->{VARS}->{'matcher_id'} = $matcher_id;
+    $template->{VARS}->{'code'} = $matcher->code();
+    $template->{VARS}->{'description'} = $matcher->description();
+    $template->{VARS}->{'threshold'} = $matcher->threshold();
+    $template->{VARS}->{'record_type'} = $matcher->record_type();
 
     my $matcher_info = $matcher->dump();
     my @matchpoints = ();