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

(-)a/C4/AuthoritiesMarc.pm (-4 / +4 lines)
Lines 199-205 sub SearchAuthorities { Link Here
199
        }
199
        }
200
    } else {
200
    } else {
201
        my $query;
201
        my $query;
202
        my $attr;
202
        my $attr = '';
203
            # the marclist may contain "mainentry". In this case, search the tag_to_report, that depends on
203
            # the marclist may contain "mainentry". In this case, search the tag_to_report, that depends on
204
            # the authtypecode. Then, search on $a of this tag_to_report
204
            # the authtypecode. Then, search on $a of this tag_to_report
205
            # also store main entry MARC tag, to extract it at end of search
205
            # also store main entry MARC tag, to extract it at end of search
Lines 230-238 sub SearchAuthorities { Link Here
230
                elsif ( @$tags[$i] eq "mainentry" ) {
230
                elsif ( @$tags[$i] eq "mainentry" ) {
231
                    $attr = " \@attr 1=Heading ";
231
                    $attr = " \@attr 1=Heading ";
232
                }
232
                }
233
                elsif ( @$tags[$i] eq "any" ) {
234
                    $attr = " \@attr 1=Any ";
235
                }
236
                elsif ( @$tags[$i] eq "match" ) {
233
                elsif ( @$tags[$i] eq "match" ) {
237
                    $attr = " \@attr 1=Match ";
234
                    $attr = " \@attr 1=Match ";
238
                }
235
                }
Lines 245-250 sub SearchAuthorities { Link Here
245
                elsif ( @$tags[$i] eq "thesaurus" ) {
242
                elsif ( @$tags[$i] eq "thesaurus" ) {
246
                    $attr = " \@attr 1=Subject-heading-thesaurus ";
243
                    $attr = " \@attr 1=Subject-heading-thesaurus ";
247
                }
244
                }
245
                else { # Assume any if no index was specified
246
                    $attr = " \@attr 1=Any ";
247
                }
248
                if ( @$operator[$i] eq 'is' ) {
248
                if ( @$operator[$i] eq 'is' ) {
249
                    $attr .= " \@attr 4=1  \@attr 5=100 "
249
                    $attr .= " \@attr 4=1  \@attr 5=100 "
250
                      ; ##Phrase, No truncation,all of subfield field must match
250
                      ; ##Phrase, No truncation,all of subfield field must match
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tt (-5 / +9 lines)
Lines 22-36 Link Here
22
                [% END %]
22
                [% END %]
23
                [% END %]
23
                [% END %]
24
                </select>
24
                </select>
25
                <select name="operatorc" id="anywhere">
25
                <select name="operator" id="anywhere">
26
                    <option value="contains">contains</option>
26
                    <option value="contains">contains</option>
27
                    <option value="start">starts with</option>
27
                    <option value="start">starts with</option>
28
                    <option value="is">is exactly</option>
28
                    <option value="is">is exactly</option>
29
                </select>
29
                </select>
30
                <input type="text" name="valuec" id="anywhere_value" value="[% value %]" />
30
                <input type="text" name="value" id="value" value="[% value %]" />
31
                <input type="hidden" name="marclistc" value="" />
31
                <select name="marclist" id="marclist">
32
                    <input type="hidden" name="and_ora" value="and" />
32
                    <option value="any" selected="selected">in keyword</option>
33
                <input type="hidden" name="excludingc" value="" />
33
                    <option value="mainentry">in main entry</option>
34
                    <option value="match">in any heading</option>
35
                </select>
36
                <input type="hidden" name="and_ora" value="and" />
37
                <input type="hidden" name="excluding" value="" />
34
            </li>
38
            </li>
35
            <li><label for="orderby">Order by: </label><select name="orderby" id="orderby">
39
            <li><label for="orderby">Order by: </label><select name="orderby" id="orderby">
36
                <option value="">None</option>
40
                <option value="">None</option>
(-)a/opac/opac-authorities-home.pl (-15 / +6 lines)
Lines 58-69 foreach my $thisauthtype ( Link Here
58
}
58
}
59
59
60
if ( $op eq "do_search" ) {
60
if ( $op eq "do_search" ) {
61
    my @marclist = ($query->param('marclista'),$query->param('marclistb'),$query->param('marclistc'));
61
    my @marclist = ($query->param('marclist'));
62
    my @and_or = ($query->param('and_ora'),$query->param('and_orb'),$query->param('and_orc'));
62
    my @and_or = ($query->param('and_or'));
63
    my @excluding = ($query->param('excludinga'),$query->param('excludingb'),$query->param('excludingc'),);
63
    my @excluding = ($query->param('excluding'),);
64
    my @operator = ($query->param('operatora'),$query->param('operatorb'),$query->param('operatorc'));
64
    my @operator = ($query->param('operator'));
65
    my $orderby = $query->param('orderby');
65
    my $orderby = $query->param('orderby');
66
    my @value = ($query->param('valuea') || "",$query->param('valueb') || "",$query->param('valuec') || "",);
66
    my @value = ($query->param('value') || "",);
67
67
68
    $resultsperpage = $query->param('resultsperpage');
68
    $resultsperpage = $query->param('resultsperpage');
69
    $resultsperpage = 20 if ( !defined $resultsperpage );
69
    $resultsperpage = 20 if ( !defined $resultsperpage );
Lines 90-104 if ( $op eq "do_search" ) { Link Here
90
        $displaynext = 1;
90
        $displaynext = 1;
91
    }
91
    }
92
92
93
    my @field_data = ();
93
    my @field_data = ( { term => "marclist" , val => $query->param("marclist") || ''} );
94
95
    foreach my $letter (qw/a b c/){
96
        push @field_data, { term => "marclist$letter" , val => $query->param("marclist$letter") || ''};
97
        push @field_data, { term => "and_or$letter" , val => $query->param("and_or$letter") || ''};
98
        push @field_data, { term => "excluding$letter" , val => $query->param("excluding$letter") || ''};
99
        push @field_data, { term => "operator$letter" , val => $query->param("operator$letter") || ''};
100
        push @field_data, { term => "value$letter" , val => $query->param("value$letter") || ''};
101
    }
102
94
103
    my @numbers = ();
95
    my @numbers = ();
104
96
105
- 

Return to bug 8206