The required match checks where broken by commit 53545ba739e1706da7f3e52c145f0f6c8bbfb18c of Bug 22046. _passes_required_checks takes the marc record data as parameter, but the refactoring done in bug 22046 results in the record id beeing passed instead.
Created attachment 96825 [details] [review] Bug 24348: Pass marc record to _passes_required_checks
Test plan: * Add record matching rule: Matching rule code: test Description: 001 and 003 Match threshold: 1000 Record type: Bibliografic record Match points: Search index: Control-number Score: 1000 Tag: 001 Subfields: Offset: Length: Normalization rule: none Required match checks: Source (incoming) record check field Tag: 003 Subfields: Offset: Length: Normalization rule: none Target (database) record check field Tag: 003 Subfields: Offset: Length: Normalization rule: none * Note the match rule identity number. * Stage a marc-file for import, for instance this one ftp://ftp.libris.kb.se/pub/export2/X/marc/X.20200104.marc sudo /usr/sbin/koha-shell -c "perl /home/vagrant/kohaclone/misc/stage_file.pl --match 4 --file 'X.20200104.marc' --format ISO2709 --comment 'test'" kohadev * Note the batch number and commit the file using the batch number: sudo /usr/sbin/koha-shell -c "perl /home/vagrant/kohaclone/misc/commit_file.pl --batch-number 1" kohadev * Again, stage the same marc-file for import: sudo /usr/sbin/koha-shell -c "perl /home/vagrant/kohaclone/misc/stage_file.pl --match 4 --file 'X.20200104.marc' --format ISO2709 --comment 'test'" kohadev * Note the number of records matched.
Created attachment 97993 [details] [review] Bug 24348: Pass marc record to _passes_required_checks Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Works as expected, signing off.. it would be great to see an accompanying regression test though.
Created attachment 98021 [details] [review] Bug 24348: Pass marc record to _passes_required_checks Test plan: * Add record matching rule: Matching rule code: test Description: 001 and 003 Match threshold: 1000 Record type: Bibliografic record Match points: Search index: Control-number Score: 1000 Tag: 001 Subfields: Offset: Length: Normalization rule: none Required match checks: Source (incoming) record check field Tag: 003 Subfields: Offset: Length: Normalization rule: none Target (database) record check field Tag: 003 Subfields: Offset: Length: Normalization rule: none * Note the match rule identity number. * Stage a marc-file for import, for instance this one ftp://ftp.libris.kb.se/pub/export2/X/marc/X.20200104.marc sudo /usr/sbin/koha-shell -c "perl /home/vagrant/kohaclone/misc/stage_file.pl --match 4 --file 'X.20200104.marc' --format ISO2709 --comment 'test'" kohadev * Note the batch number and commit the file using the batch number: sudo /usr/sbin/koha-shell -c "perl /home/vagrant/kohaclone/misc/commit_file.pl --batch-number 1" kohadev * Again, stage the same marc-file for import: sudo /usr/sbin/koha-shell -c "perl /home/vagrant/kohaclone/misc/stage_file.pl --match 4 --file 'X.20200104.marc' --format ISO2709 --comment 'test'" kohadev * Note the number of records matched. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> I did not test, trusting author and SO. Changes make perfect sense to me.
Nice work everyone! Pushed to master for 20.05
Pushed to 19.11.x branch for 19.11.03
backported to 19.05.x for 19.05.08
Dependency not in 18.11.x series, not backporting.