* Sebastian Hammer, Adam Dickmeiss
*
* $Log: extract.c,v $
- * Revision 1.34 1995-11-28 09:09:38 adam
+ * 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.
+ *
+ * Revision 1.34 1995/11/28 09:09:38 adam
* Zebra config renamed.
* Use setting 'recordId' to identify record now.
* Bug fix in recindex.c: rec_release_blocks was invokeded even
{
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;
special[spec_len] = '\0';
s = s1;
- if (strcmp (special, "group"))
+ if (!strcmp (special, "group"))
spec_src = rGroup->groupName;
- else if (strcmp (special, "database"))
+ else if (!strcmp (special, "database"))
spec_src = rGroup->databaseName;
- else if (strcmp (special, "filename"))
+ else if (!strcmp (special, "filename"))
spec_src = fname;
- else if (strcmp (special, "type"))
+ else if (!strcmp (special, "type"))
spec_src = rGroup->recordType;
else
spec_src = NULL;
while (*s && *s != stopMarker)
{
if (i < 63)
- tmpString[i++] = *s;
+ tmpString[i++] = *s++;
}
if (*s)
s++;
static int recordExtract (SYSNO *sysno, const char *fname,
struct recordGroup *rGroup, int deleteFlag,
int fd,
- RecType recType)
+ RecType recType,
+ const char *subType)
{
struct recExtractCtrl extractCtrl;
int r;
{
extractCtrl.fd = fd;
/* extract keys */
- extractCtrl.subType = "";
+ extractCtrl.subType = subType;
extractCtrl.init = wordInit;
extractCtrl.add = addRecordKeyAny;
{
if (deleteFlag)
{
- logf (LOG_LOG, "? record %s", fname);
+ logf (LOG_LOG, "? %s", fname);
return 1;
}
- logf (LOG_LOG, "add %s record %s", rGroup->recordType, fname);
+ logf (LOG_LOG, "add %s %s", rGroup->recordType, fname);
rec = rec_new (records);
*sysno = rec->sysno;
if (matchStr)
+ {
dict_insert (matchDict, matchStr, sizeof(*sysno), sysno);
+ }
flushRecordKeys (*sysno, 1, &reckeys, rGroup->databaseName);
records_inserted++;
{
if (!delkeys.buf_used)
{
- logf (LOG_WARN, "cannot delete %s - no delete keys",
- fname);
+ logf (LOG_WARN, "cannot delete %s - no delete keys", fname);
}
else
- logf (LOG_LOG, "delete %s record %s", rGroup->recordType,
- fname);
- records_deleted++;
- rec_del (records, &rec);
+ {
+ SYSNO sysnoz = 0;
+ logf (LOG_LOG, "delete %s %s", rGroup->recordType, fname);
+ records_deleted++;
+ if (matchStr)
+ dict_insert (matchDict, matchStr, sizeof(sysnoz), &sysnoz);
+ rec_del (records, &rec);
+ }
return 1;
}
else
}
else
{
- logf (LOG_LOG, "update %s record %s", rGroup->recordType,
+ logf (LOG_LOG, "update %s %s", rGroup->recordType,
fname);
flushRecordKeys (*sysno, 1, &reckeys, rGroup->databaseName);
records_updated++;
}
}
}
- 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_noread < FILE_READ_BUFSIZE)
memcpy (rec->info[recInfo_storeData], file_buf, file_noread);
else
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;
sprintf (ext_res, "%srecordType", gprefix);
if (!(rGroup->recordType = res_get (common_resource, ext_res)))
{
- logf (LOG_LOG, "? record %s", fname);
+ logf (LOG_LOG, "? %s", fname);
return 0;
}
}
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);