From 1caef69d0a48f0acf871c1cabbf79fe8a64878e4 Mon Sep 17 00:00:00 2001 From: Mathieu Saby Date: Sat, 26 Jan 2013 20:14:10 +0100 Subject: [PATCH] Bug 8962: Changes to CCL.properties, bib1 for authorities, and templates This patch adds a new index Anywhere in ccl.properties in bib1 for authorities, and add "any word" option in intranet search for using this index. Default OPAC and intranet search in still using CCL "Any" index. Testing plan : In a Marc21 GRS-1 Koha : 1/ make some biblio searches without selecting any index (Koha will use "any" index) and note the results. Ex : search "fre", "eng", "book", "history", "history book" 2/ apply the 3 patches 3/ copy the 4 new record.abs files (Marc21 auth, Marc21 bib, Unimarc auth, Unimarc bib) from your sources to the directory used by Zebra configuration in your Koha instance 4/ launch rebuild_zebra.pl -b -r -x -v 5/ check that a new choice "Any word (all indexes)" is visible in advanced search. 6/ make the same searches as 1/ : you should see less results (detailed test plan in patchs 2 and 3) 7/ in Staff interface adavanced search, select "Any word (all indexes)" and make the same searches as 1/ : you should see the same results (maybe with a slight differences, because more notes fields are indexed in Marc21) In a UNIMARC GRS-1 Koha : same test Signed-off-by: Martin Renvoize Signed-off-by: Charles Farmer --- C4/Search.pm | 1 + etc/zebradb/authorities/etc/bib1.att | 2 ++ etc/zebradb/ccl.properties | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt | 4 ++++ 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/C4/Search.pm b/C4/Search.pm index f474271..3570db9 100644 --- a/C4/Search.pm +++ b/C4/Search.pm @@ -1080,6 +1080,7 @@ sub getIndexes{ 'allrecords', 'an', 'Any', + 'Anywhere', 'at', 'au', 'aub', diff --git a/etc/zebradb/authorities/etc/bib1.att b/etc/zebradb/authorities/etc/bib1.att index 3e0f5fb..1bf03fd 100644 --- a/etc/zebradb/authorities/etc/bib1.att +++ b/etc/zebradb/authorities/etc/bib1.att @@ -3,6 +3,8 @@ name bib1 reference Bib-1 att 1016 Any +att 1035 Anywhere + att 9000 authtype att 12 Local-Number att 9038 Descriptive-cataloging-rules diff --git a/etc/zebradb/ccl.properties b/etc/zebradb/ccl.properties index a1ea690..81b2e97 100644 --- a/etc/zebradb/ccl.properties +++ b/etc/zebradb/ccl.properties @@ -84,7 +84,7 @@ kw Any # support both 'any' and 'anywhere', if the origin uses 'Any' # (rather than 'Anywhere') it is asking the target to locate # the term only if it can do so relatively inexpensively. -#Anywhere 1=1035 +Anywhere 1=1035 #Author-name 1003 A personal or corporate author, 100, 110, 111, 400 # or a conference or meeting 410, 411, 700, 710, 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 95d3684..9cd7342 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc @@ -50,4 +50,5 @@ [%# special Zebra r=r CCL mapping for 'yr' %] + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt index 4463b66..8e02ef2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -309,6 +309,10 @@ [% ELSE %][% END %] [% IF ( ms_ss ) %] [% ELSE %][% END %] + [% IF ( ms_anywhere ) %] + [% ELSE %][% END %] + [% IF ( ms_anywherecommaphr ) %] + [% ELSE %][% END %] -- 2.7.4