Bugzilla – Attachment 109963 Details for
Bug 14957
Write protecting MARC fields based on source of import
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14957: Remove usage of deleted Koha::MarcMergeRulesModules
Bug-14957-Remove-usage-of-deleted-KohaMarcMergeRul.patch (text/plain), 12.85 KB, created by
David Gustafsson
on 2020-09-11 15:33:47 UTC
(
hide
)
Description:
Bug 14957: Remove usage of deleted Koha::MarcMergeRulesModules
Filename:
MIME Type:
Creator:
David Gustafsson
Created:
2020-09-11 15:33:47 UTC
Size:
12.85 KB
patch
obsolete
>From 11890110a9fef213ecb1d36f2ea52ab8cfecc017 Mon Sep 17 00:00:00 2001 >From: David Gustafsson <david.gustafsson@ub.gu.se> >Date: Tue, 3 Mar 2020 14:12:56 +0100 >Subject: [PATCH] Bug 14957: Remove usage of deleted > Koha::MarcMergeRulesModules > >Signed-off-by: David Nind <david@davidnind.com> >--- > Koha/MarcMergeRules.pm | 2 +- > t/db_dependent/Biblio/MarcMergeRules.t | 53 ++++++++++++-------------- > 2 files changed, 25 insertions(+), 30 deletions(-) > >diff --git a/Koha/MarcMergeRules.pm b/Koha/MarcMergeRules.pm >index 3d86ee6107..555402ff22 100644 >--- a/Koha/MarcMergeRules.pm >+++ b/Koha/MarcMergeRules.pm >@@ -301,7 +301,7 @@ Override C<find_or_create> to clear marc merge rules cache. > sub find_or_create { > my $self = shift @_; > $self->_clear_caches(); >- $self->SUPER::find_or_create(@_); >+ return $self->SUPER::find_or_create(@_); > } > > =head2 update >diff --git a/t/db_dependent/Biblio/MarcMergeRules.t b/t/db_dependent/Biblio/MarcMergeRules.t >index 106b9c1be5..cf178063d8 100755 >--- a/t/db_dependent/Biblio/MarcMergeRules.t >+++ b/t/db_dependent/Biblio/MarcMergeRules.t >@@ -28,7 +28,6 @@ use Test::More tests => 23; > use Test::MockModule; > > use Koha::MarcMergeRules; >-use Koha::MarcMergeRulesModules; > > use t::lib::Mocks; > >@@ -45,10 +44,6 @@ $orig_record->append_fields ( > MARC::Field->new('500', '','', 'a' => 'One bottle of beer in the fridge'), > ); > >-my $modules_rs = Koha::MarcMergeRulesModules->search(undef, { order_by => { -desc => 'specificity' } }); >-my @modules; >-push @modules, $modules_rs->next; >- > my $incoming_record = MARC::Record->new(); > $incoming_record->append_fields( > MARC::Field->new('250', '', '', 'a' => '256 bottles of beer on the wall'), # Unchanged >@@ -63,7 +58,7 @@ $incoming_record->append_fields( > subtest 'Record fields has been overwritten when no merge rules are defined' => sub { > plan tests => 4; > >- my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { $modules[0]->name => 'test' }); >+ my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { 'source' => 'test' }); > > my @all_fields = $merged_record->fields(); > >@@ -86,7 +81,7 @@ subtest 'Record fields has been overwritten when no merge rules are defined' => > > my $rule = Koha::MarcMergeRules->find_or_create({ > tag => '*', >- module => $modules[0]->name, >+ module => 'source', > filter => '*', > add => 0, > append => 0, >@@ -97,7 +92,7 @@ my $rule = Koha::MarcMergeRules->find_or_create({ > subtest 'Record fields has been protected when matched merge all rule operations are set to "0"' => sub { > plan tests => 3; > >- my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { $modules[0]->name => 'test' }); >+ my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { 'source' => 'test' }); > > my @all_fields = $merged_record->fields(); > cmp_ok(scalar @all_fields, '==', 3, "Record has the expected number of fields"); >@@ -127,7 +122,7 @@ subtest 'Only new fields has been added when add = 1, append = 0, remove = 0, de > ); > $rule->store(); > >- my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { $modules[0]->name => 'test' }); >+ my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { 'source' => 'test' }); > > my @all_fields = $merged_record->fields(); > cmp_ok(scalar @all_fields, '==', 5, "Record has the expected number of fields"); >@@ -164,7 +159,7 @@ subtest 'Only appended fields has been added when add = 0, append = 1, remove = > ); > $rule->store(); > >- my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { $modules[0]->name => 'test' }); >+ my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { 'source' => 'test' }); > > my @all_fields = $merged_record->fields(); > cmp_ok(scalar @all_fields, '==', 4, "Record has the expected number of fields"); >@@ -196,7 +191,7 @@ subtest 'Appended and added fields has been added when add = 1, append = 1, remo > ); > $rule->store(); > >- my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { $modules[0]->name => 'test' }); >+ my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { 'source' => 'test' }); > > my @all_fields = $merged_record->fields(); > cmp_ok(scalar @all_fields, '==', 6, "Record has the expected number of fields"); >@@ -233,7 +228,7 @@ subtest 'Record fields has been only removed when add = 0, append = 0, remove = > ); > $rule->store(); > >- my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { $modules[0]->name => 'test' }); >+ my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { 'source' => 'test' }); > > my @all_fields = $merged_record->fields(); > cmp_ok(scalar @all_fields, '==', 2, "Record has the expected number of fields"); >@@ -263,7 +258,7 @@ subtest 'Record fields has been added and removed when add = 1, append = 0, remo > ); > $rule->store(); > >- my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { $modules[0]->name => 'test' }); >+ my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { 'source' => 'test' }); > > my @all_fields = $merged_record->fields(); > cmp_ok(scalar @all_fields, '==', 4, "Record has the expected number of fields"); >@@ -299,7 +294,7 @@ subtest 'Record fields has been appended and removed when add = 0, append = 1, r > ); > $rule->store(); > >- my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { $modules[0]->name => 'test' }); >+ my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { 'source' => 'test' }); > > my @all_fields = $merged_record->fields(); > cmp_ok(scalar @all_fields, '==', 3, "Record has the expected number of fields"); >@@ -329,7 +324,7 @@ subtest 'Record fields has been added, appended and removed when add = 0, append > ); > $rule->store(); > >- my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { $modules[0]->name => 'test' }); >+ my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { 'source' => 'test' }); > > my @all_fields = $merged_record->fields(); > cmp_ok(scalar @all_fields, '==', 5, "Record has the expected number of fields"); >@@ -366,7 +361,7 @@ subtest 'Record fields has been deleted when add = 0, append = 0, remove = 0, de > ); > $rule->store(); > >- my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { $modules[0]->name => 'test' }); >+ my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { 'source' => 'test' }); > > my @all_fields = $merged_record->fields(); > cmp_ok(scalar @all_fields, '==', 2, "Record has the expected number of fields"); >@@ -391,7 +386,7 @@ subtest 'Record fields has been added and deleted when add = 1, append = 0, remo > ); > $rule->store(); > >- my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { $modules[0]->name => 'test' }); >+ my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { 'source' => 'test' }); > > my @all_fields = $merged_record->fields(); > cmp_ok(scalar @all_fields, '==', 4, "Record has the expected number of fields"); >@@ -422,7 +417,7 @@ subtest 'Record fields has been appended and deleted when add = 0, append = 1, r > ); > $rule->store(); > >- my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { $modules[0]->name => 'test' }); >+ my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { 'source' => 'test' }); > > my @all_fields = $merged_record->fields(); > cmp_ok(scalar @all_fields, '==', 3, "Record has the expected number of fields"); >@@ -447,7 +442,7 @@ subtest 'Record fields has been added, appended and deleted when add = 1, append > ); > $rule->store(); > >- my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { $modules[0]->name => 'test' }); >+ my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { 'source' => 'test' }); > > my @all_fields = $merged_record->fields(); > cmp_ok(scalar @all_fields, '==', 5, "Record has the expected number of fields"); >@@ -478,7 +473,7 @@ subtest 'Record fields has been removed and deleted when add = 0, append = 0, re > ); > $rule->store(); > >- my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { $modules[0]->name => 'test' }); >+ my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { 'source' => 'test' }); > > my @all_fields = $merged_record->fields(); > cmp_ok(scalar @all_fields, '==', 1, "Record has the expected number of fields"); >@@ -503,7 +498,7 @@ subtest 'Record fields has been added, removed and deleted when add = 1, append > ); > $rule->store(); > >- my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { $modules[0]->name => 'test' }); >+ my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { 'source' => 'test' }); > > my @all_fields = $merged_record->fields(); > cmp_ok(scalar @all_fields, '==', 3, "Record has the expected number of fields"); >@@ -534,7 +529,7 @@ subtest 'Record fields has been appended, removed and deleted when add = 0, appe > ); > $rule->store(); > >- my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { $modules[0]->name => 'test' }); >+ my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { 'source' => 'test' }); > > my @all_fields = $merged_record->fields(); > cmp_ok(scalar @all_fields, '==', 2, "Record has the expected number of fields"); >@@ -559,7 +554,7 @@ subtest 'Record fields has been overwritten when add = 1, append = 1, remove = 1 > ); > $rule->store(); > >- my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { $modules[0]->name => 'test' }); >+ my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { 'source' => 'test' }); > > my @all_fields = $merged_record->fields(); > >@@ -585,7 +580,7 @@ subtest 'Record fields has been overwritten when add = 1, append = 1, remove = 1 > # Protect field 500 with more specific tag value > my $skip_all_rule = Koha::MarcMergeRules->find_or_create({ > tag => '500', >- module => $modules[0]->name, >+ module => 'source', > filter => '*', > add => 0, > append => 0, >@@ -596,7 +591,7 @@ my $skip_all_rule = Koha::MarcMergeRules->find_or_create({ > subtest '"500" field has been protected when rule matching on tag "500" is add = 0, append = 0, remove = 0, delete = 0' => sub { > plan tests => 4; > >- my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { $modules[0]->name => 'test' }); >+ my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { 'source' => 'test' }); > > my @all_fields = $merged_record->fields(); > >@@ -631,7 +626,7 @@ subtest '"5XX" fields has been protected when rule matching on regexp "5\d{2}" i > ); > $skip_all_rule->store(); > >- my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { $modules[0]->name => 'test' }); >+ my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { 'source' => 'test' }); > > my @all_fields = $merged_record->fields(); > >@@ -660,7 +655,7 @@ subtest 'Record fields has been overwritten when non wild card rule with filter > ); > $rule->store(); > >- my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { $modules[0]->name => 'test' }); >+ my $merged_record = Koha::MarcMergeRules->merge_records($orig_record, $incoming_record, { 'source' => 'test' }); > > my @all_fields = $merged_record->fields(); > >@@ -719,7 +714,7 @@ subtest 'context option in ModBiblio is handled correctly' => sub { > $rule->set( > { > tag => '250', >- module => $modules[0]->name, >+ module => 'source', > filter => '*', > 'add' => 0, > 'append' => 0, >@@ -754,7 +749,7 @@ subtest 'context option in ModBiblio is handled correctly' => sub { > MARC::Field->new('500', '', '', 'a' => 'One cold bottle of beer in the fridge'), # Appended > ); > >- ModBiblio($saved_record, $biblionumber, '', { context => { $modules[0]->name => 'test' } }); >+ ModBiblio($saved_record, $biblionumber, '', { context => { 'source' => 'test' } }); > > my $updated_record = GetMarcBiblio({ biblionumber => $biblionumber }); > >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 14957
:
44056
|
44057
|
44058
|
51723
|
51724
|
56637
|
56638
|
56643
|
56644
|
56645
|
56646
|
56647
|
56648
|
57114
|
57115
|
57116
|
57117
|
57118
|
57119
|
59811
|
59812
|
59885
|
60711
|
60824
|
60825
|
61065
|
61641
|
61736
|
64792
|
72498
|
74855
|
75118
|
76201
|
76202
|
76203
|
76204
|
76205
|
76206
|
76207
|
76208
|
76209
|
76210
|
78651
|
78652
|
78653
|
79367
|
79368
|
79369
|
79370
|
79890
|
80972
|
80973
|
80974
|
80975
|
81176
|
81177
|
81178
|
81179
|
81621
|
81699
|
81700
|
81705
|
81706
|
81707
|
81708
|
81969
|
81970
|
81971
|
82030
|
82031
|
82775
|
87709
|
87711
|
87771
|
87929
|
88205
|
88206
|
89961
|
90668
|
90669
|
90671
|
90672
|
90722
|
90723
|
90740
|
90741
|
92933
|
92934
|
92935
|
92936
|
92937
|
92938
|
92999
|
93499
|
94909
|
94911
|
99998
|
100052
|
100053
|
100054
|
100055
|
100056
|
100057
|
100058
|
100059
|
100060
|
100061
|
101510
|
109955
|
109956
|
109957
|
109958
|
109959
|
109960
|
109961
|
109962
|
109963
|
116622
|
116623
|
116624
|
116625
|
117844
|
117845
|
117849
|
117850
|
117853
|
117859
|
117964
|
117965
|
117966
|
118918
|
118919
|
118920
|
118921
|
118922
|
118923
|
118924
|
118925
|
118926
|
118927
|
118934
|
118935
|
118936
|
118937
|
118938
|
118939
|
118940
|
118941
|
118942
|
118943
|
118944
|
118945
|
118946
|
118957
|
120533
|
120534
|
120535
|
120536
|
120537
|
120538
|
120539
|
120540
|
120541
|
120542
|
120543
|
120544
|
120545
|
120546
|
120547
|
120548
|
120550
|
120553
|
120554
|
120555
|
120556
|
120557
|
120581
|
120582
|
120583
|
120584
|
120585
|
120586
|
120587
|
120588
|
120589
|
120590
|
120591
|
120592
|
120593
|
120594
|
120595
|
120596
|
120597
|
120598
|
120599
|
120600
|
120601
|
120602
|
120603
|
120604
|
120605
|
120670
|
120671
|
120705
|
125514
|
125515
|
125516
|
125517
|
125518
|
125519
|
125520
|
125521
|
125522
|
125523
|
125524
|
125525
|
125526
|
125527
|
125528
|
125529
|
125530
|
125531
|
125532
|
125533
|
125534
|
125535
|
125536
|
125537
|
125538
|
125539
|
125540
|
125632
|
125633
|
125636
|
126424
|
126425
|
126431
|
126592
|
126666
|
126667
|
126752
|
126753
|
126754
|
126755
|
126756
|
126757
|
126758
|
126759
|
126760
|
126761
|
126762
|
126763
|
126764
|
126765
|
126766
|
126767
|
126768
|
126769
|
126770
|
126771
|
126772
|
126773
|
126774
|
126775
|
126776
|
126777
|
126778
|
126779
|
126780
|
126781
|
126782
|
126783
|
126784
|
126785
|
126786
|
126950
|
126951