Description
David Bourgault
2017-09-27 18:24:21 UTC
Created attachment 67412 [details] [review] Bug 19376 - Adds 655$a to Zebra facets Test plan: 0) Apply patch 1) Depending on your setup, copy the content of the following files to their counterparts in /etc/ (or where your Koha configuration files are) : <git>/etc/zebradb/biblios/etc/bib1.att <git>/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml <git>/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xsl <git>/etc/zebradb/marc_defs/marc21/biblios/record.abs <git>/etc/zebradb/ccl.properties 2) Edit a record to use the 655$a MARC tag, if you don't already 3) In the OPAC or Intranet, execute a search that would get a hit on the record you edited. > You should see the "Genre form" filter appear on the left 4) Click on the entry under "Genre form" > You should now only see the records with the matching 655$a tag. Comment on attachment 67412 [details] [review] Bug 19376 - Adds 655$a to Zebra facets Review of attachment 67412 [details] [review]: ----------------------------------------------------------------- ::: etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml @@ -777,5 @@ > - <target_index>Subject:p</target_index> > - </index_data_field> > - <!--record.abs line 189: melm 656$9 Koha-Auth-Number --> > - <index_subfields tag="656" subfields="9"> > - <target_index>Koha-Auth-Number:w</target_index> Why are you removing these lines? It will break search when using authorities with 655 (link build using $9) and libraries using more than the $a subfield. (http://www.loc.gov/marc/bibliographic/bd655.html) ::: etc/zebradb/marc_defs/marc21/biblios/record.abs @@ -198,2 @@ > melm 655$9 Koha-Auth-Number > -melm 655 Subject,Subject:p These changes are not necessary as grs-1 is deprecated, but will also be a regression if you want to search for sufields other than $a: http://www.loc.gov/marc/bibliographic/bd655.html ::: koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc @@ +15,4 @@ > [% IF facets_loo.type_label_Authors %]<span id="facet-authors">Authors</span>[% END %] > [% IF facets_loo.type_label_Titles %]<span id="facet-titles">Titles</span>[% END %] > [% IF facets_loo.type_label_Topics %]<span id="facet-topics">Topics</span>[% END %] > +[% IF facets_loo.type_label_GenreForm %]<span id="facet-genreform">Genre form</span>[% END %] I think it should probably be Genre/Form matching the detail page :) ::: koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc @@ +21,4 @@ > <li id="[% facets_loo.type_id %]"> > [% IF facets_loo.type_label_Authors %]<h5 id="facet-authors">Authors</h5>[% END %] > [% IF facets_loo.type_label_Titles %]<h5 id="facet-titles">Titles</h5>[% END %] > + [% IF facets_loo.type_label_GenreForm %]<h5 id="facet-genreform">Genre form</h5>[% END %] Same here as above: Genre/Form. Created attachment 68221 [details] [review] Bug 19376 - Follow-up on QA Reverted useless/bad modifications. I corrected configuration files and renamed 'Genre form' to 'Genre/Form' per Katrin's comment. The test plan is that same as before. Created attachment 68245 [details] [review] Bug 19376 - Follow-up on QA Reverted useless/bad modifications. Signed-off-by: Hugo Agud <hagud@orex.es> Signed-off-by: Hugo Agud <hagud@orex.es> Created attachment 68388 [details] [review] Bug 19376 - Adds 655$a to Zebra facets Test plan: 0) Apply patch 1) Depending on your setup, copy the content of the following files to their counterparts in /etc/ (or where your Koha configuration files are) : <git>/etc/zebradb/biblios/etc/bib1.att <git>/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml <git>/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xsl <git>/etc/zebradb/marc_defs/marc21/biblios/record.abs <git>/etc/zebradb/ccl.properties 2) Edit a record to use the 655$a MARC tag, if you don't already 3) In the OPAC or Intranet, execute a search that would get a hit on the record you edited. > You should see the "Genre form" filter appear on the left 4) Click on the entry under "Genre form" > You should now only see the records with the matching 655$a tag. Signed-off-by: Hugo Agud <hagud@orex.es> Created attachment 68389 [details] [review] Bug 19376 - Follow-up on QA Reverted useless/bad modifications. Signed-off-by: Hugo Agud <hagud@orex.es> Signed-off-by: Hugo Agud <hagud@orex.es> Hi David, this is almost there, sorry to bug you again: <index_subfields tag="655" subfields="a"> <target_index>Index-term-genre:w</target_index> <target_index>Index-term-genre:p</target_index> - <target_index>Subject:w</target_index> - <target_index>Subject:p</target_index> + <target_index>gen-for:w</target_index> + <target_index>gen-for:p</target_index> </index_subfields> These lines remove 655 from the general Subject index. Could you please keep it in the general index and only add your specific one? Otherwise I think this looks good! Created attachment 71978 [details] [review] Bug 19376 - Keep 655 in the general Subject index Added this bit back into /etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml:
> <target_index>Subject:w</target_index>
> <target_index>Subject:p</target_index>
Created attachment 84377 [details] [review] Rebased on current master. Signed-off-by: Hugo Agud <hagud@orex.es> Created attachment 84378 [details] [review] Bug 19376 - Adds 655$a to Zebra facets Rebased on current master. Created attachment 84379 [details] [review] Bug 19376 - Follow-up on QA Reverted useless/bad modifications. Signed-off-by: Hugo Agud <hagud@orex.es> Signed-off-by: Hugo Agud <hagud@orex.es> Created attachment 84380 [details] [review] Bug 19376 - Keep 655 in the general Subject index Created attachment 84383 [details] [review] Bug 19376 - Adds 655$a to Zebra facets Test plan: 0) Apply patch 1) Depending on your setup, copy the content of the following files to their counterparts in /etc/ (or where your Koha configuration files are) : <git>/etc/zebradb/biblios/etc/bib1.att <git>/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml <git>/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xsl <git>/etc/zebradb/marc_defs/marc21/biblios/record.abs <git>/etc/zebradb/ccl.properties 2) Edit a record to use the 655$a MARC tag, if you don't already 3) In the OPAC or Intranet, execute a search that would get a hit on the record you edited. > You should see the "Genre form" filter appear on the left 4) Click on the entry under "Genre form" > You should now only see the records with the matching 655$a tag. Signed-off-by: Hugo Agud <hagud@orex.es> Created attachment 84384 [details] [review] Bug 19376 - Follow-up on QA Reverted useless/bad modifications. Signed-off-by: Hugo Agud <hagud@orex.es> Signed-off-by: Hugo Agud <hagud@orex.es> Created attachment 84385 [details] [review] Bug 19376 - Keep 655 in the general Subject index Could not apply patch git bz apply 19376 Bug 19376 - Add 655$a (Genre/Form) to zebra search facets 84383 - Bug 19376 - Adds 655$a to Zebra facets 84384 - Bug 19376 - Follow-up on QA 84385 - Bug 19376 - Keep 655 in the general Subject index Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 19376 - Adds 655$a to Zebra facets Using index info to reconstruct a base tree... M C4/Koha.pm M C4/Search.pm M etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml M etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl M koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc M koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc Auto-merging etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl Auto-merging etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml Auto-merging C4/Search.pm Auto-merging C4/Koha.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 19376 - Adds 655$a to Zebra facets The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-19376---Adds-655a-to-Zebra-facets-gCwpao.patch |