gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 42321: Improve handling of empty Z3950/SRU search results 

Skips the empty results; only reports the 'real failures'.
Includes adding a grand total of hits to the form.
Some preliminary work to remove the hardcoded 20 results per target
in the code.
This is not yet a complete solution, but an improvement. The code in
C4/Breeding needs a larger overhaul. (And there might be an issue on
the Folio server side at LOC.)

Test plan:
Without this patch:
Use the LOC SRU server (since if frequently generates errcode 61).
Try the same search several times in a row (with Go). You probably will
come across the "LOC SRU record x: 0" messages. (Random behavior.)
Apply this patch.
Repeat the above. Notice that you will sometimes see the error 61 (and the
tip to refresh) but not the code 0 messages.
Run t/db../Breeding.t

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Lisette Scheer <lisette@bywatersolutions.com>
Signed-off-by: Pedro Amorim <pedro.amorim@openfifth.co.uk>
This commit is contained in:
Marcel de Rooy 2026-04-13 11:01:23 +02:00 committed by Pedro Amorim
parent ea67056197
commit 1c9e5ed219
No known key found for this signature in database
GPG Key ID: 06B75BA7F3894D55
2 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
C4/Breeding.pm
View File

@ -155,7 +155,9 @@ sub Z3950Search {
} }
my $xslh = Koha::XSLT::Base->new; my $xslh = Koha::XSLT::Base->new;
my $nremaining = $s; my $nremaining = $s;
my $hits_per_page = 20; #TODO make configurable
my $total_hits = 0;
while ( $nremaining-- ) { while ( $nremaining-- ) {
my $k; my $k;
my $event; my $event;
@ -169,18 +171,22 @@ sub Z3950Search {
my ($error) = $oConnection[$k]->error_x(); #ignores errmsg, addinfo, diagset my ($error) = $oConnection[$k]->error_x(); #ignores errmsg, addinfo, diagset
if ($error) { if ($error) {
if ( $error =~ m/^(10000|10007)$/ ) { if ( $error =~ m/^(10000|10007)$/ ) {
push( @errconn, { server => $servers[$k]->{host}, error => $error } ); push( @errconn, { server => $servers[$k]->{host}, errcode => $error } );
} }
} else { } else {
my $numresults = $oResult[$k]->size(); my $numresults = $oResult[$k]->size();
$total_hits += $numresults;
my $i; my $i;
my $res; my $res;
if ( $numresults > 0 and $numresults >= ( ( $page - 1 ) * 20 ) ) { if ( $numresults > 0 and $numresults >= ( ( $page - 1 ) * $hits_per_page ) ) {
$show_next = 1 if $numresults >= ( $page * 20 ); $show_next = 1 if $numresults >= ( $page * $hits_per_page );
$total_pages = int( $numresults / 20 ) + 1 if $total_pages < ( $numresults / 20 ); $total_pages = int( $numresults / $hits_per_page ) + 1
if $total_pages < ( $numresults / $hits_per_page );
for ( for (
$i = ( $page - 1 ) * 20 ; $i = ( $page - 1 ) * $hits_per_page ;
$i < ( ( $numresults < ( $page * 20 ) ) ? $numresults : ( $page * 20 ) ) ; $i < (
( $numresults < ( $page * $hits_per_page ) ) ? $numresults : ( $page * $hits_per_page )
) ;
$i++ $i++
) )
{ {
@ -191,14 +197,17 @@ sub Z3950Search {
$xslh $xslh
); #ignores error in sequence numbering ); #ignores error in sequence numbering
push @breeding_loop, $res if $res; push @breeding_loop, $res if $res;
push @errconn, { server => $servers[$k]->{servername}, error => $error, seq => $i + 1 } push @errconn, { server => $servers[$k]->{servername}, errcode => $error, seq => $i + 1 }
if $error; if $error;
} else { } else {
my @diags = $oConnection[$k]->error_x(); # errcode, errmsg, addinfo, diagset
next unless $diags[0]; # Just silently ignore empty results
push @errconn, push @errconn,
{ {
'server' => $servers[$k]->{servername}, server => $servers[$k]->{servername},
error => ( ( $oConnection[$k]->error_x() )[0] ), errcode => $diags[0],
error_msg => ( ( $oConnection[$k]->error_x() )[1] ), seq => $i + 1 errmsg => $diags[1],
seq => $i + 1,
}; };
} }
} }
@ -212,6 +221,7 @@ sub Z3950Search {
total_pages => $total_pages, total_pages => $total_pages,
show_nextbutton => $show_next ? 1 : 0, show_nextbutton => $show_next ? 1 : 0,
show_prevbutton => $page != 1, show_prevbutton => $page != 1,
total_hits => $total_hits,
); );
} # while nremaining } # while nremaining

14
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
View File

@ -103,19 +103,23 @@
[% IF ( dewey ) %]<em>Dewey: </em><span class="term">[% dewey | html %]</span>[% END %] [% IF ( dewey ) %]<em>Dewey: </em><span class="term">[% dewey | html %]</span>[% END %]
[% IF ( srchany ) %]<em>Raw (any): </em><span class="term">[% srchany | html %]</span>[% END %] [% IF ( srchany ) %]<em>Raw (any): </em><span class="term">[% srchany | html %]</span>[% END %]
[% IF ( stdid ) %]<em>Standard ID: </em><span class="term">[% stdid | html %]</span>[% END %] [% IF ( stdid ) %]<em>Standard ID: </em><span class="term">[% stdid | html %]</span>[% END %]
<span class="z3950_total_hits"> (Having [% total_hits | html %] results)</span>
</p> </p>
[% IF ( errconn ) %] [% IF ( errconn ) %]
<div class="alert alert-warning"> <div class="alert alert-warning">
<ul> <ul>
[% FOREACH errcon IN errconn %] [% FOREACH errcon IN errconn %]
[% IF ( errcon.error == '10000' ) %] [% IF ( errcon.errcode == '10000' ) %]
<li>Connection failed to [% errcon.server | html %]</li> <li>Connection failed to [% errcon.server | html %]</li>
[% ELSIF ( errcon.error == '10007' ) %] [% ELSIF ( errcon.errcode == '10007' ) %]
<li>Connection timeout to [% errcon.server | html %]</li> <li>Connection timeout to [% errcon.server | html %]</li>
[% ELSIF errcon.error.match( '^XSLTH' ) %] [% ELSIF errcon.errcode.match( '^XSLTH' ) %]
<li>[% errcon.server | html %] record [% errcon.seq | html %]: [% PROCESS 'xslt-handler.inc' code=errcon.error %]</li> <li>[% errcon.server | html %] record [% errcon.seq | html %]: [% PROCESS 'xslt-handler.inc' code=errcon.errcode %]</li>
[% ELSE %] [% ELSE %]
<li>[% errcon.error_msg | html %] (ref. [% errcon.error | html %]) for [% errcon.server | html %] result [% errcon.seq | html %]</li> <li>
[% errcon.errmsg | html %] (ref. [% errcon.errcode | html %]) for [% errcon.server | html %] result [% errcon.seq | html %]
[% IF errcon.errcode == '61' # 'First record position out of range' %](TIP: Refresh with Go button.)[% END %]
</li>
[% END %] [% END %]
[% END %] [% END %]
</ul> </ul>