Bugzilla – Attachment 188632 Details for
Bug 6473
Test bug for Git-bz ✔ ❤ ★
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 40841: Implement library limits on Z39.50 searches
cb04b93.patch (text/plain), 4.88 KB, created by
Tomás Cohen Arazi (tcohen)
on 2025-10-30 11:57:40 UTC
(
hide
)
Description:
Bug 40841: Implement library limits on Z39.50 searches
Filename:
MIME Type:
Creator:
Tomás Cohen Arazi (tcohen)
Created:
2025-10-30 11:57:40 UTC
Size:
4.88 KB
patch
obsolete
>From cb04b93b921eff34838f565642c90ed3703b0fd2 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Tom=C3=A1s=20Cohen=20Arazi?= <tomascohen@theke.io> >Date: Wed, 29 Oct 2025 10:05:32 -0300 >Subject: [PATCH] Bug 40841: Implement library limits on Z39.50 searches >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >This patchset implements Z39.50/SRU limits by branch in Koha. > >Key implementation notes: >- Follows Koha's established pattern for library limits >- A new table linking to library limits is added >- The admin UI is adjusted so the form includes library limit selection >- Z39.50/SRU search controllers use the `search_with_library_limits` > methods to correctly constraint the offered servers. > >To test: >1. Apply this patches >2. Run: > $ ktd --shell > k$ updatedatabase >=> SUCCESS: Database upgrade goes well >3. Re-run: > k$ updatedatabase >=> SUCCESS: No explosions, DB update idempotent >4. Restart everything: > k$ restart_all >5. POint your browser to the admin page: > http://kohadev-intra.localhost/cgi-bin/koha/admin/z3950servers.pl >=> SUCCESS: A new column is displayed for library limits brief >6. Edit `LIBRARY OF CONGRESS` >=> SUCCESS: The form includes the usual library limit selection UI >7. Choose some branches, excluding your current one (KTD's default is > 'Centerville'). >8. Save >=> SUCCESS: It is saved correctly >=> SUCCESS: The table shows the edited library has the library limits >set >9. Edit again >=> SUCCESS: The selected limits are preserved when editing >10. Pick some authorities Z39.50 target, and exclude your current branch > for testing purposes. >11. Go to Cataloguing, and choose 'New from Z39.50/SRU' >=> SUCCESS: Limits are respected! >12. Go to Authorities, and choose 'New from Z39.50/SRU' >=> SUCCESS: Limits are respected! >13. Sign off :-D > >Signed-off-by: Tomás Cohen Arazi <tomascohen@theke.io> >--- > cataloguing/editor.pl | 2 +- > cataloguing/z3950_auth_search.pl | 14 +++++++++----- > cataloguing/z3950_search.pl | 10 +++++----- > 3 files changed, 15 insertions(+), 11 deletions(-) > >diff --git a/cataloguing/editor.pl b/cataloguing/editor.pl >index 466f9081353..023c2a7cb2a 100755 >--- a/cataloguing/editor.pl >+++ b/cataloguing/editor.pl >@@ -78,7 +78,7 @@ my $frameworks = Koha::BiblioFrameworks->search( {}, { order_by => ['frameworkte > $template->{VARS}->{frameworks} = $frameworks; > > $template->param( >- z3950_servers => Koha::Z3950Servers->search( >+ z3950_servers => Koha::Z3950Servers->search_with_library_limits( > { recordtype => { '!=' => 'authority' } }, > { order_by => [ 'rank', 'servername' ] }, > ) >diff --git a/cataloguing/z3950_auth_search.pl b/cataloguing/z3950_auth_search.pl >index 2bd0e2fbec7..bbedc34d7c3 100755 >--- a/cataloguing/z3950_auth_search.pl >+++ b/cataloguing/z3950_auth_search.pl >@@ -27,6 +27,7 @@ use C4::Breeding qw( Z3950Search Z3950SearchAuth ); > use MARC::Record; > use Koha::Authorities; > use Koha::Authority::Types; >+use Koha::Z3950Servers; > use C4::AuthoritiesMarc qw( GetAuthority ); > > my $input = CGI->new; >@@ -97,13 +98,16 @@ $template->param( > ); > > if ( $op ne "cud-do_search" ) { >- my $sth = $dbh->prepare( >- "SELECT id,host,servername,checked FROM z3950servers WHERE recordtype = 'authority' ORDER BY `rank`, servername" >+ my $servers = Koha::Z3950Servers->search_with_library_limits( >+ { >+ recordtype => 'authority', >+ }, >+ { >+ order_by => [ 'rank', 'servername' ], >+ }, > ); >- $sth->execute(); >- my $serverloop = $sth->fetchall_arrayref( {} ); > $template->param( >- serverloop => $serverloop, >+ serverloop => $servers, > opsearch => "cud-search", > index => $index, > ); >diff --git a/cataloguing/z3950_search.pl b/cataloguing/z3950_search.pl >index a80cd122420..4293216226e 100755 >--- a/cataloguing/z3950_search.pl >+++ b/cataloguing/z3950_search.pl >@@ -26,6 +26,8 @@ use C4::Output qw( output_html_with_http_headers ); > use C4::Context; > use C4::Breeding qw( Z3950Search ); > >+use Koha::Z3950Servers; >+ > my $input = CGI->new; > my $error = $input->param('error'); > my $biblionumber = $input->param('biblionumber') || 0; >@@ -74,19 +76,17 @@ $template->param( > ); > > if ( $op ne "cud-do_search" ) { >- my $schema = Koha::Database->new()->schema(); >- my $rs = $schema->resultset('Z3950server')->search( >+ my $servers = Koha::Z3950Servers->search_with_library_limits( > { > recordtype => 'biblio', > servertype => [ 'zed', 'sru' ], > }, > { >- result_class => 'DBIx::Class::ResultClass::HashRefInflator', >- order_by => [ 'rank', 'servername' ], >+ order_by => [ 'rank', 'servername' ], > }, > ); > $template->param( >- serverloop => [ $rs->all ], >+ serverloop => $servers, > opsearch => "cud-search", > ); > output_html_with_http_headers $input, $cookie, $template->output; >-- >2.51.2
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 6473
:
4386
|
6837
|
6838
|
6839
|
6840
|
6841
|
6842
|
6843
|
7154
|
7155
|
7567
|
7994
|
7995
|
7996
|
7997
|
8018
|
9807
|
9808
|
9813
|
9831
|
9832
|
9836
|
9854
|
10842
|
10843
|
10844
|
10845
|
10846
|
10847
|
10848
|
10849
|
10850
|
10851
|
10852
|
10853
|
10854
|
10855
|
10856
|
10857
|
10858
|
11540
|
11543
|
11544
|
12502
|
12513
|
12514
|
12515
|
12516
|
12517
|
12518
|
12519
|
13473
|
13673
|
14955
|
14969
|
14970
|
14972
|
15201
|
18949
|
18950
|
18951
|
18952
|
18953
|
18954
|
18955
|
18956
|
18957
|
18958
|
18959
|
18960
|
18961
|
18962
|
18963
|
18971
|
18972
|
19518
|
19519
|
19591
|
19592
|
19871
|
19879
|
19880
|
19881
|
19882
|
20011
|
20012
|
20013
|
20014
|
22477
|
22481
|
22482
|
22496
|
22502
|
22503
|
31958
|
32444
|
32445
|
32446
|
32447
|
32448
|
32449
|
32450
|
32451
|
32452
|
34200
|
34201
|
34625
|
34999
|
35130
|
35269
|
35273
|
35274
|
35275
|
35276
|
35277
|
35279
|
35280
|
35303
|
40954
|
40957
|
45345
|
45349
|
45731
|
45732
|
45733
|
45734
|
47283
|
47284
|
47298
|
47299
|
47300
|
47334
|
47336
|
49083
|
56974
|
61059
|
61069
|
62038
|
65313
|
77301
|
78016
|
79959
|
80178
|
80179
|
80180
|
80181
|
80182
|
84400
|
86644
|
86645
|
87152
|
88128
|
95586
|
95716
|
97394
|
99026
|
99027
|
114217
|
114218
|
114219
|
114220
|
114221
|
114222
|
114223
|
114224
|
114225
|
114226
|
119255
|
121181
|
131891
|
131893
|
131894
|
134862
|
144109
|
144144
|
144671
|
144672
|
144673
|
147183
|
149030
|
149031
|
149032
|
149033
|
160566
|
160567
|
160568
|
182093
|
183107
|
183177
|
183178
|
183179
|
183180
|
183182
|
183183
|
183285
|
183286
|
187209
|
187321
|
187322
|
187323
|
187324
|
187325
|
187326
|
187327
|
187328
|
187329
|
187330
|
187331
|
187332
|
187333
|
187334
|
187335
|
187336
|
187337
|
187338
|
187339
|
187340
|
187341
|
187342
|
187343
|
187344
|
187345
|
187346
|
187347
|
187348
|
187349
|
187350
|
187351
|
187352
|
187353
|
187354
|
187355
|
187356
|
187357
|
187358
|
187359
|
187360
|
187361
|
187362
|
187363
|
187364
|
187365
|
187366
|
187367
|
187368
|
187369
|
187370
|
187371
|
187372
|
187545
|
187546
|
188609
|
188610
|
188611
|
188612
|
188613
|
188614
|
188626
|
188627
|
188628
|
188629
|
188630
|
188631
|
188632
|
188633
|
188634
|
188645
|
188647
|
188703
|
188929
|
188937
|
188975
|
190164
|
190165
|
190166
|
190167
|
190168
|
190169
|
190170
|
190171
|
190172
|
190173
|
190174
|
190175
|
190176
|
190177
|
190178
|
190179
|
190180
|
190181
|
190182
|
190183
|
190184
|
190185
|
190186
|
190187
|
190188
|
190240
|
190241
|
190242
|
190243
|
190244
|
190245
|
190246
|
190247
|
190248
|
190249
|
190250
|
190251
|
190252
|
190253
|
190255
|
190256