* Sebastian Hammer, Adam Dickmeiss
*
* $Log: extract.c,v $
- * Revision 1.35 1995-11-28 14:26:21 adam
+ * 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
+ * Extra arg to recType_byName.
+ * Started work on new regular expression parsed input to
+ * structured records.
+ *
+ * Revision 1.36 1995/11/30 08:34:29 adam
+ * Started work on commit facility.
+ * Changed a few malloc/free to xmalloc/xfree.
+ *
+ * Revision 1.35 1995/11/28 14:26:21 adam
* Bug fix: recordId with constant wasn't right.
* Bug fix: recordId dictionary entry wasn't deleted when needed.
*
{
char *b;
- b = malloc (reckeys.buf_max += 65000);
+ b = xmalloc (reckeys.buf_max += 65000);
if (reckeys.buf_used > 0)
memcpy (b, reckeys.buf, reckeys.buf_used);
- free (reckeys.buf);
+ xfree (reckeys.buf);
reckeys.buf = b;
}
dst = reckeys.buf + reckeys.buf_used;
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)
+ int fd, RecType recType, char *subType)
{
struct recExtractCtrl extractCtrl;
int r;
{
extractCtrl.fd = fd;
/* extract keys */
- extractCtrl.subType = "";
+ extractCtrl.subType = subType;
extractCtrl.init = wordInit;
extractCtrl.add = addRecordKeyAny;
}
}
}
- free (rec->info[recInfo_fileType]);
+ xfree (rec->info[recInfo_fileType]);
rec->info[recInfo_fileType] =
rec_strdup (rGroup->recordType, &rec->size[recInfo_fileType]);
- free (rec->info[recInfo_filename]);
+ xfree (rec->info[recInfo_filename]);
rec->info[recInfo_filename] =
rec_strdup (fname, &rec->size[recInfo_filename]);
- free (rec->info[recInfo_delKeys]);
+ xfree (rec->info[recInfo_delKeys]);
if (reckeys.buf_used > 0 && rGroup->flagStoreKeys == 1)
{
- rec->info[recInfo_delKeys] = malloc (reckeys.buf_used);
+ rec->info[recInfo_delKeys] = xmalloc (reckeys.buf_used);
rec->size[recInfo_delKeys] = reckeys.buf_used;
memcpy (rec->info[recInfo_delKeys], reckeys.buf,
rec->size[recInfo_delKeys]);
rec->size[recInfo_delKeys] = 0;
}
- free (rec->info[recInfo_storeData]);
+ xfree (rec->info[recInfo_storeData]);
if (rGroup->flagStoreData == 1)
{
rec->size[recInfo_storeData] = file_noread;
- rec->info[recInfo_storeData] = malloc (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)
{
rec->info[recInfo_storeData] = NULL;
rec->size[recInfo_storeData] = 0;
}
- free (rec->info[recInfo_databaseName]);
+ xfree (rec->info[recInfo_databaseName]);
rec->info[recInfo_databaseName] =
rec_strdup (rGroup->databaseName, &rec->size[recInfo_databaseName]);
char gprefix[128];
char ext[128];
char ext_res[128];
+ char subType[128];
RecType recType;
struct recordGroup rGroupM;
struct recordGroup *rGroup = &rGroupM;
logf (LOG_LOG, "? record %s", fname);
return 0;
}
- if (!(recType = recType_byName (rGroup->recordType)))
+ if (!(recType = recType_byName (rGroup->recordType, subType)))
{
logf (LOG_WARN, "No such record type: %s", rGroup->recordType);
return 0;
}
}
file_read_start (fd);
- recordExtract (sysno, fname, rGroup, deleteFlag, fd, recType);
+ recordExtract (sysno, fname, rGroup, deleteFlag, fd, recType, subType);
file_read_stop (fd);
if (fd != -1)
close (fd);