View | Details | Raw Unified | Return to bug 17318
Collapse All | Expand All

(-)a/admin/matching-rules.pl (-3 / +7 lines)
Lines 26-32 use C4::Auth; Link Here
26
use C4::Context;
26
use C4::Context;
27
use C4::Output;
27
use C4::Output;
28
use C4::Koha;
28
use C4::Koha;
29
use C4::Matcher;
29
use C4::Matcher qw/valid_normalization_routines/;
30
30
31
my $script_name = "/cgi-bin/koha/admin/matching-rules.pl";
31
my $script_name = "/cgi-bin/koha/admin/matching-rules.pl";
32
32
Lines 47-54 $template->param(script_name => $script_name); Link Here
47
47
48
my $matcher_id = $input->param("matcher_id");
48
my $matcher_id = $input->param("matcher_id");
49
49
50
$template->param(max_matchpoint => 0);
50
$template->param( max_matchpoint => 0 );
51
$template->param(max_matchcheck => 0);
51
$template->param( max_matchcheck => 0 );
52
my @valid_norms = C4::Matcher::valid_normalization_routines();
53
unshift @valid_norms, 'none';
54
$template->param( valid_norms => \@valid_norms );
55
52
my $display_list = 0;
56
my $display_list = 0;
53
if ($op eq "edit_matching_rule") {
57
if ($op eq "edit_matching_rule") {
54
    edit_matching_rule_form($template, $matcher_id);
58
    edit_matching_rule_form($template, $matcher_id);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt (-19 / +78 lines)
Lines 13-18 Link Here
13
</title>
13
</title>
14
[% INCLUDE 'doc-head-close.inc' %]
14
[% INCLUDE 'doc-head-close.inc' %]
15
15
16
[% BLOCK norms_text %]
17
[%    SWITCH norm %]
18
[%        CASE 'none'           %]None
19
[%        CASE 'remove_spaces'  %]Remove spaces
20
[%        CASE 'upper_case'     %]Uppercase
21
[%        CASE 'lower_case'     %]Lowercase
22
[%        CASE 'legacy_default' %]Legacy default
23
[%        CASE %][% norm %]
24
[%    END %]
25
[% END %]
26
27
[% BLOCK norms_options %]
28
[%# PARAMS: selected_norm %]
29
[%    FOREACH norm IN valid_norms %]
30
[%        IF ( norm == selected_norm ) %]
31
        <option value="[% norm %]" selected="selected">[% PROCESS norms_text norm=norm %]</option>
32
[%        ELSE %]
33
        <option value="[% norm %]">[% PROCESS norms_text norm=norm %]</option>
34
[%        END %]
35
[%    END %]
36
[% END %]
37
38
[% BLOCK norms_select %]
39
[%# PARAMS: selected_norm, id, name %]
40
[%    UNLESS valid_norms.grep(selected_norm).size %]
41
[%#       Fallback to 'none' %]
42
[%        selected_norm = 'none' %]
43
[%    END %]
44
    <select id="[% id %]" name="[% name %]">
45
[%    PROCESS norms_options selected_norm=selected_norm %]
46
    </select>
47
[% END %]
48
16
<script type="text/javascript">
49
<script type="text/javascript">
17
//<![CDATA[
50
//<![CDATA[
18
51
Lines 295-304 function CheckRuleForm(f) { Link Here
295
              [% FOREACH norm IN component.norms %]
328
              [% FOREACH norm IN component.norms %]
296
              <li id="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_n_[% norm.norm_num %]">
329
              <li id="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_n_[% norm.norm_num %]">
297
                <label for="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_n__[% norm.norm_num %]_norm">Normalization rule: </label>
330
                <label for="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_n__[% norm.norm_num %]_norm">Normalization rule: </label>
298
                <input type="text" id="mp_[% norm.mp_num %]_c_[% component.comp_num %]_n__[% norm.norm_num %]_norm" 
331
                [% PROCESS norms_select
299
                       name="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_n_[% norm.norm_num %]_norm" 
332
                     selected_norm=norm.norm
300
                       value="[% norm.norm |html %]"
333
                     id="mp_${norm.mp_num}_c_${component.comp_num}_n__${norm.norm_num}_norm"
301
                       size="20" maxlength="50" />
334
                     name="mp_${matchpoint.mp_num}_c_${component.comp_num}_n_${norm.norm_num}_norm"
335
                %]
302
              </li>
336
              </li>
303
              [% END %]
337
              [% END %]
304
        </ol>
338
        </ol>
Lines 346-352 function CheckRuleForm(f) { Link Here
346
          </li>
380
          </li>
347
            <li id="mp_1_c_1_n_1">
381
            <li id="mp_1_c_1_n_1">
348
              <label for="mp_1_c_1_n_1_norm">Normalization rule: </label>
382
              <label for="mp_1_c_1_n_1_norm">Normalization rule: </label>
349
              <input type="text" id="mp_1_c_1_n_1_norm" name="mp_1_c_1_n_1_norm" size="20" maxlength="50" />
383
                [% PROCESS norms_select
384
                     selected_norm="none"
385
                     id="mp_1_c_1_n_1_norm"
386
                     name="mp_1_c_1_n_1_norm"
387
                %]
350
            </li>
388
            </li>
351
        </ol>
389
        </ol>
352
    </fieldset>
390
    </fieldset>
Lines 403-412 function CheckRuleForm(f) { Link Here
403
          [% FOREACH norm IN src_component.norms %]
441
          [% FOREACH norm IN src_component.norms %]
404
            <li id="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_n_[% norm.norm_num %]">
442
            <li id="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_n_[% norm.norm_num %]">
405
              <label for="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_n_[% norm.norm_num %]_norm">Normalization rule: </label>
443
              <label for="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_n_[% norm.norm_num %]_norm">Normalization rule: </label>
406
              <input type="text" id="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_n_[% norm.norm_num %]_norm" 
444
               [% PROCESS norms_select
407
                     name="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_n_[% norm.norm_num %]_norm" 
445
                     selected_norm=norm.norm
408
                    value="[% norm.norm |html %]"
446
                     id="mc_${matchcheck.mc_num}_src_c_${src_component.comp_num}_n_${norm.norm_num}_norm"
409
                    size="20" maxlength="50" />
447
                     name="mc_${matchcheck.mc_num}_src_c_${src_component.comp_num}_n_${norm.norm_num}_norm"
448
                %]
410
            </li>
449
            </li>
411
          [% END %]
450
          [% END %]
412
        </ol>
451
        </ol>
Lines 447-456 function CheckRuleForm(f) { Link Here
447
          [% FOREACH norm IN tgt_component.norms %]
486
          [% FOREACH norm IN tgt_component.norms %]
448
            <li id="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_n_[% norm.norm_num %]">
487
            <li id="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_n_[% norm.norm_num %]">
449
              <label for="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_n_[% norm.norm_num %]_norm">Normalization rule: </label>
488
              <label for="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_n_[% norm.norm_num %]_norm">Normalization rule: </label>
450
              <input type="text" id="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_n_[% norm.norm_num %]_norm" 
489
               [% PROCESS norms_select
451
                     name="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_n_[% norm.norm_num %]_norm" 
490
                     selected_norm=norm.norm
452
                    value="[% norm.norm |html %]"
491
                     id="mc_${matchcheck.mc_num}_tgt_c_${tgt_component.comp_num}_n_${norm.norm_num}_norm"
453
                    size="20" maxlength="50" />
492
                     name="mc_${matchcheck.mc_num}_tgt_c_${tgt_component.comp_num}_n_${norm.norm_num}_norm"
493
                %]
454
            </li>
494
            </li>
455
          [% END %]
495
          [% END %]
456
        </ol>
496
        </ol>
Lines 486-492 function CheckRuleForm(f) { Link Here
486
          </li>
526
          </li>
487
            <li id="mc_1_src_c_1_n_1">
527
            <li id="mc_1_src_c_1_n_1">
488
              <label for="mc_1_src_c_1_n_1_norm">Normalization rule: </label>
528
              <label for="mc_1_src_c_1_n_1_norm">Normalization rule: </label>
489
              <input type="text" id="mc_1_src_c_1_n_1_norm" name="mc_1_src_c_1_n_1_norm" size="20" maxlength="50" />
529
               [% PROCESS norms_select
530
                     selected_norm="none"
531
                     id="mc_1_src_c_1_n_1_norm"
532
                     name="mc_1_src_c_1_n_1_norm"
533
                %]
490
            </li>
534
            </li>
491
        </ol>
535
        </ol>
492
      </fieldset>
536
      </fieldset>
Lines 512-518 function CheckRuleForm(f) { Link Here
512
          </li>
556
          </li>
513
            <li id="mc_1_tgt_c_1_n_1">
557
            <li id="mc_1_tgt_c_1_n_1">
514
              <label for="mc_1_tgt_c_1_n_1_norm">Normalization rule: </label>
558
              <label for="mc_1_tgt_c_1_n_1_norm">Normalization rule: </label>
515
              <input type="text" id="mc_1_tgt_c_1_n_1_norm" name="mc_1_tgt_c_1_n_1_norm" size="20" maxlength="50" />
559
               [% PROCESS norms_select
560
                     selected_norm="none"
561
                     id="mc_1_tgt_c_1_n_1_norm"
562
                     name="mc_1_tgt_c_1_n_1_norm"
563
                %]
516
            </li>
564
            </li>
517
        </ol>
565
        </ol>
518
      </fieldset>
566
      </fieldset>
Lines 623-629 function CheckRuleForm(f) { Link Here
623
          </li>
671
          </li>
624
            <li id="mp_num_c_1_n_1">
672
            <li id="mp_num_c_1_n_1">
625
              <label for="mp_num_c_1_n_1_norm">Normalization rule: </label>
673
              <label for="mp_num_c_1_n_1_norm">Normalization rule: </label>
626
              <input type="text" id="mp_num_c_1_n_1_norm" name="mp_num_c_1_n_1_norm" size="20" maxlength="50" />
674
               [% PROCESS norms_select
675
                     selected_norm="none"
676
                     id="mp_num_c_1_n_1_norm"
677
                     name="mp_num_c_1_n_1_norm"
678
                %]
627
            </li>
679
            </li>
628
        </ol>
680
        </ol>
629
      </fieldset>
681
      </fieldset>
Lines 656-662 function CheckRuleForm(f) { Link Here
656
        </li>
708
        </li>
657
          <li id="mc_num_src_c_1_n_1">
709
          <li id="mc_num_src_c_1_n_1">
658
            <label for="mc_num_src_c_1_n_1_norm">Normalization rule: </label>
710
            <label for="mc_num_src_c_1_n_1_norm">Normalization rule: </label>
659
            <input type="text" id="mc_num_src_c_1_n_1_norm" name="mc_num_src_c_1_n_1_norm" size="20" maxlength="50" />
711
               [% PROCESS norms_select
712
                     selected_norm="none"
713
                     id="mc_num_src_c_1_n_1_norm"
714
                     name="mc_num_src_c_1_n_1_norm"
715
                %]
660
          </li>
716
          </li>
661
      </ol>
717
      </ol>
662
    </fieldset>
718
    </fieldset>
Lines 681-687 function CheckRuleForm(f) { Link Here
681
        </li>
737
        </li>
682
          <li id="mc_num_tgt_c_1_n_1">
738
          <li id="mc_num_tgt_c_1_n_1">
683
            <label for="mc_num_tgt_c_1_n_1_norm">Normalization rule: </label>
739
            <label for="mc_num_tgt_c_1_n_1_norm">Normalization rule: </label>
684
            <input type="text" id="mc_num_tgt_c_1_n_1_norm" name="mc_num_tgt_c_1_n_1_norm" size="20" maxlength="50" />
740
               [% PROCESS norms_select
741
                     selected_norm="none"
742
                     id="mc_num_tgt_c_1_n_1_norm"
743
                     name="mc_num_tgt_c_1_n_1_norm"
744
                %]
685
          </li>
745
          </li>
686
      </ol>
746
      </ol>
687
    </fieldset>
747
    </fieldset>
688
- 

Return to bug 17318