Bug 7475: Teach matching rules to handle authorities

[koha.git] / admin / matching-rules.pl

diff --git a/admin/matching-rules.pl b/admin/matching-rules.pl
index 63e5a3f..ea86c48 100755 (executable)
--- a/admin/matching-rules.pl
+++ b/admin/matching-rules.pl
@@ -30,7 +30,7 @@ use C4::Matcher;
 
 my $script_name = "/cgi-bin/koha/admin/matching-rules.pl";
 
-my $input = new CGI;
+our $input = new CGI;
 my $op = $input->param('op') || '';
 
 
@@ -39,7 +39,7 @@ my ($template, $loggedinuser, $cookie)
                  query => $input,
                  type => "intranet",
                  authnotrequired => 0,
-                 flagsrequired => {parameters => 1},
+                 flagsrequired => {parameters => 'parameters_remaining_permissions'},
                  debug => 1,
                  });
 
@@ -92,9 +92,10 @@ 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
+    my $matcher = C4::Matcher->new($record_type, 1000);
     $matcher->code($input->param('code'));
     $matcher->description($input->param('description'));
     $matcher->threshold($input->param('threshold'));
@@ -126,7 +127,7 @@ sub add_update_matching_rule {
 
     # match checks
     my @mc_nums = sort map { /^mc_(\d+)_id/ ? int($1): () } $input->param;
-    foreach my $mc_num (@mp_nums) {
+    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;
@@ -203,10 +204,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 = ();