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

(-)a/catalogue/search.pl (+8 lines)
Lines 385-396 my @indexes = map uri_unescape($_), $cgi->multi_param('idx'); Link Here
385
if ($indexes[0] && (!$indexes[1] || $params->{'scan'})) {
385
if ($indexes[0] && (!$indexes[1] || $params->{'scan'})) {
386
    my $idx = "ms_".$indexes[0];
386
    my $idx = "ms_".$indexes[0];
387
    $idx =~ s/\,/comma/g;  # template toolkit doesn't like variables with a , in it
387
    $idx =~ s/\,/comma/g;  # template toolkit doesn't like variables with a , in it
388
    $idx =~ s/-/dash/g;  # template toolkit doesn't like variables with a dash in it
388
    $template->param($idx => 1);
389
    $template->param($idx => 1);
389
}
390
}
390
391
391
# an operand can be a single term, a phrase, or a complete ccl query
392
# an operand can be a single term, a phrase, or a complete ccl query
392
my @operands = map uri_unescape($_), $cgi->multi_param('q');
393
my @operands = map uri_unescape($_), $cgi->multi_param('q');
393
394
395
# if a simple search, display the value in the search box
396
if ($operands[0] && !$operands[1]) {
397
    my $ms_query = $operands[0];
398
    $ms_query =~ s/ #\S+//;
399
    $template->param(ms_value => $ms_query);
400
}
401
394
# limits are use to limit to results to a pre-defined category such as branch or language
402
# limits are use to limit to results to a pre-defined category such as branch or language
395
my @limits = map uri_unescape($_), $cgi->multi_param('limit');
403
my @limits = map uri_unescape($_), $cgi->multi_param('limit');
396
my @nolimits = map uri_unescape($_), $cgi->multi_param('nolimit');
404
my @nolimits = map uri_unescape($_), $cgi->multi_param('nolimit');
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc (-1 / +1 lines)
Lines 28-34 Link Here
28
    <p class="tip">Enter search keywords:</p>
28
    <p class="tip">Enter search keywords:</p>
29
    <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
29
    <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
