/*
- * Copyright (C) 1995, Index Data I/S
+ * Copyright (C) 1994-1995, Index Data I/S
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: kinput.c,v $
- * Revision 1.1 1995-09-04 09:10:37 adam
+ * Revision 1.5 1995-09-29 14:01:43 adam
+ * Bug fixes.
+ *
+ * Revision 1.4 1995/09/28 14:22:57 adam
+ * Sort uses smaller temporary files.
+ *
+ * Revision 1.3 1995/09/06 16:11:17 adam
+ * Option: only one word key per file.
+ *
+ * Revision 1.2 1995/09/04 12:33:42 adam
+ * Various cleanup. YAZ util used instead.
+ *
+ * Revision 1.1 1995/09/04 09:10:37 adam
* More work on index add/del/update.
* Merge sort implemented.
* Initial work on z39 server.
{
int c;
int i = 0;
- name[0] = 0;
do
{
if ((c=getc(inf)) == EOF)
int key_buf_ptr;
char *next_key;
char *key_buf;
+ int more;
next_key = xmalloc (KEY_SIZE);
key_buf = xmalloc (key_buf_size * (KEY_SIZE));
if (!(inf = fopen (name, "r")))
{
- log (LOG_FATAL|LOG_ERRNO, "cannot open `%s'", name);
+ logf (LOG_FATAL|LOG_ERRNO, "cannot open `%s'", name);
exit (1);
}
- read_one (inf, cur_name, key_buf);
- while (cur_name[0]) /* EOF ? */
+ more = read_one (inf, cur_name, key_buf);
+ while (more) /* EOF ? */
{
int nmemb;
key_buf_ptr = KEY_SIZE;
while (1)
{
- if (!read_one (inf, next_name, next_key))
+ if (!(more = read_one (inf, next_name, next_key)))
break;
- if (strcmp (next_name, cur_name))
+ if (*next_name && strcmp (next_name, cur_name))
break;
memcpy (key_buf + key_buf_ptr, next_key, KEY_SIZE);
key_buf_ptr += KEY_SIZE;
if ((info = dict_lookup (dict, cur_name)))
{
ISAM_P isam_p, isam_p2;
- log (LOG_DEBUG, "updating %s", cur_name);
+ logf (LOG_DEBUG, "updating %s", cur_name);
no_updates++;
memcpy (&isam_p, info+1, sizeof(ISAM_P));
isam_p2 = is_merge (isam, isam_p, nmemb, key_buf);
else
{
ISAM_P isam_p;
- log (LOG_DEBUG, "inserting %s", cur_name);
+ logf (LOG_DEBUG, "inserting %s", cur_name);
no_insertions++;
isam_p = is_merge (isam, 0, nmemb, key_buf);
dict_insert (dict, cur_name, sizeof(ISAM_P), &isam_p);
dict = dict_open (dict_fname, cache, 1);
if (!dict)
{
- log (LOG_FATAL, "dict_open fail of `%s'", dict_fname);
+ logf (LOG_FATAL, "dict_open fail of `%s'", dict_fname);
exit (1);
}
- isam = is_open (isam_fname, key_compare, 1);
+ isam = is_open (isam_fname, key_compare, 1, sizeof(struct it_key));
if (!isam)
{
- log (LOG_FATAL, "is_open fail of `%s'", isam_fname);
+ logf (LOG_FATAL, "is_open fail of `%s'", isam_fname);
exit (1);
}
inp (dict, isam, key_fname);
dict_close (dict);
is_close (isam);
- log (LOG_LOG, "Iterations . . .%7d", no_iterations);
- log (LOG_LOG, "Distinct words .%7d", no_diffs);
- log (LOG_LOG, "Updates. . . . .%7d", no_updates);
- log (LOG_LOG, "Insertions . . .%7d", no_insertions);
+ logf (LOG_LOG, "Iterations . . .%7d", no_iterations);
+ logf (LOG_LOG, "Distinct words .%7d", no_diffs);
+ logf (LOG_LOG, "Updates. . . . .%7d", no_updates);
+ logf (LOG_LOG, "Insertions . . .%7d", no_insertions);
}