/*
- * Copyright (C) 1994-1998, Index Data I/S
+ * Copyright (C) 1994-1999, Index Data
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: scan.c,v $
- * Revision 1.10 1998-03-06 16:58:04 adam
+ * Revision 1.13 1999-05-15 14:36:37 adam
+ * Updated dictionary. Implemented "compression" of dictionary.
+ *
+ * Revision 1.12 1999/02/02 14:50:28 adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.11 1998/06/22 11:34:45 adam
+ * Changed scan callback function so it doesn't stop further scanning.
+ *
+ * Revision 1.10 1998/03/06 16:58:04 adam
* Fixed bug which related to scanning of large indexes.
*
* Revision 1.9 1997/10/27 14:33:04 adam
lo = hi;
else
lo = start;
- indxp = (short*) ((char*) p+DICT_pagesize(dict)-sizeof(short));
+ indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
while (lo <= hi && lo >= 0 && *count > 0)
{
for (j = 0; info[j] != DICT_EOS; j++)
str[pos+j] = info[j];
str[pos+j] = DICT_EOS;
- if ((*userfunc)((char*) str, info+(j+1)*sizeof(Dict_char),
- *count * dir, client))
- return 1;
+ (*userfunc)((char*) str, info+(j+1)*sizeof(Dict_char),
+ *count * dir, client);
--(*count);
}
else
dict_scan_trav (dict, subptr, pos+1, str, 0, count,
client, userfunc, dir);
dict_bf_readp (dict->dbf, ptr, &p);
- indxp = (short*) ((char*) p+DICT_pagesize(dict)-sizeof(short));
+ indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
}
}
lo += dir;
return 0;
mid = lo = 0;
hi = DICT_nodir(p)-1;
- indxp = (short*) ((char*) p+DICT_pagesize(dict)-sizeof(short));
+ indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
while (lo <= hi)
{
mid = (lo+hi)/2;
logf (LOG_DEBUG, " %3d %c", str[i],
(str[i] > ' ' && str[i] < 127) ? str[i] : '?');
}
- if (dict->head.last <= 1)
+ if (!dict->head.root)
return 0;
- return dict_scan_r (dict, 1, 0, (Dict_char *) str, before, after, client,
- f);
+ return dict_scan_r (dict, dict->head.root, 0, (Dict_char *) str,
+ before, after, client, f);
}
-