30
        [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
30
        [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
31
        <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
31
        <input type="text" name="q" id="search-form" size="40" value="[% ms_value | html %]" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
32
        <input type="submit" class="submit" value="Submit" />
32
        <input type="submit" class="submit" value="Submit" />
33
    </form>
33
    </form>
34
</div>
34
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc (-34 / +170 lines)
Lines 1-46 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
<select class="advsearch" name="idx">
2
<select class="advsearch" name="idx">
3
    <option value="kw">Keyword</option>
3
    [% IF ms_kw %]
4
    <option value="kw,phr">&nbsp;&nbsp;&nbsp;&nbsp; Keyword as phrase</option>
4
        <option selected="selected" value="kw">Keyword</option>
5
    <option value="au">Author</option>
5
    [% ELSE %]
6
    <option value="au,phr">&nbsp;&nbsp;&nbsp;&nbsp; Author as phrase</option>
6
        <option value="kw">Keyword</option>
7
    <option value="cpn">&nbsp;&nbsp;&nbsp;&nbsp; Corporate name</option>
7
    [% END %]
8
    <option value="cfn">&nbsp;&nbsp;&nbsp;&nbsp; Conference name</option>
8
    [% IF ms_kwcommaphr %]
9
    <option value="cpn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Corporate name as phrase</option>
9
        <option selected="selected" value="kw,phr">&nbsp;&nbsp;&nbsp;&nbsp; Keyword as phrase</option>
10
    <option value="cfn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Conference name as phrase</option>
10
    [% ELSE %]
11
    <option value="pn">&nbsp;&nbsp;&nbsp;&nbsp; Personal name</option>
11
        <option value="kw,phr">&nbsp;&nbsp;&nbsp;&nbsp; Keyword as phrase</option>
12
    <option value="pn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Personal name as phrase</option>
12
    [% END %]
13
    <option value="ti">Title</option>
13
    [% IF ms_au %]
14
    <option value="ti,phr">&nbsp;&nbsp;&nbsp;&nbsp; Title as phrase</option>
14
        <option selected="selected" value="au">Author</option>
15
    <option value="se">&nbsp;&nbsp;&nbsp;&nbsp; Series title</option>
15
    [% ELSE %]
16
    <option value="su">Subject</option>
16
        <option value="au">Author</option>
17
    <option value="su,phr">&nbsp;&nbsp;&nbsp;&nbsp; Subject as phrase</option>
17
    [% END %]
18
    [% IF ms_aucommaphr %]
19
        <option selected="selected" value="au,phr">&nbsp;&nbsp;&nbsp;&nbsp; Author as phrase</option>
20
    [% ELSE %]
21
        <option value="au,phr">&nbsp;&nbsp;&nbsp;&nbsp; Author as phrase</option>
22
    [% END %]
23
    [% IF ms_cpn %]
24
        <option selected="selected" value="cpn">&nbsp;&nbsp;&nbsp;&nbsp; Corporate name</option>
25
    [% ELSE %]
26
        <option value="cpn">&nbsp;&nbsp;&nbsp;&nbsp; Corporate name</option>
27
    [% END %]
28
    [% IF ms_cfn %]
29
        <option selected="selected" value="cfn">&nbsp;&nbsp;&nbsp;&nbsp; Conference name</option>
30
    [% ELSE %]
31
        <option value="cfn">&nbsp;&nbsp;&nbsp;&nbsp; Conference name</option>
32
    [% END %]
33
    [% IF ms_cpncommaphr %]
34
        <option selected="selected" value="cpn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Corporate name as phrase</option>
35
    [% ELSE %]
36
        <option value="cpn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Corporate name as phrase</option>
37
    [% END %]
38
    [% IF ms_cfncommaphr %]
39
        <option selected="selected" value="cfn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Conference name as phrase</option>
40
    [% ELSE %]
41
        <option value="cfn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Conference name as phrase</option>
42
    [% END %]
43
    [% IF ms_pn %]
44
        <option selected="selected" value="pn">&nbsp;&nbsp;&nbsp;&nbsp; Personal name</option>
45
    [% ELSE %]
46
        <option value="pn">&nbsp;&nbsp;&nbsp;&nbsp; Personal name</option>
47
    [% END %]
48
    [% IF ms_pncommaphr %]
49
        <option selected="selected" value="pn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Personal name as phrase</option>
50
    [% ELSE %]
51
        <option value="pn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Personal name as phrase</option>
52
    [% END %]
53
    [% IF ms_ti %]
54
        <option selected="selected" value="ti">Title</option>
55
    [% ELSE %]
56
        <option value="ti">Title</option>
57
    [% END %]
58
    [% IF ms_ticommaphr %]
59
        <option selected="selected" value="ti,phr">&nbsp;&nbsp;&nbsp;&nbsp; Title as phrase</option>
60
    [% ELSE %]
61
        <option value="ti,phr">&nbsp;&nbsp;&nbsp;&nbsp; Title as phrase</option>
62
    [% END %]
63
    [% IF ms_ticommaphr %]
64
        <option selected="selected" value="ti,phr">&nbsp;&nbsp;&nbsp;&nbsp; Title as phrase</option>
65
    [% ELSE %]
66
        <option value="ti,phr">&nbsp;&nbsp;&nbsp;&nbsp; Title as phrase</option>
67
    [% END %]
68
    [% IF ms_se %]
69
        <option selected="seleced" value="se">&nbsp;&nbsp;&nbsp;&nbsp; Series title</option>
70
    [% ELSE %]
71
        <option value="se">&nbsp;&nbsp;&nbsp;&nbsp; Series title</option>
72
    [% END %]
73
    [% IF ms_su %]
74
        <option selected="selected" value="su">Subject</option>
75
    [% ELSE %]
76
        <option value="su">Subject</option>
77
    [% END %]
78
    [% IF ms_sucommaphr %]
79
        <option selected="selected" value="su,phr">&nbsp;&nbsp;&nbsp;&nbsp; Subject as phrase</option>
80
    [% ELSE %]
81
        <option value="su,phr">&nbsp;&nbsp;&nbsp;&nbsp; Subject as phrase</option>
82
    [% END %]
18
    [% IF ( expanded_options ) %]
83
    [% IF ( expanded_options ) %]
19
        <option value="su-br">&nbsp;&nbsp;&nbsp;&nbsp; Subject and broader terms</option>
84
        [% IF ms_sudashbr %]
20
        <option value="su-na">&nbsp;&nbsp;&nbsp;&nbsp; Subject and narrower terms</option>
85
            <option selected="selected" value="su-br">&nbsp;&nbsp;&nbsp;&nbsp; Subject and broader terms</option>
21
        <option value="su-rl">&nbsp;&nbsp;&nbsp;&nbsp; Subject and related terms</option>
86
        [% ELSE %]
87
            <option value="su-br">&nbsp;&nbsp;&nbsp;&nbsp; Subject and broader terms</option>
88
        [% END %]
89
        [% IF ms_sudashna %]
90
            <option selected="selected" value="su-na">&nbsp;&nbsp;&nbsp;&nbsp; Subject and narrower terms</option>
91
        [% ELSE %]
92
            <option value="su-na">&nbsp;&nbsp;&nbsp;&nbsp; Subject and narrower terms</option>
93
        [% END %]
94
        [% IF ms_sudashrl %]
95
            <option selected="selected" value="su-rl">&nbsp;&nbsp;&nbsp;&nbsp; Subject and related terms</option>
96
        [% ELSE %]
97
            <option value="su-rl">&nbsp;&nbsp;&nbsp;&nbsp; Subject and related terms</option>
98
        [% END %]
99
    [% END %]
100
    [% IF ms_bc %]
101
        <option selected="selected" value="bc">Barcode</option>
102
    [% ELSE %]
103
        <option value="bc">Barcode</option>
104
    [% END %]
105
    [% IF ms_location %]
106
        <option selected="selected" value="location">Shelving location</option>
107
    [% ELSE %]
108
        <option value="location">Shelving location</option>
22
    [% END %]
109
    [% END %]
23
    <option value="bc">Barcode</option>
24
    <option value="location">Shelving location</option>
25
    [% IF ( Koha.Preference('IntranetNumbersPreferPhrase') ) %]
110
    [% IF ( Koha.Preference('IntranetNumbersPreferPhrase') ) %]
26
    <option value="ident,phr">Standard number</option>
111
        [% IF ms_identcommaphr %]
112
            <option selected="selected" value="ident,phr">Standard number</option>
113
        [% ELSE %]
114
            <option value="ident,phr">Standard number</option>
115
        [% END %]
116
    [% ELSE %]
117
        [% IF ms_ident %]
118
            <option selected="selected" value="ident">Standard number</option>
119
        [% ELSE %]
120
            <option value="ident">Standard number</option>
121
        [% END %]
122
    [% END %]
123
    [% IF ms_nb %]
124
        <option selected="selected" value="nb">&nbsp;&nbsp;&nbsp;&nbsp; ISBN</option>
125
    [% ELSE %]
126
        <option value="nb">&nbsp;&nbsp;&nbsp;&nbsp; ISBN</option>
127
    [% END %]
128
    [% IF ms_ns %]
129
        <option selected="selected" value="ns">&nbsp;&nbsp;&nbsp;&nbsp; ISSN</option>
27
    [% ELSE %]
130
    [% ELSE %]
28
    <option value="ident">Standard number</option>
131
        <option value="ns">&nbsp;&nbsp;&nbsp;&nbsp; ISSN</option>
29
    [% END %]
132
    [% END %]
30
    <option value="nb">&nbsp;&nbsp;&nbsp;&nbsp; ISBN</option>
31
    <option value="ns">&nbsp;&nbsp;&nbsp;&nbsp; ISSN</option>
32
    [% IF ( Koha.Preference('IntranetNumbersPreferPhrase') ) %]
133
    [% IF ( Koha.Preference('IntranetNumbersPreferPhrase') ) %]
33
    <option value="callnum,phr">&nbsp;&nbsp;&nbsp;&nbsp; Call number</option>
134
        [% IF ms_callnumcommaphr %]
135
            <option selected="selected" value="callnum,phr">&nbsp;&nbsp;&nbsp;&nbsp; Call number</option>
136
        [% ELSE %]
137
            <option value="callnum,phr">&nbsp;&nbsp;&nbsp;&nbsp; Call number</option>
138
        [% END %]
139
    [% ELSE %]
140
        [% IF ms_callnum %]
141
            <option selected="selected" value="callnum">&nbsp;&nbsp;&nbsp;&nbsp; Call number</option>
142
        [% ELSE %]
143
            <option value="callnum">&nbsp;&nbsp;&nbsp;&nbsp; Call number</option>
144
        [% END %]
145
    [% END %]
146
    [% IF ms_lncommartrn %]
147
        <option selected="selected" value="ln,rtrn">Language</option>
34
    [% ELSE %]
148
    [% ELSE %]
35
    <option value="callnum">&nbsp;&nbsp;&nbsp;&nbsp; Call number</option>
149
        <option value="ln,rtrn">Language</option>
150
    [% END %]
151
    [% IF ms_nt %]
152
        <option selected="selected" value="nt">Notes/Comments</option>
153
    [% ELSE %]
154
        <option value="nt">Notes/Comments</option>
36
    [% END %]
155
    [% END %]
37
    <option value="ln,rtrn">Language</option>
38
    <option value="nt">Notes/Comments</option>
39
    [% IF (marcflavour != 'UNIMARC' ) %]
156
    [% IF (marcflavour != 'UNIMARC' ) %]
40
        <option value="curriculum">Curriculum</option>
157
        [% IF ms_curriculum %]
158
            <option selected="selected" value="curriculum">Curriculum</option>
159
        [% ELSE %]
160
            <option value="curriculum">Curriculum</option>
161
        [% END %]
162
    [% END %]
163
    [% IF ms_pb %]
164
        <option selected="selected" value="pb">Publisher</option>
165
    [% ELSE %]
166
        <option value="pb">Publisher</option>
167
    [% END %]
168
    [% IF ms_pl %]
169
        <option selected="selected" value="pl">Publisher location</option>
170
    [% ELSE %]
171
        <option value="pl">Publisher location</option>
41
    [% END %]
172
    [% END %]
42
    <option value="pb">Publisher</option>
43
    <option value="pl">Publisher location</option>
44
173
45
    [%# Use non-normalized st-year instead of st-numeric, %]
174
    [%# Use non-normalized st-year instead of st-numeric, %]
46
    [%# since pubdate can include 'u' to signify unknown %]
175
    [%# since pubdate can include 'u' to signify unknown %]
Lines 48-53 Link Here
48
    [%# http://www.loc.gov/marc/bibliographic/bd008a.html %]
177
    [%# http://www.loc.gov/marc/bibliographic/bd008a.html %]
49
    [%# This search is also for date ranges due to the %]
178
    [%# This search is also for date ranges due to the %]
50
    [%# special Zebra r=r CCL mapping for 'yr' %]
179
    [%# special Zebra r=r CCL mapping for 'yr' %]
51
    <option value="yr,st-year">Publication date (yyyy-yyyy)</option>
180
    [% IF ms_yrcommastdashyear %]
52
    <option value="acqdate,st-date-normalized">Acquisition date (yyyy-mm-dd)</option>
181
        <option selected="selected" value="yr,st-year">Publication date (yyyy-yyyy)</option>
182
    [% ELSE %]
183
        <option value="yr,st-year">Publication date (yyyy-yyyy)</option>
184
    [% END %]
185
    [% IF ms_acqdatecommastdashdatedashnormalized %]
186
        <option selected="selected" value="acqdate,st-date-normalized">Acquisition date (yyyy-mm-dd)</option>
187
    [% ELSE %]
188
        <option value="acqdate,st-date-normalized">Acquisition date (yyyy-mm-dd)</option>
189
    [% END %]
53
</select>
190
</select>
54
- 

Return to bug 19046