projects
/
idzebra-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1c8acf0
)
Use WRBUF instead of huge stack var
author
Adam Dickmeiss
<adam@indexdata.dk>
Wed, 16 Jun 2004 22:12:30 +0000
(22:12 +0000)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Wed, 16 Jun 2004 22:12:30 +0000
(22:12 +0000)
recctrl/marcread.c
patch
|
blob
|
history
diff --git
a/recctrl/marcread.c
b/recctrl/marcread.c
index
8699373
..
323e96f
100644
(file)
--- a/
recctrl/marcread.c
+++ b/
recctrl/marcread.c
@@
-1,5
+1,5
@@
-/* $Id: marcread.c,v 1.23 2003-12-10 23:30:15 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
+/* $Id: marcread.c,v 1.24 2004-06-16 22:12:30 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
This file is part of the Zebra server.
Index Data Aps
This file is part of the Zebra server.
@@
-275,6
+275,7
@@
static data1_node *grs_read_iso2709 (struct grs_read_info *p, int marc_xml)
}
return res_root;
}
}
return res_root;
}
+
/*
* Locate some data under this node. This routine should handle variants
* prettily.
/*
* Locate some data under this node. This routine should handle variants
* prettily.
@@
-310,6
+311,7
@@
static char *get_data(data1_node *n, int *len)
*len = strlen(r);
return r;
}
*len = strlen(r);
return r;
}
+
static data1_node *lookup_subfield(data1_node *node, const char *name)
{
data1_node *p;
static data1_node *lookup_subfield(data1_node *node, const char *name)
{
data1_node *p;
@@
-321,7
+323,9
@@
static data1_node *lookup_subfield(data1_node *node, const char *name)
}
return 0;
}
}
return 0;
}
-static inline_subfield *lookup_inline_subfield(inline_subfield *pisf, const char *name)
+
+static inline_subfield *lookup_inline_subfield(inline_subfield *pisf,
+ const char *name)
{
inline_subfield *p;
{
inline_subfield *p;
@@
-332,7
+336,9
@@
static inline_subfield *lookup_inline_subfield(inline_subfield *pisf, const char
}
return 0;
}
}
return 0;
}
-static inline_subfield *cat_inline_subfield(mc_subfield *psf, char *buf, inline_subfield *pisf)
+
+static inline_subfield *cat_inline_subfield(mc_subfield *psf, WRBUF buf,
+ inline_subfield *pisf)
{
mc_subfield *p;
{
mc_subfield *p;
@@
-346,20
+352,23
@@
static inline_subfield *cat_inline_subfield(mc_subfield *psf, char *buf, inline_
{
if (strcmp(p->prefix, "_"))
{
{
if (strcmp(p->prefix, "_"))
{
- strcat(strcat(buf, " "), p->prefix);
+ wrbuf_puts(buf, " ");
+ wrbuf_puts(buf, p->prefix);
}
if (p->interval.start == -1)
{
}
if (p->interval.start == -1)
{
- strcat(buf, found->data);
+ wrbuf_puts(buf, found->data);
}
else
{
}
else
{
- strncat(buf, found->data+p->interval.start,
- p->interval.end-p->interval.start+1);
+ wrbuf_write(buf, found->data+p->interval.start,
+ p->interval.end-p->interval.start);
+ wrbuf_puts(buf, "");
}
if (strcmp(p->suffix, "_"))
{
}
if (strcmp(p->suffix, "_"))
{
- strcat(strcat(buf, p->suffix), " ");
+ wrbuf_puts(buf, p->suffix);
+ wrbuf_puts(buf, " ");
}
#if MARCOMP_DEBUG
logf(LOG_LOG, "cat_inline_subfield(): add subfield $%s", found->name);
}
#if MARCOMP_DEBUG
logf(LOG_LOG, "cat_inline_subfield(): add subfield $%s", found->name);
@@
-393,15
+402,16
@@
static inline_subfield *cat_inline_subfield(mc_subfield *psf, char *buf, inline_
}
if (found)
{
}
if (found)
{
- strcat(buf, " (");
+ wrbuf_puts(buf, " (");
pisf = cat_inline_subfield(p->u.child, buf, pisf);
pisf = cat_inline_subfield(p->u.child, buf, pisf);
- strcat(buf, ") ");
+ wrbuf_puts(buf, ") ");
}
}
}
return pisf;
}
}
}
}
return pisf;
}
-static void cat_inline_field(mc_field *pf, char *buf, data1_node *subfield)
+
+static void cat_inline_field(mc_field *pf, WRBUF buf, data1_node *subfield)
{
if (!pf || !subfield)
return;
{
if (!pf || !subfield)
return;
@@
-439,7
+449,7
@@
static void cat_inline_field(mc_field *pf, char *buf, data1_node *subfield)
{
if (!pf->list && pif->list)
{
{
if (!pf->list && pif->list)
{
- strcat(buf, pif->list->data);
+ wrbuf_puts(buf, pif->list->data);
}
else
{
}
else
{
@@
-460,14
+470,14
@@
static void cat_inline_field(mc_field *pf, char *buf, data1_node *subfield)
/*
add separator for inline fields
*/
/*
add separator for inline fields
*/
- if (strlen(buf))
+ if (wrbuf_len(buf))
{
{
- strcat(buf, "\n");
+ wrbuf_puts(buf, "\n");
}
}
else
{
}
}
else
{
- logf(LOG_WARN, "In-line field %s missed -- indicators does not match", pif->name);
+ logf(LOG_WARN, "In-line field %s missed -- indicators do not match", pif->name);
}
}
}
}
}
}
@@
-477,7
+487,9
@@
static void cat_inline_field(mc_field *pf, char *buf, data1_node *subfield)
logf(LOG_LOG, "cat_inline_field(): got buffer {%s}", buf);
#endif
}
logf(LOG_LOG, "cat_inline_field(): got buffer {%s}", buf);
#endif
}
-static data1_node *cat_subfield(mc_subfield *psf, char *buf, data1_node *subfield)
+
+static data1_node *cat_subfield(mc_subfield *psf, WRBUF buf,
+ data1_node *subfield)
{
mc_subfield *p;
{
mc_subfield *p;
@@
-493,7
+505,8
@@
static data1_node *cat_subfield(mc_subfield *psf, char *buf, data1_node *subfiel
if (strcmp(p->prefix, "_"))
{
if (strcmp(p->prefix, "_"))
{
- strcat(strcat(buf, " "), p->prefix);
+ wrbuf_puts(buf, " ");
+ wrbuf_puts(buf, p->prefix);
}
if (p->u.in_line)
}
if (p->u.in_line)
@@
-502,16
+515,18
@@
static data1_node *cat_subfield(mc_subfield *psf, char *buf, data1_node *subfiel
}
else if (p->interval.start == -1)
{
}
else if (p->interval.start == -1)
{
- strcat(buf, get_data(found, &len));
+ wrbuf_puts(buf, get_data(found, &len));
}
else
{
}
else
{
- strncat(buf, get_data(found, &len)+p->interval.start,
- p->interval.end-p->interval.start+1);
+ wrbuf_write(buf, get_data(found, &len)+p->interval.start,
+ p->interval.end-p->interval.start);
+ wrbuf_puts(buf, "");
}
if (strcmp(p->suffix, "_"))
{
}
if (strcmp(p->suffix, "_"))
{
- strcat(strcat(buf, p->suffix), " ");
+ wrbuf_puts(buf, p->suffix);
+ wrbuf_puts(buf, " ");
}
#if MARCOMP_DEBUG
logf(LOG_LOG, "cat_subfield(): add subfield $%s", found->u.tag.tag);
}
#if MARCOMP_DEBUG
logf(LOG_LOG, "cat_subfield(): add subfield $%s", found->u.tag.tag);
@@
-544,15
+559,17
@@
static data1_node *cat_subfield(mc_subfield *psf, char *buf, data1_node *subfiel
}
if (found)
{
}
if (found)
{
- strcat(buf, " (");
+ wrbuf_puts(buf, " (");
subfield = cat_subfield(p->u.child, buf, subfield);
subfield = cat_subfield(p->u.child, buf, subfield);
- strcat(buf, ") ");
+ wrbuf_puts(buf, ") ");
}
}
}
return subfield;
}
}
}
}
return subfield;
}
-static data1_node *cat_field(struct grs_read_info *p, mc_field *pf, char *buf, data1_node *field)
+
+static data1_node *cat_field(struct grs_read_info *p, mc_field *pf,
+ WRBUF buf, data1_node *field)
{
data1_node *subfield;
int ind1, ind2;
{
data1_node *subfield;
int ind1, ind2;
@@
-579,12
+596,13
@@
static data1_node *cat_field(struct grs_read_info *p, mc_field *pf, char *buf, d
if (pf->interval.start == -1)
{
if (pf->interval.start == -1)
{
- strcat(buf, get_data(field, &len));
+ wrbuf_puts(buf, get_data(field, &len));
}
else
{
}
else
{
- strncat(buf, get_data(field, &len)+pf->interval.start,
- pf->interval.end-pf->interval.start+1);
+ wrbuf_write(buf, get_data(field, &len)+pf->interval.start,
+ pf->interval.end-pf->interval.start);
+ wrbuf_puts(buf, "");
}
#if MARCOMP_DEBUG
logf(LOG_LOG, "cat_field(): got buffer {%s}", buf);
}
#if MARCOMP_DEBUG
logf(LOG_LOG, "cat_field(): got buffer {%s}", buf);
@@
-623,6
+641,7
@@
static data1_node *cat_field(struct grs_read_info *p, mc_field *pf, char *buf, d
return field->next;
}
return field->next;
}
+
static int is_empty(char *s)
{
char *p = s;
static int is_empty(char *s)
{
char *p = s;
@@
-634,14
+653,16
@@
static int is_empty(char *s)
}
return 1;
}
}
return 1;
}
-static void parse_data1_tree(struct grs_read_info *p, const char *mc_stmnt, data1_node *root)
+
+static void parse_data1_tree(struct grs_read_info *p, const char *mc_stmnt,
+ data1_node *root)
{
data1_marctab *marctab = root->u.root.absyn->marc;
data1_node *top = root->child;
data1_node *field;
mc_context *c;
mc_field *pf;
{
data1_marctab *marctab = root->u.root.absyn->marc;
data1_node *top = root->child;
data1_node *field;
mc_context *c;
mc_field *pf;
- char buf[1000000];
+ WRBUF buf;
c = mc_mk_context(mc_stmnt+3);
c = mc_mk_context(mc_stmnt+3);
@@
-655,6
+676,7
@@
static void parse_data1_tree(struct grs_read_info *p, const char *mc_stmnt, data
mc_destroy_context(c);
return;
}
mc_destroy_context(c);
return;
}
+ buf = wrbuf_alloc();
#if MARCOMP_DEBUG
logf(LOG_LOG, "parse_data1_tree(): statement -{%s}", mc_stmnt);
#endif
#if MARCOMP_DEBUG
logf(LOG_LOG, "parse_data1_tree(): statement -{%s}", mc_stmnt);
#endif
@@
-678,13
+700,16
@@
static void parse_data1_tree(struct grs_read_info *p, const char *mc_stmnt, data
if (!yaz_matchstr(field->u.tag.tag, pf->name))
{
data1_node *new;
if (!yaz_matchstr(field->u.tag.tag, pf->name))
{
data1_node *new;
- char *pb = buf;
+ char *pb;
#if MARCOMP_DEBUG
logf(LOG_LOG, "parse_data1_tree(): try field {%s}", field->u.tag.tag);
#endif
#if MARCOMP_DEBUG
logf(LOG_LOG, "parse_data1_tree(): try field {%s}", field->u.tag.tag);
#endif
- *buf = '\0';
+ wrbuf_rewind(buf);
+ wrbuf_puts(buf, "");
+
field = cat_field(p, pf, buf, field);
field = cat_field(p, pf, buf, field);
+ pb = wrbuf_buf(buf);
for (pb = strtok(pb, "\n"); pb; pb = strtok(NULL, "\n"))
{
if (!is_empty(pb))
for (pb = strtok(pb, "\n"); pb; pb = strtok(NULL, "\n"))
{
if (!is_empty(pb))
@@
-702,6
+727,7
@@
static void parse_data1_tree(struct grs_read_info *p, const char *mc_stmnt, data
}
mc_destroy_field(pf);
mc_destroy_context(c);
}
mc_destroy_field(pf);
mc_destroy_context(c);
+ wrbuf_free(buf, 1);
}
data1_node *grs_read_marcxml(struct grs_read_info *p)
}
data1_node *grs_read_marcxml(struct grs_read_info *p)
@@
-723,7
+749,6
@@
data1_node *grs_read_marcxml(struct grs_read_info *p)
return root;
}
return root;
}
-
data1_node *grs_read_marc(struct grs_read_info *p)
{
data1_node *root = grs_read_iso2709(p, 0);
data1_node *grs_read_marc(struct grs_read_info *p)
{
data1_node *root = grs_read_iso2709(p, 0);
@@
-742,6
+767,7
@@
data1_node *grs_read_marc(struct grs_read_info *p)
}
return root;
}
}
return root;
}
+
static void *grs_init_marc(void)
{
return 0;
static void *grs_init_marc(void)
{
return 0;