/*
- * Copyright (C) 1994-1995, Index Data I/S
+ * Copyright (C) 1994-1998, Index Data I/S
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: rectext.c,v $
- * Revision 1.3 1996-11-01 09:00:33 adam
+ * Revision 1.6 1998-02-10 12:03:06 adam
+ * Implemented Sort.
+ *
+ * Revision 1.5 1997/10/27 14:33:06 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.4 1996/11/04 14:09:16 adam
+ * Minor changes.
+ *
+ * Revision 1.3 1996/11/01 09:00:33 adam
* This simple "text" format now supports element specs B and M.
*
* Revision 1.2 1996/10/29 14:02:45 adam
int buf_read (struct buf_info *fi, char *dst)
{
- if (fi->max <= 0)
- return 0;
if (fi->offset >= fi->max)
{
+ if (fi->max <= 0)
+ return 0;
fi->max = (*fi->p->readf)(fi->p->fh, fi->buf, 4096);
fi->offset = 0;
if (fi->max <= 0)
static int text_extract (struct recExtractCtrl *p)
{
- char w[256];
+ char w[512];
RecWord recWord;
int r, seqno = 1;
struct buf_info *fi = buf_open (p);
- (*p->init)(&recWord);
- recWord.which = Word_String;
+ (*p->init)(p, &recWord);
+ recWord.reg_type = 'w';
do
{
int i = 0;
r = buf_read (fi, w);
- while (r > 0 && i < 255 && isalnum(w[i]))
+ while (r > 0 && i < 511 && w[i] != '\n' && w[i] != '\r')
{
i++;
r = buf_read (fi, w + i);
}
if (i)
{
- int j;
- for (j = 0; j<i; j++)
- w[j] = tolower(w[j]);
- w[i] = 0;
recWord.seqno = seqno++;
- recWord.u.string = w;
+ recWord.string = w;
+ recWord.length = i;
(*p->add)(&recWord);
}
} while (r > 0);