/*
- * Copyright (C) 1994-1996, Index Data I/S
+ * Copyright (C) 1994-1998, Index Data I/S
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: extract.c,v $
- * Revision 1.73 1997-09-04 13:57:20 adam
+ * Revision 1.77 1998-01-12 15:04:08 adam
+ * The test option (-s) only uses read-lock (and not write lock).
+ *
+ * Revision 1.76 1997/10/27 14:33:04 adam
+ * Moved towards generic character mapping depending on "structure"
+ * field in abstract syntax file. Fixed a few memory leaks. Fixed
+ * bug with negative integers when doing searches with relational
+ * operators.
+ *
+ * Revision 1.75 1997/09/17 12:19:12 adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.74 1997/09/09 13:38:06 adam
+ * Partial port to WIN95/NT.
+ *
+ * Revision 1.73 1997/09/04 13:57:20 adam
* New file extract/retrieve method tellf (added).
* Added O_BINARY for open calls.
*
*/
#include <stdio.h>
#include <assert.h>
+#ifdef WINDOWS
+#include <io.h>
+#else
#include <unistd.h>
+#endif
#include <fcntl.h>
#include <recctrl.h>
}
}
-void key_open (int mem)
+int key_open (BFiles bfs, int mem, int rw)
{
if (!mem)
mem = atoi(res_get_def (common_resource, "memMax", "4"))*1024*1024;
key_buf_used = 0;
key_file_no = 0;
- if (!(matchDict = dict_open (GMATCH_DICT, 50, 1)))
+ if (!(matchDict = dict_open (bfs, GMATCH_DICT, 50, rw)))
{
logf (LOG_FATAL, "dict_open fail of %s", GMATCH_DICT);
- exit (1);
+ return -1;
}
assert (!records);
- records = rec_open (1);
-#if 1
- zti = zebTargetInfo_open (records, 1);
-#endif
+ records = rec_open (bfs, rw);
+ if (!records)
+ {
+ dict_close (matchDict);
+ return -1;
+ }
+ zti = zebTargetInfo_open (records, rw);
+ if (!zti)
+ {
+ rec_close (&records);
+ dict_close (matchDict);
+ return -1;
+ }
+ return 0;
}
struct encode_info {
if (!(outf = fopen (out_fname, "w")))
{
- logf (LOG_FATAL|LOG_ERRNO, "fopen (4) %s", out_fname);
+ logf (LOG_FATAL|LOG_ERRNO, "fopen %s", out_fname);
exit (1);
}
logf (LOG_LOG, "writing section %d", key_file_no);
if (!(outf = fopen (out_fname, "w")))
{
- logf (LOG_FATAL|LOG_ERRNO, "fopen (4) %s", out_fname);
+ logf (LOG_FATAL|LOG_ERRNO, "fopen %s", out_fname);
exit (1);
}
logf (LOG_LOG, "writing section %d", key_file_no);
key_buf_used = 0;
}
-int key_close (void)
+int key_close ()
{
key_flush ();
xfree (key_buf);
{
p->attrSet = 1;
p->attrUse = 1016;
- p->which = Word_String;
+ p->reg_type = 'w';
}
struct recKeys {
memcpy (dst, &attrUse, sizeof(attrUse));
dst += sizeof(attrUse);
}
- switch (p->which)
- {
- case Word_String:
- *dst++ = 'w';
- break;
- case Word_Phrase:
- *dst++ = 'p';
- break;
- case Word_Numeric:
- *dst++ = 'n';
- }
- for (i = 0; p->u.string[i] && i < IT_MAX_WORD-3; i++)
- *dst++ = p->u.string[i];
+ *dst++ = p->reg_type;
+ for (i = 0; p->string[i] && i < IT_MAX_WORD-3; i++)
+ *dst++ = p->string[i];
*dst++ = '\0';
if (!diff)
extractCtrl.subType = subType;
extractCtrl.init = wordInit;
extractCtrl.add = addRecordKey;
+ extractCtrl.dh = rGroup->dh;
reckeys.buf_used = 0;
reckeys.prevAttrUse = -1;
extractCtrl.seekf = file_seek;
extractCtrl.tellf = file_tell;
extractCtrl.endf = file_end;
- extractCtrl.map_chrs_input = map_chrs_input;
- extractCtrl.flagShowRecords = rGroup->flagShowRecords;
- if (rGroup->flagShowRecords)
+ extractCtrl.zebra_maps = rGroup->zebra_maps;
+ extractCtrl.flagShowRecords = !rGroup->flagRw;
+ if (!rGroup->flagRw)
printf ("File: %s %ld\n", fname, (long) recordOffset);
logInfo.fname = fname;
if (r)
{
/* error occured during extraction ... */
- if (!rGroup->flagShowRecords &&
- records_processed < rGroup->fileVerboseLimit)
+ if (rGroup->flagRw &&
+ records_processed < rGroup->fileVerboseLimit)
{
logf (LOG_WARN, "fail %s %s %ld code = %d", rGroup->recordType,
fname, (long) recordOffset, r);
{
/* the extraction process returned no information - the record
is probably empty - unless flagShowRecords is in use */
- if (rGroup->flagShowRecords)
+ if (!rGroup->flagRw)
return 1;
logf (LOG_WARN, "No keys generated for file %s", fname);
logf (LOG_WARN, " The file is probably empty");
/* new record */
if (deleteFlag)
{
- logf (LOG_LOG, "Cannot delete new record");
+ logf (LOG_LOG, "delete %s %s %ld", rGroup->recordType,
+ fname, (long) recordOffset);
+ logf (LOG_WARN, "cannot delete record above (seems new)");
return 1;
}
if (records_processed < rGroup->fileVerboseLimit)