Bug 20945: (RM follow-up) Escape param_name too

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / includes / search_indexes.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
index 67725c6..95d3684 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
@@ -1,3 +1,4 @@
+[% USE Koha %]
 <select class="advsearch" name="idx">
     <option value="kw">Keyword</option>
     <option value="kw,phr">&nbsp;&nbsp;&nbsp;&nbsp; Keyword as phrase</option>
@@ -21,14 +22,14 @@
     [% END %]
     <option value="bc">Barcode</option>
     <option value="location">Shelving location</option>
-    [% IF (numbersphr) %]
+    [% IF ( Koha.Preference('IntranetNumbersPreferPhrase') ) %]
     <option value="sn,phr">Standard number</option>
     [% ELSE %]
     <option value="sn">Standard number</option>
     [% END %]
     <option value="nb">&nbsp;&nbsp;&nbsp;&nbsp; ISBN</option>
     <option value="ns">&nbsp;&nbsp;&nbsp;&nbsp; ISSN</option>
-    [% IF (numbersphr) %]
+    [% IF ( Koha.Preference('IntranetNumbersPreferPhrase') ) %]
     <option value="callnum,phr">&nbsp;&nbsp;&nbsp;&nbsp; Call number</option>
     [% ELSE %]
     <option value="callnum">&nbsp;&nbsp;&nbsp;&nbsp; Call number</option>
@@ -40,6 +41,13 @@
     [% END %]
     <option value="pb">Publisher</option>
     <option value="pl">Publisher location</option>
-    <option value="yr">Publication date (yyyy)</option>
-    <option value="acqdate">Acquisition date (yyyy-mm-dd)</option>
+
+    [%# Use non-normalized st-year instead of st-numeric, %]
+    [%# since pubdate can include 'u' to signify unknown %]
+    [%# dates. See "Legal Characters" at: %]
+    [%# http://www.loc.gov/marc/bibliographic/bd008a.html %]
+    [%# This search is also for date ranges due to the %]
+    [%# special Zebra r=r CCL mapping for 'yr' %]
+    <option value="yr,st-year">Publication date (yyyy-yyyy)</option>
+    <option value="acqdate,st-date-normalized">Acquisition date (yyyy-mm-dd)</option>
 </select>