Lines 28-35
use C4::Reserves qw( GetReserveStatus );
Link Here
|
28 |
use C4::Search qw(); |
28 |
use C4::Search qw(); |
29 |
use Koha::Logger; |
29 |
use Koha::Logger; |
30 |
|
30 |
|
31 |
use ZOOM; |
|
|
32 |
|
33 |
use constant { |
31 |
use constant { |
34 |
UNIMARC_OID => '1.2.840.10003.5.1', |
32 |
UNIMARC_OID => '1.2.840.10003.5.1', |
35 |
USMARC_OID => '1.2.840.10003.5.10', |
33 |
USMARC_OID => '1.2.840.10003.5.10', |
Lines 41-47
use constant {
Link Here
|
41 |
ERR_PRESENT_OUT_OF_RANGE => 13, |
39 |
ERR_PRESENT_OUT_OF_RANGE => 13, |
42 |
ERR_RECORD_TOO_LARGE => 16, |
40 |
ERR_RECORD_TOO_LARGE => 16, |
43 |
ERR_NO_SUCH_RESULTSET => 30, |
41 |
ERR_NO_SUCH_RESULTSET => 30, |
44 |
ERR_SYNTAX_UNSUPPORTED => 230, |
42 |
ERR_SEARCH_FAILED => 125, |
|
|
43 |
ERR_SYNTAX_UNSUPPORTED => 239, |
45 |
ERR_DB_DOES_NOT_EXIST => 235, |
44 |
ERR_DB_DOES_NOT_EXIST => 235, |
46 |
}; |
45 |
}; |
47 |
|
46 |
|
Lines 86-138
sub _set_error {
Link Here
|
86 |
$self->_log_error(" returning error $code: $msg"); |
85 |
$self->_log_error(" returning error $code: $msg"); |
87 |
} |
86 |
} |
88 |
|
87 |
|
89 |
sub _set_error_from_zoom { |
|
|
90 |
my ( $self, $args, $exception ) = @_; |
91 |
|
92 |
$self->_set_error( $args, ERR_TEMPORARY_ERROR, 'Cannot connect to upstream server' ); |
93 |
$self->_log_error( |
94 |
"Zebra upstream error: " . |
95 |
$exception->message() . " (" . |
96 |
$exception->code() . ") " . |
97 |
( $exception->addinfo() // '' ) . " " . |
98 |
$exception->diagset() |
99 |
); |
100 |
} |
101 |
|
102 |
# This code originally went through C4::Search::getRecords, but had to use so many escape hatches |
103 |
# that it was easier to directly connect to Zebra. |
104 |
sub _start_search { |
105 |
my ( $self, $args, $in_retry ) = @_; |
106 |
|
107 |
my $database = $args->{DATABASES}->[0]; |
108 |
my ( $connection, $results ); |
109 |
|
110 |
eval { |
111 |
$connection = C4::Context->Zconn( |
112 |
# We're depending on the caller to have done some validation. |
113 |
$database eq 'biblios' ? 'biblioserver' : 'authorityserver', |
114 |
0 # No, no async, doesn't really help much for single-server searching |
115 |
); |
116 |
|
117 |
$results = $connection->search_pqf( $args->{QUERY} ); |
118 |
|
119 |
$self->_log_debug(' retry successful') if ($in_retry); |
120 |
}; |
121 |
if ($@) { |
122 |
die $@ if ( ref($@) ne 'ZOOM::Exception' ); |
123 |
|
124 |
if ( $@->diagset() eq 'ZOOM' && $@->code() == 10004 && !$in_retry ) { |
125 |
$self->_log_debug(' upstream server lost connection, retrying'); |
126 |
return $self->_start_search( $args, 1 ); |
127 |
} |
128 |
|
129 |
$self->_set_error_from_zoom( $args, $@ ); |
130 |
$connection = undef; |
131 |
} |
132 |
|
133 |
return ( $connection, $results, $results ? $results->size() : -1 ); |
134 |
} |
135 |
|
136 |
sub _check_fetch { |
88 |
sub _check_fetch { |
137 |
my ( $self, $resultset, $args, $offset, $num_records ) = @_; |
89 |
my ( $self, $resultset, $args, $offset, $num_records ) = @_; |
138 |
|
90 |
|
Lines 149-236
sub _check_fetch {
Link Here
|
149 |
return 1; |
101 |
return 1; |
150 |
} |
102 |
} |
151 |
|
103 |
|
152 |
sub _fetch_record { |
|
|
153 |
my ( $self, $resultset, $args, $index, $num_to_prefetch ) = @_; |
154 |
|
155 |
my $record; |
156 |
|
157 |
eval { |
158 |
if ( !$resultset->{results}->record_immediate( $index ) ) { |
159 |
my $start = $num_to_prefetch ? int( $index / $num_to_prefetch ) * $num_to_prefetch : $index; |
160 |
|
161 |
if ( $start + $num_to_prefetch >= $resultset->{results}->size() ) { |
162 |
$num_to_prefetch = $resultset->{results}->size() - $start; |
163 |
} |
164 |
|
165 |
$self->_log_debug(" fetch uncached, fetching $num_to_prefetch records starting at $start"); |
166 |
|
167 |
$resultset->{results}->records( $start, $num_to_prefetch, 0 ); |
168 |
} |
169 |
|
170 |
$record = $resultset->{results}->record_immediate( $index )->raw(); |
171 |
}; |
172 |
if ($@) { |
173 |
die $@ if ( ref($@) ne 'ZOOM::Exception' ); |
174 |
$self->_set_error_from_zoom( $args, $@ ); |
175 |
return; |
176 |
} else { |
177 |
return $record; |
178 |
} |
179 |
} |
180 |
|
181 |
sub search_handler { |
104 |
sub search_handler { |
182 |
# Called when search is first sent. |
105 |
# Called when search is first sent. |
183 |
my ( $self, $args ) = @_; |
106 |
my ( $self, $args ) = @_; |
184 |
|
107 |
|
185 |
my $database = $args->{DATABASES}->[0]; |
108 |
my $database = $args->{DATABASES}->[0]; |
186 |
|
109 |
|
187 |
if ( $database !~ /^(biblios|authorities)$/ ) { |
110 |
if ( $database ne $Koha::SearchEngine::BIBLIOS_INDEX && $database ne $Koha::SearchEngine::AUTHORITIES_INDEX ) { |
188 |
$self->_set_error( $args, ERR_DB_DOES_NOT_EXIST, 'No such database' ); |
111 |
$self->_set_error( $args, $self->ERR_DB_DOES_NOT_EXIST, 'No such database' ); |
189 |
return; |
112 |
return; |
190 |
} |
113 |
} |
191 |
|
114 |
|
192 |
my $query = $args->{QUERY}; |
115 |
my $query = $args->{QUERY}; |
193 |
$self->_log_info("received search for '$query', (RS $args->{SETNAME})"); |
116 |
$self->_log_info("received search for '$query', (RS $args->{SETNAME})"); |
194 |
|
117 |
|
195 |
my ( $connection, $results, $num_hits ) = $self->_start_search( $args ); |
118 |
my ($resultset, $hits) = $self->_start_search( $args, $self->{server}->{num_to_prefetch} ); |
196 |
return unless $connection; |
119 |
return unless $resultset; |
197 |
|
|
|
198 |
$args->{HITS} = $num_hits; |
199 |
my $resultset = $self->{resultsets}->{ $args->{SETNAME} } = { |
200 |
database => $database, |
201 |
connection => $connection, |
202 |
results => $results, |
203 |
query => $args->{QUERY}, |
204 |
hits => $args->{HITS}, |
205 |
}; |
206 |
} |
207 |
|
208 |
sub present_handler { |
209 |
# Called when a set of records is requested. |
210 |
my ( $self, $args ) = @_; |
211 |
|
212 |
$self->_log_debug("received present for $args->{SETNAME}, $args->{START}+$args->{NUMBER}"); |
213 |
|
214 |
my $resultset = $self->{resultsets}->{ $args->{SETNAME} }; |
215 |
# The offset comes across 1-indexed. |
216 |
my $offset = $args->{START} - 1; |
217 |
|
218 |
return unless $self->_check_fetch( $resultset, $args, $offset, $args->{NUMBER} ); |
219 |
|
120 |
|
|
|
121 |
$args->{HITS} = $hits; |
122 |
$self->{resultsets}->{ $args->{SETNAME} } = $resultset; |
220 |
} |
123 |
} |
221 |
|
124 |
|
222 |
sub fetch_handler { |
125 |
sub fetch_handler { |
223 |
# Called when a given record is requested. |
126 |
# Called when a given record is requested. |
224 |
my ( $self, $args ) = @_; |
127 |
my ( $self, $args ) = @_; |
225 |
my $session = $args->{HANDLE}; |
128 |
|
|
|
129 |
$self->_log_debug("received fetch for RS $args->{SETNAME}, record $args->{OFFSET}"); |
130 |
|
226 |
my $server = $self->{server}; |
131 |
my $server = $self->{server}; |
227 |
|
132 |
|
228 |
$self->_log_debug("received fetch for $args->{SETNAME}, record $args->{OFFSET}"); |
|
|
229 |
my $form_oid = $args->{REQ_FORM} // ''; |
133 |
my $form_oid = $args->{REQ_FORM} // ''; |
230 |
my $composition = $args->{COMP} // ''; |
134 |
my $composition = $args->{COMP} // ''; |
231 |
$self->_log_debug(" form OID $form_oid, composition $composition"); |
135 |
$self->_log_debug(" form OID '$form_oid', composition '$composition'"); |
232 |
|
136 |
|
233 |
my $resultset = $session->{resultsets}->{ $args->{SETNAME} }; |
137 |
my $resultset = $self->{resultsets}->{ $args->{SETNAME} }; |
234 |
# The offset comes across 1-indexed. |
138 |
# The offset comes across 1-indexed. |
235 |
my $offset = $args->{OFFSET} - 1; |
139 |
my $offset = $args->{OFFSET} - 1; |
236 |
|
140 |
|
Lines 254-265
sub fetch_handler {
Link Here
|
254 |
} |
158 |
} |
255 |
} |
159 |
} |
256 |
|
160 |
|
257 |
if ( $form_oid eq MARCXML_OID && $composition eq 'marcxml' ) { |
161 |
if ( $form_oid eq $self->MARCXML_OID && $composition eq 'marcxml' ) { |
258 |
$args->{RECORD} = $record->as_xml_record(); |
162 |
$args->{RECORD} = $record->as_xml_record(); |
259 |
} elsif ( ( $form_oid eq USMARC_OID || $form_oid eq UNIMARC_OID ) && ( !$composition || $composition eq 'F' ) ) { |
163 |
} elsif ( ( $form_oid eq $self->USMARC_OID || $form_oid eq $self->UNIMARC_OID ) && ( !$composition || $composition eq 'F' ) ) { |
260 |
$args->{RECORD} = $record->as_usmarc(); |
164 |
$args->{RECORD} = $record->as_usmarc(); |
261 |
} else { |
165 |
} else { |
262 |
$self->_set_error( $args, ERR_SYNTAX_UNSUPPORTED, "Unsupported syntax/composition $form_oid/$composition" ); |
166 |
$self->_set_error( $args, $self->ERR_SYNTAX_UNSUPPORTED, "Unsupported syntax/composition $form_oid/$composition" ); |
263 |
return; |
167 |
return; |
264 |
} |
168 |
} |
265 |
} |
169 |
} |
Lines 318-329
sub add_item_status {
Link Here
|
318 |
} |
222 |
} |
319 |
} |
223 |
} |
320 |
|
224 |
|
321 |
sub close_handler { |
|
|
322 |
my ( $self, $args ) = @_; |
323 |
|
324 |
foreach my $resultset ( values %{ $self->{resultsets} } ) { |
325 |
$resultset->{results}->destroy(); |
326 |
} |
327 |
} |
328 |
|
329 |
1; |
225 |
1; |