In order to realize the goals in bug 6536, this patch first moves the z3950 search code in acquisition and cataloging to one place, the Breeding module.
Created attachment 13589 [details] [review] Patch for 9105 As a first step in realizing the goals of report 6536 (Z3950 Search improvements), this patch moves identical code in acquisition and cataloging to module level. A followup deals with formatting. Note that this patch should not change any behavior.
Created attachment 13590 [details] [review] Followup for 9105 Remove some debug warnings, fix indentation
TEST PLAN: Just check some z3950 searches without this patch and with this patch. There should be no behavior changes. Note that the patch touches two places: Cataloging/Z3950 Search and Acquisition, open a basket, add a line with From an external source.
Created attachment 13593 [details] [review] Bug 9105: Move Z3950 search code to Breeding module As a first step in realizing the goals of report 6536 (Z3950 Search improvements), this patch moves identical code in acquisition and cataloging to module level. A followup deals with formatting. Note that this patch should not change any behavior. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> I did not find any regression
Created attachment 13594 [details] [review] Bug 9105: Housekeeping followup Remove some debug warnings, fix indentation Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Great work Marcel! Another SO is welcomed :)
Created attachment 13625 [details] [review] Second (housekeeping) patch Removing some unused variables. Restoring timeout parameter that was only used in cataloging. Small adjustment at the end of the while loop with template vars. Discovered while doing so, that the paging feature needs some further corrections; will propose a patch under a separate report.
Comment on attachment 13625 [details] [review] Second (housekeeping) patch Still see something. Please wait..
Created attachment 13626 [details] [review] Bug 9105: Second housekeeping followup Removing some unused variables. Restoring timeout parameter that was only used in cataloging. Restoring copyrightdate and editionstatement in row data for template. Small adjustment at the end of the while loop with template vars. Discovered while doing so, that the paging feature needs some further corrections; will propose a patch under a separate report.
(In reply to comment #6) > Another SO is welcomed :) Thanks Jonathan for your signing off as Unimarc user. Although moving the code now not really relates to marc flavour, another marc21 signoff is welcome. For future QA it would be better not to squash the three patches.
Created attachment 13936 [details] [review] [SIGNED-OFF] Bug 9105: Move Z3950 search code to Breeding module As a first step in realizing the goals of report 6536 (Z3950 Search improvements), this patch moves identical code in acquisition and cataloging to module level. A followup deals with formatting. Note that this patch should not change any behavior. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> I did not find any regression Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Created attachment 13937 [details] [review] [SIGNED-OFF] Bug 9105: Housekeeping followup Remove some debug warnings, fix indentation Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Created attachment 13938 [details] [review] [SIGNED-OFF] Bug 9105: Second housekeeping followup Removing some unused variables. Restoring timeout parameter that was only used in cataloging. Restoring copyrightdate and editionstatement in row data for template. Small adjustment at the end of the while loop with template vars. Discovered while doing so, that the paging feature needs some further corrections; will propose a patch under a separate report. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
MARC21 user here, looks good to me!
QA comment: * not really an enhancement, changing to "normal" bugfix * koha-qa.pl is OK * I've grepped the moved subs and checked there is a use C4::Breeding instead of C4::Z3950 passed QA
Created attachment 14230 [details] [review] Bug 9105: Move Z3950 search code to Breeding module As a first step in realizing the goals of report 6536 (Z3950 Search improvements), this patch moves identical code in acquisition and cataloging to module level. A followup deals with formatting. Note that this patch should not change any behavior. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> I did not find any regression Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Created attachment 14231 [details] [review] Bug 9105: Housekeeping followup Remove some debug warnings, fix indentation Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Created attachment 14232 [details] [review] Bug 9105: Second housekeeping followup Removing some unused variables. Restoring timeout parameter that was only used in cataloging. Restoring copyrightdate and editionstatement in row data for template. Small adjustment at the end of the while loop with template vars. Discovered while doing so, that the paging feature needs some further corrections; will propose a patch under a separate report. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
This patch has been pushed to master. There is, however, a problem: we do not destroy the ZOOM connection or recordset. A follow-up destroying those would be greatly appreciated.
(In reply to comment #19) > This patch has been pushed to master. > > There is, however, a problem: we do not destroy the ZOOM connection or > recordset. A follow-up destroying those would be greatly appreciated. Patch forthcoming.
Created attachment 14450 [details] [review] Followup for closing connections Housekeeping: close the results sets and connections from Z3950 searches.
Created attachment 14701 [details] [review] [SIGNED-OFF] 9105: Followup for closing Zoom connections Housekeeping: close the results sets and connections from Z3950 searches. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Created attachment 15222 [details] [review] 9105: Followup for closing Zoom connections Housekeeping: close the results sets and connections from Z3950 searches. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> No regression found, all tests and QA script pass.
This patch has been pushed to master.
*** Bug 8886 has been marked as a duplicate of this bug. ***