/*
- * Copyright (C) 1994-1996, Index Data I/S
+ * Copyright (C) 1994-1998, Index Data I/S
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: kinput.c,v $
- * Revision 1.21 1996-11-08 11:10:23 adam
+ * Revision 1.29 1998-06-11 15:41:39 adam
+ * Minor changes.
+ *
+ * Revision 1.28 1998/03/05 08:45:12 adam
+ * New result set model and modular ranking system. Moved towards
+ * descent server API. System information stored as "SGML" records.
+ *
+ * Revision 1.27 1998/02/17 10:32:52 adam
+ * Fixed bug: binary files weren't opened with flag b on NT.
+ *
+ * Revision 1.26 1998/01/29 13:39:13 adam
+ * Compress ISAM is default.
+ *
+ * Revision 1.25 1997/09/17 12:19:14 adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.24 1997/09/09 13:38:07 adam
+ * Partial port to WIN95/NT.
+ *
+ * Revision 1.23 1997/09/04 13:57:39 adam
+ * Added O_BINARY for open calls.
+ *
+ * Revision 1.22 1997/02/12 20:39:45 adam
+ * Implemented options -f <n> that limits the log to the first <n>
+ * records.
+ * Changed some log messages also.
+ *
+ * Revision 1.21 1996/11/08 11:10:23 adam
* Buffers used during file match got bigger.
* Compressed ISAM support everywhere.
* Bug fixes regarding masking characters in queries.
*/
#include <fcntl.h>
+#ifdef WINDOWS
+#include <io.h>
+#else
#include <unistd.h>
+#endif
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
void key_file_chunk_read (struct key_file *f)
{
- int nr = 0, r, fd;
+ int nr = 0, r = 0, fd;
char fname[1024];
getFnameTmp (fname, f->no);
- fd = open (fname, O_RDONLY);
+ fd = open (fname, O_BINARY|O_RDONLY);
if (fd == -1)
{
logf (LOG_FATAL|LOG_ERRNO, "cannot open %s", fname);
char *dict_info;
strcpy (this_name, hci.cur_name);
- logf (LOG_DEBUG, "inserting %s", 1+hci.cur_name);
+ assert (hci.cur_name[1]);
no_diffs++;
if ((dict_info = dict_lookup (hi->dict, hci.cur_name)))
{
if ((info = dict_lookup (hi->dict, cur_name)))
{
ISAM_P isam_p, isam_p2;
- logf (LOG_DEBUG, "updating %s", 1+cur_name);
memcpy (&isam_p, info+1, sizeof(ISAM_P));
isam_p2 = is_merge (hi->isam, isam_p, nmemb, key_buf);
if (!isam_p2)
else
{
ISAM_P isam_p;
- logf (LOG_DEBUG, "inserting %s", 1+cur_name);
no_insertions++;
isam_p = is_merge (hi->isam, 0, nmemb, key_buf);
dict_insert (hi->dict, cur_name, sizeof(ISAM_P), &isam_p);
p->totalOffset += keyp->buf_size;
}
-void key_input (int nkeys, int cache)
+#ifndef R_OK
+#define R_OK 4
+#endif
+
+void key_input (BFiles bfs, int nkeys, int cache)
{
Dict dict;
if (!nkeys)
return ;
}
- dict = dict_open (FNAME_DICT, cache, 1);
+ dict = dict_open (bfs, FNAME_DICT, cache, 1);
if (!dict)
{
logf (LOG_FATAL, "dict_open fail");
exit (1);
}
- if (res_get_match (common_resource, "isam", "c", NULL))
+ if (!res_get_match (common_resource, "isam", "i", NULL))
{
- isamc = isc_open (FNAME_ISAMC, 1, key_isamc_m ());
+ isamc = isc_open (bfs,
+ FNAME_ISAMC, 1, key_isamc_m (common_resource));
if (!isamc)
{
logf (LOG_FATAL, "isc_open fail");
}
else
{
- isam = is_open (FNAME_ISAM, key_compare, 1, sizeof(struct it_key));
+ isam = is_open (bfs, FNAME_ISAM, key_compare, 1,
+ sizeof(struct it_key), common_resource);
if (!isam)
{
logf (LOG_FATAL, "is_open fail");
is_close (isam);
if (isamc)
isc_close (isamc);
-
+
for (i = 1; i<=nkeys; i++)
{
getFnameTmp (rbuf, i);