projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduced zebra_map_t in zebra_maps API.
[idzebra-moved-to-github.git]
/
index
/
sortidx.c
diff --git
a/index/sortidx.c
b/index/sortidx.c
index
ac08783
..
962841a
100644
(file)
--- a/
index/sortidx.c
+++ b/
index/sortidx.c
@@
-1,5
+1,5
@@
-/* $Id: sortidx.c,v 1.21 2006-12-19 00:25:41 adam Exp $
- Copyright (C) 1995-2006
+/* $Id: sortidx.c,v 1.24 2007-01-15 15:10:17 adam Exp $
+ Copyright (C) 1995-2007
Index Data ApS
This file is part of the Zebra server.
Index Data ApS
This file is part of the Zebra server.
@@
-253,10
+253,10
@@
int zebra_sort_type(zebra_sort_index_t si, int id)
else
{
sf->isam_p = isamb_get_root_ptr(sf->u.isamb);
else
{
sf->isam_p = isamb_get_root_ptr(sf->u.isamb);
- sf->isam_pp = 0;
}
break;
}
}
break;
}
+ sf->isam_pp = 0;
sf->no_inserted = 0;
sf->no_deleted = 0;
sf->next = si->files;
sf->no_inserted = 0;
sf->no_deleted = 0;
sf->next = si->files;
@@
-273,7
+273,7
@@
void zebra_sort_sysno(zebra_sort_index_t si, zint sysno)
{
sf->no_inserted = 0;
sf->no_deleted = 0;
{
sf->no_inserted = 0;
sf->no_deleted = 0;
- if (new_sysno < si->sysno && sf->isam_pp)
+ if (sf->isam_pp && new_sysno < si->sysno && sf->isam_pp)
{
isamb_pp_close(sf->isam_pp);
sf->isam_pp = 0;
{
isamb_pp_close(sf->isam_pp);
sf->isam_pp = 0;
@@
-382,12
+382,8
@@
void zebra_sort_read(zebra_sort_index_t si, char *buf)
{
struct sort_term st, st_untilbuf;
{
struct sort_term st, st_untilbuf;
- st.sysno = 99999;
if (!sf->isam_pp)
if (!sf->isam_pp)
- {
- yaz_log(YLOG_LOG, "isamb_pp_open " ZINT_FORMAT, sf->isam_p);
sf->isam_pp = isamb_pp_open(sf->u.isamb, sf->isam_p, 1);
sf->isam_pp = isamb_pp_open(sf->u.isamb, sf->isam_p, 1);
- }
if (!sf->isam_pp)
return;
if (!sf->isam_pp)
return;