Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions dict/dcompact.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,19 +108,13 @@ int dict_copy_compact(BFiles bfs, const char *from_name, const char *to_name)
{
void *buf;
int size;
#if 0
yaz_log(YLOG_LOG, "map[%d] = %d", i, map[i]);
#endif
dict_bf_readp(dict_from->dbf, i, &buf);
size = ((DICT_size(buf)+sizeof(short)-1)/sizeof(short) +
DICT_nodir(buf))*sizeof(short);
map[i+1] = map[i] + size;
no_dir += DICT_nodir(buf);
}
#if 0
yaz_log(YLOG_LOG, "map[%d] = %d", i, map[i]);
yaz_log(YLOG_LOG, "nodir = %d", no_dir);
#endif
dict_to->head.root = map[1];
dict_to->head.last = map[i];
for (i = 1; i< (int) (dict_from->head.last); i++)
Expand Down
1 change: 1 addition & 0 deletions dict/dicttest.c
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ int main (int argc, char **argv)
{
yaz_log (YLOG_LOG, "No of new..... %d", no_of_new);
yaz_log (YLOG_LOG, "No of change.. %d", no_of_change);
yaz_log (YLOG_LOG, "No of same.... %d", no_of_same);
}
}
else
Expand Down
6 changes: 0 additions & 6 deletions index/trunc.c
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length,
{
RSET result;
RSFD result_rsfd;
int nn = 0;

result = rset_create_temp(rset_nmem, kctrl, scope,
res_get(zi->res, "setTmpDir"), termid);
Expand Down Expand Up @@ -186,7 +185,6 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length,
int n = ti->indx[ti->ptr[1]];

rset_write(result_rsfd, ti->heap[ti->ptr[1]]);
nn++;

while (1)
{
Expand Down Expand Up @@ -233,7 +231,6 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length,
int n = ti->indx[ti->ptr[1]];

rset_write(result_rsfd, ti->heap[ti->ptr[1]]);
nn++;
if (preserve_position)
{
heap_delete(ti);
Expand Down Expand Up @@ -269,7 +266,6 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length,
ISAMS_PP *ispt;
int i;
struct trunc_info *ti;
int nn = 0;

ispt = (ISAMS_PP *) xmalloc(sizeof(*ispt) * (to-from));

Expand All @@ -288,7 +284,6 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length,
int n = ti->indx[ti->ptr[1]];

rset_write(result_rsfd, ti->heap[ti->ptr[1]]);
nn++;
while (1)
{
if (!isams_pp_read(ispt[n], ti->tmpbuf))
Expand Down Expand Up @@ -333,7 +328,6 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length,
int n = ti->indx[ti->ptr[1]];

rset_write(result_rsfd, ti->heap[ti->ptr[1]]);
nn++;

if (preserve_position)
{
Expand Down
3 changes: 0 additions & 3 deletions index/zsets.c
Original file line number Diff line number Diff line change
Expand Up @@ -1121,7 +1121,6 @@ ZEBRA_RES resultSetRank(ZebraHandle zh, ZebraSet zebraSet,
RSFD rfd = rset_open(rset, RSETF_READ);
struct rank_control *rc = rank_class->control;
int score;
zint count = 0;
void *handle = (*rc->begin) (zh->reg, rank_class->class_handle, rset,
nmem, terms, numTerms);
zint psysno = 0; /* previous doc id / sys no */
Expand Down Expand Up @@ -1158,7 +1157,6 @@ ZEBRA_RES resultSetRank(ZebraHandle zh, ZebraSet zebraSet,
&stop_flag);
/* insert the hit. A=Ascending */
resultSetInsertRank(zh, sort_info, psysno, score, 'A');
count++;
}
psysno = this_sys;
if (zh->m_staticrank)
Expand All @@ -1172,7 +1170,6 @@ ZEBRA_RES resultSetRank(ZebraHandle zh, ZebraSet zebraSet,
score = (*rc->calc)(handle, psysno, pstaticrank, &stop_flag);
/* insert the hit. A=Ascending */
resultSetInsertRank(zh, sort_info, psysno, score, 'A');
count++;
}
(*rc->end)(zh->reg, handle);
rset_close(rfd);
Expand Down
Loading