equal
deleted
inserted
replaced
197 rv = sorted; |
197 rv = sorted; |
198 } |
198 } |
199 else |
199 else |
200 { |
200 { |
201 idxSearcher->err_ = result.err_; |
201 idxSearcher->err_ = result.err_; |
|
202 cpix_Hits_destroy(sorted); |
202 } |
203 } |
203 } |
204 } |
204 catch (...) |
205 catch (...) |
205 { |
206 { |
206 cpix_Hits_destroy(rv); |
207 cpix_Hits_destroy(rv); |
327 } |
328 } |
328 else |
329 else |
329 { |
330 { |
330 moveErrorCode(idxSearcher_, |
331 moveErrorCode(idxSearcher_, |
331 qp); |
332 qp); |
332 } |
333 } |
333 |
334 |
334 cpix_QueryParser_destroy(qp); |
|
335 } |
335 } |
336 else |
336 else |
337 { |
337 { |
338 moveErrorCode(idxSearcher_, |
338 moveErrorCode(idxSearcher_, |
339 &result); |
339 &result); |
340 } |
340 } |
341 |
341 cpix_QueryParser_destroy(qp); |
342 cpix_BoostMap_destroy(boosts); |
342 } |
343 } |
343 cpix_BoostMap_destroy(boosts); |
344 |
|
345 return rv; |
344 return rv; |
346 } |
345 } |
347 |
346 |
348 |
347 |
349 cpix_Query * formPrimaryQuery(const wchar_t * qryStr, |
348 cpix_Query * formPrimaryQuery(const wchar_t * qryStr, |
376 } |
375 } |
377 else |
376 else |
378 { |
377 { |
379 moveErrorCode(idxSearcher_, |
378 moveErrorCode(idxSearcher_, |
380 qp); |
379 qp); |
381 } |
380 } |
382 |
|
383 cpix_QueryParser_destroy(qp); |
|
384 } |
381 } |
385 else |
382 else |
386 { |
383 { |
387 moveErrorCode(idxSearcher_, |
384 moveErrorCode(idxSearcher_, |
388 &result); |
385 &result); |
389 } |
386 } |
390 |
387 cpix_QueryParser_destroy(qp); |
391 return rv; |
388 return rv; |
392 } |
389 } |
393 |
390 |
394 |
391 |
395 cpix_Hits * doSearchIfOk(cpix_Query * qry, |
392 cpix_Hits * doSearchIfOk(cpix_Query * qry, |