projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed log message for adelete action
[idzebra-moved-to-github.git]
/
index
/
rectext.c
diff --git
a/index/rectext.c
b/index/rectext.c
index
3a06fc3
..
8f5fba6
100644
(file)
--- a/
index/rectext.c
+++ b/
index/rectext.c
@@
-1,5
+1,5
@@
-/* $Id: rectext.c,v 1.3 2006-08-22 13:39:27 adam Exp $
- Copyright (C) 1995-2006
+/* $Id: rectext.c,v 1.7 2007-10-29 09:25:40 adam Exp $
+ Copyright (C) 1995-2007
Index Data ApS
This file is part of the Zebra server.
Index Data ApS
This file is part of the Zebra server.
@@
-27,12
+27,13
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <idzebra/util.h>
#include <idzebra/recctrl.h>
#include <idzebra/util.h>
#include <idzebra/recctrl.h>
+#include <yaz/oid_db.h>
struct filter_info {
char *sep;
};
struct filter_info {
char *sep;
};
-static void *filter_init (Res res, RecType recType)
+static void *filter_init(Res res, RecType recType)
{
struct filter_info *tinfo = (struct filter_info *) xmalloc(sizeof(*tinfo));
tinfo->sep = 0;
{
struct filter_info *tinfo = (struct filter_info *) xmalloc(sizeof(*tinfo));
tinfo->sep = 0;
@@
-49,11
+50,11
@@
static ZEBRA_RES filter_config(void *clientData, Res res, const char *args)
return ZEBRA_OK;
}
return ZEBRA_OK;
}
-static void filter_destroy (void *clientData)
+static void filter_destroy(void *clientData)
{
struct filter_info *tinfo = clientData;
{
struct filter_info *tinfo = clientData;
- xfree (tinfo->sep);
- xfree (tinfo);
+ xfree(tinfo->sep);
+ xfree(tinfo);
}
struct buf_info {
}
struct buf_info {
@@
-63,18
+64,18
@@
struct buf_info {
int max;
};
int max;
};
-static struct buf_info *buf_open (struct recExtractCtrl *p)
+static struct buf_info *buf_open(struct recExtractCtrl *p)
{
{
- struct buf_info *fi = (struct buf_info *) xmalloc (sizeof(*fi));
+ struct buf_info *fi = (struct buf_info *) xmalloc(sizeof(*fi));
fi->p = p;
fi->p = p;
- fi->buf = (char *) xmalloc (4096);
+ fi->buf = (char *) xmalloc(4096);
fi->offset = 1;
fi->max = 1;
return fi;
}
fi->offset = 1;
fi->max = 1;
return fi;
}
-static int buf_getchar (struct filter_info *tinfo, struct buf_info *fi, char *dst)
+static int buf_getchar(struct filter_info *tinfo, struct buf_info *fi, char *dst)
{
if (fi->offset >= fi->max)
{
{
if (fi->offset >= fi->max)
{
@@
-96,19
+97,19
@@
static int buf_getchar (struct filter_info *tinfo, struct buf_info *fi, char *ds
return 1;
}
return 1;
}
-static void buf_close (struct buf_info *fi)
+static void buf_close(struct buf_info *fi)
{
{
- xfree (fi->buf);
- xfree (fi);
+ xfree(fi->buf);
+ xfree(fi);
}
}
-static int filter_extract (void *clientData, struct recExtractCtrl *p)
+static int filter_extract(void *clientData, struct recExtractCtrl *p)
{
struct filter_info *tinfo = clientData;
char w[512];
RecWord recWord;
int r;
{
struct filter_info *tinfo = clientData;
char w[512];
RecWord recWord;
int r;
- struct buf_info *fi = buf_open (p);
+ struct buf_info *fi = buf_open(p);
int no_read = 0;
#if 0
int no_read = 0;
#if 0
@@
-120,11
+121,11
@@
static int filter_extract (void *clientData, struct recExtractCtrl *p)
{
int i = 0;
{
int i = 0;
- r = buf_getchar (tinfo, fi, w);
+ r = buf_getchar(tinfo, fi, w);
while (r > 0 && i < 511 && w[i] != '\n' && w[i] != '\r')
{
i++;
while (r > 0 && i < 511 && w[i] != '\n' && w[i] != '\r')
{
i++;
- r = buf_getchar (tinfo, fi, w + i);
+ r = buf_getchar(tinfo, fi, w + i);
}
if (i)
{
}
if (i)
{
@@
-134,13
+135,13
@@
static int filter_extract (void *clientData, struct recExtractCtrl *p)
(*p->tokenAdd)(&recWord);
}
} while (r > 0);
(*p->tokenAdd)(&recWord);
}
} while (r > 0);
- buf_close (fi);
+ buf_close(fi);
if (no_read == 0)
return RECCTRL_EXTRACT_EOF;
return RECCTRL_EXTRACT_OK;
}
if (no_read == 0)
return RECCTRL_EXTRACT_EOF;
return RECCTRL_EXTRACT_OK;
}
-static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
+static int filter_retrieve(void *clientData, struct recRetrieveCtrl *p)
{
int r, filter_ptr = 0;
static char *filter_buf = NULL;
{
int r, filter_ptr = 0;
static char *filter_buf = NULL;
@@
-176,11
+177,11
@@
static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
char *nb;
filter_size = 2*filter_size + 8192;
char *nb;
filter_size = 2*filter_size + 8192;
- nb = (char *) xmalloc (filter_size);
+ nb = (char *) xmalloc(filter_size);
if (filter_buf)
{
if (filter_buf)
{
- memcpy (nb, filter_buf, filter_ptr);
- xfree (filter_buf);
+ memcpy(nb, filter_buf, filter_ptr);
+ xfree(filter_buf);
}
filter_buf = nb;
}
}
filter_buf = nb;
}
@@
-188,15
+189,15
@@
static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
{
if (p->score >= 0)
{
{
if (p->score >= 0)
{
- sprintf (filter_buf, "Rank: %d\n", p->score);
+ sprintf(filter_buf, "Rank: %d\n", p->score);
filter_ptr = strlen(filter_buf);
}
filter_ptr = strlen(filter_buf);
}
- sprintf (filter_buf + filter_ptr, "Local Number: " ZINT_FORMAT "\n",
+ sprintf(filter_buf + filter_ptr, "Local Number: " ZINT_FORMAT "\n",
p->localno);
filter_ptr = strlen(filter_buf);
if (p->fname)
{
p->localno);
filter_ptr = strlen(filter_buf);
if (p->fname)
{
- sprintf (filter_buf + filter_ptr, "Filename: %s\n", p->fname);
+ sprintf(filter_buf + filter_ptr, "Filename: %s\n", p->fname);
filter_ptr = strlen(filter_buf);
}
strcpy(filter_buf+filter_ptr++, "\n");
filter_ptr = strlen(filter_buf);
}
strcpy(filter_buf+filter_ptr++, "\n");
@@
-211,9
+212,9
@@
static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
filter_buf[filter_ptr] = '\0';
if (elementSetName)
{
filter_buf[filter_ptr] = '\0';
if (elementSetName)
{
- if (!strcmp (elementSetName, "B"))
+ if (!strcmp(elementSetName, "B"))
no_lines = 4;
no_lines = 4;
- if (!strcmp (elementSetName, "M"))
+ if (!strcmp(elementSetName, "M"))
no_lines = 20;
}
if (no_lines)
no_lines = 20;
}
if (no_lines)
@@
-221,7
+222,7
@@
static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
char *p = filter_buf;
int i = 0;
char *p = filter_buf;
int i = 0;
- while (++i <= no_lines && (p = strchr (p, '\n')))
+ while (++i <= no_lines && (p = strchr(p, '\n')))
p++;
if (p)
{
p++;
if (p)
{
@@
-229,7
+230,7
@@
static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
filter_ptr = p-filter_buf;
}
}
filter_ptr = p-filter_buf;
}
}
- p->output_format = VAL_SUTRS;
+ p->output_format = yaz_oid_recsyn_sutrs;
p->rec_buf = filter_buf;
p->rec_len = filter_ptr;
return 0;
p->rec_buf = filter_buf;
p->rec_len = filter_ptr;
return 0;