* Sebastian Hammer, Adam Dickmeiss
*
* $Log: extract.c,v $
- * Revision 1.8 1995-09-14 07:48:22 adam
+ * Revision 1.10 1995-09-28 09:19:41 adam
+ * xfree/xmalloc used everywhere.
+ * Extract/retrieve method seems to work for text records.
+ *
+ * Revision 1.9 1995/09/27 12:22:28 adam
+ * More work on extract in record control.
+ * Field name is not in isam keys but in prefix in dictionary words.
+ *
+ * Revision 1.8 1995/09/14 07:48:22 adam
* Record control management.
*
* Revision 1.7 1995/09/11 13:09:32 adam
#include <ctype.h>
#include <alexutil.h>
-#include <rectext.h>
+#include <recctrl.h>
#include "index.h"
static Dict file_idx;
struct it_key key;
char x;
size_t i;
+ char wordPrefix[8];
if (key_offset + 1000 > key_buf_size)
{
xfree (key_buf);
key_buf = new_key_buf;
}
+ sprintf (wordPrefix, "%c%04d", p->attrSet + '0', p->attrUse);
+ strcpy (key_buf + key_offset, wordPrefix);
+ key_offset += strlen (wordPrefix);
switch (p->which)
{
case Word_String:
key_offset++;
key.sysno = key_sysno;
- key.attrSet = p->attrSet;
- key.attrUse = p->attrUse;
key.seqno = p->seqno;
memcpy (key_buf + key_offset, &key, sizeof(key));
key_offset += sizeof(key);
sprintf (ext_res, "fileExtension.%s", ext);
if (!(file_type = res_get (common_resource, ext_res)))
return;
-
+ if (!(rt = recType_byName (file_type)))
+ return;
file_info = dict_lookup (file_idx, kname);
if (!file_info)
{
sysno = sysno_next++;
dict_insert (file_idx, kname, sizeof(sysno), &sysno);
lseek (sys_idx_fd, sysno * SYS_IDX_ENTRY_LEN, SEEK_SET);
+ write (sys_idx_fd, file_type, strlen (file_type)+1);
write (sys_idx_fd, kname, strlen(kname)+1);
}
else
logf (LOG_WARN|LOG_ERRNO, "open %s", fname);
return;
}
- if (!strcmp (file_type, "text"))
- rt = recTypeText;
- else
- return;
extractCtrl.inf = inf;
extractCtrl.subType = "";
extractCtrl.init = wordInit;