* Sebastian Hammer, Adam Dickmeiss
*
* $Log: extract.c,v $
- * Revision 1.38 1995-12-04 17:59:21 adam
+ * Revision 1.46 1995-12-15 14:57:16 adam
+ * Bug fix.
+ *
+ * Revision 1.45 1995/12/15 12:37:41 adam
+ * In addRecordKeyAny: Writes key only when attrSet != -1.
+ *
+ * Revision 1.44 1995/12/12 16:00:54 adam
+ * System call sync(2) used after update/commit.
+ * Locking (based on fcntl) uses F_EXLCK and F_SHLCK instead of F_WRLCK
+ * and F_RDLCK.
+ *
+ * Revision 1.43 1995/12/11 09:12:46 adam
+ * The rec_get function returns NULL if record doesn't exist - will
+ * happen in the server if the result set records have been deleted since
+ * the creation of the set (i.e. the search).
+ * The server saves a result temporarily if it is 'volatile', i.e. the
+ * set is register dependent.
+ *
+ * Revision 1.42 1995/12/07 17:38:46 adam
+ * Work locking mechanisms for concurrent updates/commit.
+ *
+ * Revision 1.41 1995/12/06 16:06:42 adam
+ * Better diagnostics. Work on 'real' dictionary deletion.
+ *
+ * Revision 1.40 1995/12/05 16:57:40 adam
+ * More work on regular patterns.
+ *
+ * Revision 1.39 1995/12/05 13:20:18 adam
+ * Bug fix: file_read sometimes returned early EOF.
+ *
+ * Revision 1.38 1995/12/04 17:59:21 adam
* More work on regular expression conversion.
*
* Revision 1.37 1995/12/04 14:22:27 adam
static int records_updated = 0;
static int records_deleted = 0;
-#define MATCH_DICT "match"
-
void key_open (int mem)
{
if (mem < 50000)
key_buf_used = 0;
key_file_no = 0;
- if (!(matchDict = dict_open (MATCH_DICT, 20, 1)))
+ if (!(matchDict = dict_open (GMATCH_DICT, 50, 1)))
{
- logf (LOG_FATAL, "dict_open fail of %s", MATCH_DICT);
+ logf (LOG_FATAL, "dict_open fail of %s", GMATCH_DICT);
exit (1);
}
assert (!records);
w.attrUse = 1016;
addRecordKey (&w);
}
- addRecordKey (p);
+ if (p->attrSet != -1)
+ addRecordKey (p);
}
-#define FILE_READ_BUFSIZE 4096
+#define FILE_READ_BUFSIZE 4096
+
+static int file_noread;
+#if FILE_READ_BUFSIZE
static char *file_buf;
static int file_offset;
static int file_bufsize;
-static int file_noread;
+#endif
static void file_read_start (int fd)
{
+ file_noread = 0;
+#if FILE_READ_BUFSIZE
file_offset = 0;
file_buf = xmalloc (FILE_READ_BUFSIZE);
file_bufsize = read (fd, file_buf, FILE_READ_BUFSIZE);
- file_noread = 0;
+#endif
}
static void file_read_stop (int fd)
{
+#if FILE_READ_BUFSIZE
xfree (file_buf);
file_buf = NULL;
+#endif
}
static int file_read (int fd, char *buf, size_t count)
{
+#if FILE_READ_BUFSIZE
int l = file_bufsize - file_offset;
if (count > l)
if (l > 0)
memcpy (buf, file_buf + file_offset, l);
count = count-l;
- if (count > file_bufsize)
+ if (count > FILE_READ_BUFSIZE)
{
if ((r = read (fd, buf + l, count)) == -1)
{
}
file_bufsize = 0;
file_offset = 0;
- file_noread += r;
- return r;
+ file_noread += l+r;
+ return l+r;
}
file_bufsize = r = read (fd, file_buf, FILE_READ_BUFSIZE);
if (r == -1)
{
file_offset = r;
memcpy (buf + l, file_buf, r);
- file_noread += (l+r);
- return l + r;
+ file_noread += l+r;
+ return l+r;
}
else
{
file_offset += count;
file_noread += count;
return count;
+#else
+ int r;
+ r = read (fd, buf, count);
+ if (r > 0)
+ file_noread += r;
+ return r;
+#endif
}
static int atois (const char **s)
static int recordExtract (SYSNO *sysno, const char *fname,
struct recordGroup *rGroup, int deleteFlag,
- int fd,
- RecType recType,
- const char *subType)
+ int fd, RecType recType, char *subType)
{
struct recExtractCtrl extractCtrl;
int r;
struct recKeys delkeys;
rec = rec_get (records, *sysno);
-
+ assert (rec);
delkeys.buf_used = rec->size[recInfo_delKeys];
delkeys.buf = rec->info[recInfo_delKeys];
flushRecordKeys (*sysno, 0, &delkeys, rec->info[recInfo_databaseName]);
{
if (!delkeys.buf_used)
{
- logf (LOG_WARN, "cannot delete %s - no delete keys", fname);
+ logf (LOG_WARN, "cannot delete %s: storeKeys false",
+ fname);
}
else
{
- SYSNO sysnoz = 0;
logf (LOG_LOG, "delete %s %s", rGroup->recordType, fname);
records_deleted++;
if (matchStr)
- dict_insert (matchDict, matchStr, sizeof(sysnoz), &sysnoz);
+ dict_delete (matchDict, matchStr);
rec_del (records, &rec);
}
return 1;
{
if (!delkeys.buf_used)
{
- logf (LOG_WARN, "cannot update %s - no delete keys",
+ logf (LOG_WARN, "cannot update %s: storeKeys false",
fname);
}
else
{
rec->size[recInfo_storeData] = file_noread;
rec->info[recInfo_storeData] = xmalloc (file_noread);
+#if FILE_READ_BUFSIZE
if (file_noread < FILE_READ_BUFSIZE)
memcpy (rec->info[recInfo_storeData], file_buf, file_noread);
else
+#endif
{
if (lseek (fd, 0L, SEEK_SET) < 0)
{