Created attachment 114503 [details] [review] Bug 27266: Move GetMarcAuthors to Koha namespace This patch moves C4::Biblio::GetMarcAuthors to Koha::Biblio->get_marc_authors. This is so get_marc_authors can be used in templates and notices. To test: 1. Find a record that has an author in the added entry field (700-720). 2. Add the record to the cart and a list. 3. View your cart and click 'more details'. Confirm authors show as normal. 4. Click 'send' and confirm the email sent shows the authors as normal. 5. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. 6. Set the OPACXSLTDetailsDisplay system preference to empty (for no xslt) 7. Log in to the OPAC. Find the record and add it to the cart and a list 8. View the cart and click 'more details'. Confirm authors show as normal. 9. Click 'send' and confirm the email sent shows the authors as normal. 10. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. 11. View the record detail page and confirm the authors show as normal. 12. Confirm tests pass: - t/Biblio.t - t/db_dependent/Koha/Biblio.t Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ)
Created attachment 114580 [details] [review] Bug 27266: Move GetMarcAuthors to Koha namespace This patch moves C4::Biblio::GetMarcAuthors to Koha::Biblio->get_authors_from_MARC. This is so the method can be used in templates and notices. To test: 1. Find a record that has an author in the added entry field (700-720). 2. Add the record to the cart and a list. 3. View your cart and click 'more details'. Confirm authors show as normal. 4. Click 'send' and confirm the email sent shows the authors as normal. 5. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. 6. Set the OPACXSLTDetailsDisplay system preference to empty (for no xslt) 7. Log in to the OPAC. Find the record and add it to the cart and a list 8. View the cart and click 'more details'. Confirm authors show as normal. 9. Click 'send' and confirm the email sent shows the authors as normal. 10. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. 11. View the record detail page and confirm the authors show as normal. 12. Confirm tests pass: - t/Biblio.t - t/db_dependent/Koha/Biblio.t Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ)
Created attachment 117239 [details] [review] Bug 27266: Move GetMarcAuthors to Koha namespace This patch moves C4::Biblio::GetMarcAuthors to Koha::Biblio->get_authors_from_MARC. This is so the method can be used in templates and notices. To test: 1. Find a record that has an author in the added entry field (700-720). 2. Add the record to the cart and a list. 3. View your cart and click 'more details'. Confirm authors show as normal. 4. Click 'send' and confirm the email sent shows the authors as normal. 5. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. 6. Set the OPACXSLTDetailsDisplay system preference to empty (for no xslt) 7. Log in to the OPAC. Find the record and add it to the cart and a list 8. View the cart and click 'more details'. Confirm authors show as normal. 9. Click 'send' and confirm the email sent shows the authors as normal. 10. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. 11. View the record detail page and confirm the authors show as normal. 12. Confirm tests pass: - t/Biblio.t - t/db_dependent/Koha/Biblio.t Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) Signed-off-by: David Nind <david@davidnind.com>
Notes from testing with koha-testing-docker: - I couldn't send email (it comes up with an error message when you click on the send buttons - problem sending email). I didn't have this issue when testing bug 3150, so I applied that and everything worked as expected with the test plan. - To review the email I copied the HTML from the database (koha-mysql kohadev, select * from message_queue;) and saved it as an HTML file.
Sorry, this no longer applies.
Created attachment 118311 [details] [review] Bug 27266: Move GetMarcAuthors to Koha namespace This patch moves C4::Biblio::GetMarcAuthors to Koha::Biblio->get_authors_from_MARC. This is so the method can be used in templates and notices. To test: 1. Find a record that has an author in the added entry field (700-720). 2. Add the record to the cart and a list. 3. View your cart and click 'more details'. Confirm authors show as normal. 4. Click 'send' and confirm the email sent shows the authors as normal. 5. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. 6. Set the OPACXSLTDetailsDisplay system preference to empty (for no xslt) 7. Log in to the OPAC. Find the record and add it to the cart and a list 8. View the cart and click 'more details'. Confirm authors show as normal. 9. Click 'send' and confirm the email sent shows the authors as normal. 10. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. 11. View the record detail page and confirm the authors show as normal. 12. Confirm tests pass: - t/Biblio.t - t/db_dependent/Koha/Biblio.t Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Created attachment 118312 [details] [review] Bug 27266: Move GetMarcAuthors to Koha namespace This patch moves C4::Biblio::GetMarcAuthors to Koha::Biblio->get_authors_from_MARC. This is so the method can be used in templates and notices. To test: 1. Find a record that has an author in the added entry field (700-720). 2. Add the record to the cart and a list. 3. View your cart and click 'more details'. Confirm authors show as normal. 4. Click 'send' and confirm the email sent shows the authors as normal. 5. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. 6. Set the OPACXSLTDetailsDisplay system preference to empty (for no xslt) 7. Log in to the OPAC. Find the record and add it to the cart and a list 8. View the cart and click 'more details'. Confirm authors show as normal. 9. Click 'send' and confirm the email sent shows the authors as normal. 10. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. 11. View the record detail page and confirm the authors show as normal. 12. Confirm tests pass: - t/Biblio.t - t/db_dependent/Koha/Biblio.t Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Rebased
Tests pass, QA scripts pass and the code looks reasonable. I'm not entirely sure about the method name.. we now have: Koha::Biblio->get_marc_notes; and Koha::Biblio->get_authors_from_MARC; For consistency, I think I'd prefer this patch to introduce Koha::Biblio->get_marc_authors; But... I think we can leave that decision to the RM.. so Passing QA :)
(In reply to Martin Renvoize from comment #9) > Tests pass, QA scripts pass and the code looks reasonable. > > I'm not entirely sure about the method name.. we now have: > > Koha::Biblio->get_marc_notes; > > and > > Koha::Biblio->get_authors_from_MARC; > > For consistency, I think I'd prefer this patch to introduce > > Koha::Biblio->get_marc_authors; > > But... I think we can leave that decision to the RM.. so Passing QA :) I would also prefer get_marc_authors.
Created attachment 123017 [details] [review] Bug 27266: Move GetMarcAuthors to Koha namespace This patch moves C4::Biblio::GetMarcAuthors to Koha::Biblio->get_authors_from_MARC. This is so the method can be used in templates and notices. To test: 1. Find a record that has an author in the added entry field (700-720). 2. Add the record to the cart and a list. 3. View your cart and click 'more details'. Confirm authors show as normal. 4. Click 'send' and confirm the email sent shows the authors as normal. 5. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. 6. Set the OPACXSLTDetailsDisplay system preference to empty (for no xslt) 7. Log in to the OPAC. Find the record and add it to the cart and a list 8. View the cart and click 'more details'. Confirm authors show as normal. 9. Click 'send' and confirm the email sent shows the authors as normal. 10. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. 11. View the record detail page and confirm the authors show as normal. 12. Confirm tests pass: - t/Biblio.t - t/db_dependent/Koha/Biblio.t Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Created attachment 123018 [details] [review] Bug 27266: (QA follow-up) Rename to get_marc_authors
Created attachment 123019 [details] [review] Bug 27266: (follow-up) Remove instances of GetMarcAuthors
Created attachment 123026 [details] [review] Bug 27266: Move GetMarcAuthors to Koha namespace This patch moves C4::Biblio::GetMarcAuthors to Koha::Biblio->get_authors_from_MARC. This is so the method can be used in templates and notices. To test: 1. Find a record that has an author in the added entry field (700-720). 2. Add the record to the cart and a list. 3. View your cart and click 'more details'. Confirm authors show as normal. 4. Click 'send' and confirm the email sent shows the authors as normal. 5. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. 6. Set the OPACXSLTDetailsDisplay system preference to empty (for no xslt) 7. Log in to the OPAC. Find the record and add it to the cart and a list 8. View the cart and click 'more details'. Confirm authors show as normal. 9. Click 'send' and confirm the email sent shows the authors as normal. 10. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. 11. View the record detail page and confirm the authors show as normal. 12. Confirm tests pass: - t/Biblio.t - t/db_dependent/Koha/Biblio.t Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Created attachment 123027 [details] [review] Bug 27266: (QA follow-up) Rename to get_marc_authors Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Created attachment 123028 [details] [review] Bug 27266: (follow-up) Remove instances of GetMarcAuthors Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Comment on attachment 123026 [details] [review] Bug 27266: Move GetMarcAuthors to Koha namespace Review of attachment 123026 [details] [review]: ----------------------------------------------------------------- ::: Koha/Biblio.pm @@ +870,5 @@ > + # tagslib useful only for UNIMARC author responsibilities > + my $tagslib; > + if ( $marcflavour eq "UNIMARC" ) { > + # FIXME : we don't have the framework available, we take the default framework. May be buggy on some setups, will be usually correct. > + $tagslib = C4::Biblio::GetMarcStructure( 1, '', { unsafe => 1 }); I wonder if we aught to fix the FIXME here? $tagslib = C4::Biblio::GetMarcStructure( 1, $self->frameworkcode, { unsafe => 1 });
(In reply to Martin Renvoize from comment #17) > Comment on attachment 123026 [details] [review] [review] > Bug 27266: Move GetMarcAuthors to Koha namespace > > Review of attachment 123026 [details] [review] [review]: > ----------------------------------------------------------------- > > ::: Koha/Biblio.pm > @@ +870,5 @@ > > + # tagslib useful only for UNIMARC author responsibilities > > + my $tagslib; > > + if ( $marcflavour eq "UNIMARC" ) { > > + # FIXME : we don't have the framework available, we take the default framework. May be buggy on some setups, will be usually correct. > > + $tagslib = C4::Biblio::GetMarcStructure( 1, '', { unsafe => 1 }); > > I wonder if we aught to fix the FIXME here? > > $tagslib = C4::Biblio::GetMarcStructure( 1, $self->frameworkcode, { unsafe > => 1 }); True, may as well. Follow-up on it's way.
Created attachment 123067 [details] [review] Bug 27266: (follow-up) Using biblio frameworkcode to get rid of FIXME
Created attachment 125440 [details] [review] Bug 27266: Move GetMarcAuthors to Koha namespace This patch moves C4::Biblio::GetMarcAuthors to Koha::Biblio->get_authors_from_MARC. This is so the method can be used in templates and notices. To test: 1. Find a record that has an author in the added entry field (700-720). 2. Add the record to the cart and a list. 3. View your cart and click 'more details'. Confirm authors show as normal. 4. Click 'send' and confirm the email sent shows the authors as normal. 5. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. 6. Set the OPACXSLTDetailsDisplay system preference to empty (for no xslt) 7. Log in to the OPAC. Find the record and add it to the cart and a list 8. View the cart and click 'more details'. Confirm authors show as normal. 9. Click 'send' and confirm the email sent shows the authors as normal. 10. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. 11. View the record detail page and confirm the authors show as normal. 12. Confirm tests pass: - t/Biblio.t - t/db_dependent/Koha/Biblio.t Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Created attachment 125441 [details] [review] Bug 27266: (QA follow-up) Rename to get_marc_authors Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Created attachment 125442 [details] [review] Bug 27266: (follow-up) Remove instances of GetMarcAuthors Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Created attachment 125443 [details] [review] Bug 27266: (follow-up) Using biblio frameworkcode to get rid of FIXME
Created attachment 125444 [details] [review] Bug 27266: (follow-up) Show MARC author notes
Created attachment 125465 [details] [review] Bug 27266: Move GetMarcAuthors to Koha namespace This patch moves C4::Biblio::GetMarcAuthors to Koha::Biblio->get_authors_from_MARC. This is so the method can be used in templates and notices. To test: 1. Find a record that has an author in the added entry field (700-720). 2. Add the record to the cart and a list. 3. View your cart and click 'more details'. Confirm authors show as normal. 4. Click 'send' and confirm the email sent shows the authors as normal. 5. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. xslt) 6. Log in to the OPAC. Find the record and add it to the cart and a list 7. View the cart and click 'more details'. Confirm authors show as normal. 8. Click 'send' and confirm the email sent shows the authors as normal. 9. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. 10. Confirm tests pass: - t/Biblio.t - t/db_dependent/Koha/Biblio.t Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Created attachment 125466 [details] [review] Bug 27266: (QA follow-up) Rename to get_marc_authors Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Created attachment 125467 [details] [review] Bug 27266: (follow-up) Remove instances of GetMarcAuthors Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Created attachment 125468 [details] [review] Bug 27266: (follow-up) Using biblio frameworkcode to get rid of FIXME
Created attachment 125469 [details] [review] Bug 27266: (follow-up) Remove get_marc_authors from opac-detail There's no way to use 'no' XSLT now, so don't need to use this to show authors on the detail page.
Created attachment 125719 [details] [review] Bug 27266: Move GetMarcAuthors to Koha namespace This patch moves C4::Biblio::GetMarcAuthors to Koha::Biblio->get_authors_from_MARC. This is so the method can be used in templates and notices. To test: 1. Find a record that has an author in the added entry field (700-720). 2. Add the record to the cart and a list. 3. View your cart and click 'more details'. Confirm authors show as normal. 4. Click 'send' and confirm the email sent shows the authors as normal. 5. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. xslt) 6. Log in to the OPAC. Find the record and add it to the cart and a list 7. View the cart and click 'more details'. Confirm authors show as normal. 8. Click 'send' and confirm the email sent shows the authors as normal. 9. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. 10. Confirm tests pass: - t/Biblio.t - t/db_dependent/Koha/Biblio.t Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: David Nind <david@davidnind.com>
Created attachment 125720 [details] [review] Bug 27266: (QA follow-up) Rename to get_marc_authors Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: David Nind <david@davidnind.com>
Created attachment 125721 [details] [review] Bug 27266: (follow-up) Remove instances of GetMarcAuthors Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: David Nind <david@davidnind.com>
Created attachment 125722 [details] [review] Bug 27266: (follow-up) Using biblio frameworkcode to get rid of FIXME Signed-off-by: David Nind <david@davidnind.com>
Created attachment 125723 [details] [review] Bug 27266: (follow-up) Remove get_marc_authors from opac-detail There's no way to use 'no' XSLT now, so don't need to use this to show authors on the detail page. Signed-off-by: David Nind <david@davidnind.com>
Created attachment 126539 [details] [review] Bug 27266: Move GetMarcAuthors to Koha namespace This patch moves C4::Biblio::GetMarcAuthors to Koha::Biblio->get_authors_from_MARC. This is so the method can be used in templates and notices. To test: 1. Find a record that has an author in the added entry field (700-720). 2. Add the record to the cart and a list. 3. View your cart and click 'more details'. Confirm authors show as normal. 4. Click 'send' and confirm the email sent shows the authors as normal. 5. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. xslt) 6. Log in to the OPAC. Find the record and add it to the cart and a list 7. View the cart and click 'more details'. Confirm authors show as normal. 8. Click 'send' and confirm the email sent shows the authors as normal. 9. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. 10. Confirm tests pass: - t/Biblio.t - t/db_dependent/Koha/Biblio.t Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: David Nind <david@davidnind.com>
Created attachment 126540 [details] [review] Bug 27266: (QA follow-up) Rename to get_marc_authors Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: David Nind <david@davidnind.com>
Created attachment 126541 [details] [review] Bug 27266: (follow-up) Remove instances of GetMarcAuthors Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: David Nind <david@davidnind.com>
Created attachment 126542 [details] [review] Bug 27266: (follow-up) Using biblio frameworkcode to get rid of FIXME Signed-off-by: David Nind <david@davidnind.com>
Created attachment 126543 [details] [review] Bug 27266: (follow-up) Remove get_marc_authors from opac-detail There's no way to use 'no' XSLT now, so don't need to use this to show authors on the detail page. Signed-off-by: David Nind <david@davidnind.com>
Looking here
Created attachment 127330 [details] [review] Bug 27266: Move GetMarcAuthors to Koha namespace This patch moves C4::Biblio::GetMarcAuthors to Koha::Biblio->get_authors_from_MARC. This is so the method can be used in templates and notices. To test: 1. Find a record that has an author in the added entry field (700-720). 2. Add the record to the cart and a list. 3. View your cart and click 'more details'. Confirm authors show as normal. 4. Click 'send' and confirm the email sent shows the authors as normal. 5. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. xslt) 6. Log in to the OPAC. Find the record and add it to the cart and a list 7. View the cart and click 'more details'. Confirm authors show as normal. 8. Click 'send' and confirm the email sent shows the authors as normal. 9. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. 10. Confirm tests pass: - t/Biblio.t - t/db_dependent/Koha/Biblio.t Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 127331 [details] [review] Bug 27266: (QA follow-up) Rename to get_marc_authors Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 127332 [details] [review] Bug 27266: (follow-up) Remove instances of GetMarcAuthors Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 127333 [details] [review] Bug 27266: (follow-up) Using biblio frameworkcode to get rid of FIXME Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 127334 [details] [review] Bug 27266: (follow-up) Remove get_marc_authors from opac-detail There's no way to use 'no' XSLT now, so don't need to use this to show authors on the detail page. Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 127335 [details] [review] Bug 27266: (QA follow-up) Remove GetBiblioData from basket scripts We are adding (or already doing) a Koha::Biblios->find, so we should get rid of GetBiblioData, fetching the same data. It returned a few extra columns, but unused here: $dat->{bnotes}, $dat->{bi_notforloan} Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 127336 [details] [review] Bug 27266: (QA follow-up) Indentation in opac-sendshelf Minimal fix to improve bad indentation a bit, moving to 2 spaces. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 127337 [details] [review] Bug 27266: (QA follow-up) Remove GetBiblioData from sendshelf too Applies to opac and intranet script. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 127340 [details] [review] Bug 27266: (QA follow-up) Remove GetBiblioData from basket scripts We are adding (or already doing) a Koha::Biblios->find, so we should get rid of GetBiblioData, fetching the same data. It returned a few extra columns, but unused here: $dat->{bnotes}, $dat->{bi_notforloan} Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 127341 [details] [review] Bug 27266: (QA follow-up) Indentation in opac-sendshelf Minimal fix to improve bad indentation a bit, moving to 2 spaces. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 127342 [details] [review] Bug 27266: (QA follow-up) Remove GetBiblioData from sendshelf too Applies to opac and intranet script. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
I get Applying: Bug 27266: (follow-up) Remove get_marc_authors from opac-detail error: sha1 information is lacking or useless (opac/opac-detail.pl). error: could not build fake ancestor Patch failed at 0001 Bug 27266: (follow-up) Remove get_marc_authors from opac-detail Patch doesn't apply
Applying: Bug 27266: Move GetMarcAuthors to Koha namespace Using index info to reconstruct a base tree... M C4/Biblio.pm M opac/opac-detail.pl Falling back to patching base and 3-way merge... Auto-merging opac/opac-detail.pl Auto-merging C4/Biblio.pm Applying: Bug 27266: (QA follow-up) Rename to get_marc_authors Applying: Bug 27266: (follow-up) Remove instances of GetMarcAuthors Applying: Bug 27266: (follow-up) Using biblio frameworkcode to get rid of FIXME Applying: Bug 27266: (follow-up) Remove get_marc_authors from opac-detail Using index info to reconstruct a base tree... M opac/opac-detail.pl Falling back to patching base and 3-way merge... Auto-merging opac/opac-detail.pl Applying: Bug 27266: (QA follow-up) Remove GetBiblioData from basket scripts Applying: Bug 27266: (QA follow-up) Indentation in opac-sendshelf Applying: Bug 27266: (QA follow-up) Remove GetBiblioData from sendshelf too
Wait. I am on the wrong branch ;)
Makes no difference: Applying: Bug 27266: Move GetMarcAuthors to Koha namespace Using index info to reconstruct a base tree... M C4/Biblio.pm M opac/opac-detail.pl Falling back to patching base and 3-way merge... Auto-merging opac/opac-detail.pl Auto-merging C4/Biblio.pm Applying: Bug 27266: (QA follow-up) Rename to get_marc_authors Applying: Bug 27266: (follow-up) Remove instances of GetMarcAuthors Applying: Bug 27266: (follow-up) Using biblio frameworkcode to get rid of FIXME Applying: Bug 27266: (follow-up) Remove get_marc_authors from opac-detail Using index info to reconstruct a base tree... M opac/opac-detail.pl Falling back to patching base and 3-way merge... Auto-merging opac/opac-detail.pl Applying: Bug 27266: (QA follow-up) Remove GetBiblioData from basket scripts Applying: Bug 27266: (QA follow-up) Indentation in opac-sendshelf Applying: Bug 27266: (QA follow-up) Remove GetBiblioData from sendshelf too
Created attachment 127561 [details] [review] Bug 27266: Move GetMarcAuthors to Koha namespace This patch moves C4::Biblio::GetMarcAuthors to Koha::Biblio->get_authors_from_MARC. This is so the method can be used in templates and notices. To test: 1. Find a record that has an author in the added entry field (700-720). 2. Add the record to the cart and a list. 3. View your cart and click 'more details'. Confirm authors show as normal. 4. Click 'send' and confirm the email sent shows the authors as normal. 5. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. xslt) 6. Log in to the OPAC. Find the record and add it to the cart and a list 7. View the cart and click 'more details'. Confirm authors show as normal. 8. Click 'send' and confirm the email sent shows the authors as normal. 9. Go to the list you added the record to and click 'send list'. Confirm the email sent shows the authors as normal. 10. Confirm tests pass: - t/Biblio.t - t/db_dependent/Koha/Biblio.t Sponsored-by: Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 127562 [details] [review] Bug 27266: (QA follow-up) Rename to get_marc_authors Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 127563 [details] [review] Bug 27266: (follow-up) Remove instances of GetMarcAuthors Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 127564 [details] [review] Bug 27266: (follow-up) Using biblio frameworkcode to get rid of FIXME Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 127565 [details] [review] Bug 27266: (follow-up) Remove get_marc_authors from opac-detail There's no way to use 'no' XSLT now, so don't need to use this to show authors on the detail page. Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 127566 [details] [review] Bug 27266: (QA follow-up) Remove GetBiblioData from basket scripts We are adding (or already doing) a Koha::Biblios->find, so we should get rid of GetBiblioData, fetching the same data. It returned a few extra columns, but unused here: $dat->{bnotes}, $dat->{bi_notforloan} Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 127567 [details] [review] Bug 27266: (QA follow-up) Indentation in opac-sendshelf Minimal fix to improve bad indentation a bit, moving to 2 spaces. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 127568 [details] [review] Bug 27266: (QA follow-up) Remove GetBiblioData from sendshelf too Applies to opac and intranet script. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Please have a look at Bug 29690. We need to catch invalid metadata record so get_marc_authors() is concerned. I'd like QA to confirm this is the correct way to implement.
(In reply to Fridolin Somers from comment #64) > Please have a look at Bug 29690. > We need to catch invalid metadata record so get_marc_authors() is concerned. > I'd like QA to confirm this is the correct way to implement. Since this one is already passed-QA I push it and will amend Bug 29690 for get_marc_authors().
Pushed to master for 22.05, thanks to everybody involved [U+1F984]