-/* $Id: marcread.c,v 1.3 2006-08-22 13:39:27 adam Exp $
- Copyright (C) 1995-2006
- Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) 1995-2008 Index Data
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
yaz_log (YLOG_WARN, "MARC record length < 25, is %d", record_length);
return NULL;
}
- /* read remaining part - attempt to read one byte furhter... */
- read_bytes = p->stream->readf(p->stream, buf+5, record_length-4);
+
+ read_bytes = p->stream->readf(p->stream, buf+5, record_length-5);
if (read_bytes < record_length-5)
{
yaz_log (YLOG_WARN, "Couldn't read whole MARC record");
return NULL;
}
- if (read_bytes == record_length - 4)
+ /* skip until we meet a record separator */
+ while (buf[record_length-1] != ISO2709_RS)
+ {
+ if (record_length > sizeof(buf)-2)
+ break;
+ read_bytes = p->stream->readf(p->stream, buf+record_length, 1);
+ if (read_bytes != 1)
+ break;
+ record_length++;
+ }
+ /* read one byte ahead to see if there is more ... */
+ read_bytes = p->stream->readf(p->stream, buf+record_length, 1);
+ if (read_bytes == 1)
{
off_t cur_offset = p->stream->tellf(p->stream);
- if (cur_offset <= 27)
- return NULL;
if (p->stream->endf)
{
off_t end_offset = cur_offset - 1;
p->stream->endf(p->stream, &end_offset);
}
}
+
absynName = mi->type;
res_root = data1_mk_root (p->dh, p->mem, absynName);
if (!res_root)
else
res_top = data1_mk_tag (p->dh, p->mem, absynName, 0, res_root);
- if ((marctab = data1_absyn_getmarctab(p->dh, res_root->u.root.absyn)))
+ if ((marctab = data1_absyn_getmarctab(p->dh, res_root)))
{
memcpy(marctab->leader, buf, 24);
memcpy(marctab->implementation_codes, buf+6, 4);
static void parse_data1_tree(struct grs_read_info *p, const char *mc_stmnt,
data1_node *root)
{
- data1_marctab *marctab = data1_absyn_getmarctab(p->dh, root->u.root.absyn);
+ data1_marctab *marctab = data1_absyn_getmarctab(p->dh, root);
data1_node *top = root->child;
data1_node *field;
mc_context *c;
yaz_log(YLOG_LOG,"parse_data1_tree(): try LEADER from {%d} to {%d} positions",
pf->interval.start, pf->interval.end);
#endif
- new = data1_mk_tag_n(p->dh, p->mem, mc_stmnt, strlen(mc_stmnt), 0, top);
- data1_mk_text_n(p->dh, p->mem, marctab->leader+pf->interval.start,
- pf->interval.end-pf->interval.start+1, new);
+ if (marctab)
+ {
+ new = data1_mk_tag_n(p->dh, p->mem, mc_stmnt, strlen(mc_stmnt), 0, top);
+ data1_mk_text_n(p->dh, p->mem, marctab->leader+pf->interval.start,
+ pf->interval.end-pf->interval.start+1, new);
+ }
}
else
{
field = cat_field(p, pf, buf, field);
- pb = wrbuf_buf(buf);
+ wrbuf_cstr(buf);
+ pb = wrbuf_buf(buf);
for (pb = strtok(pb, "\n"); pb; pb = strtok(NULL, "\n"))
{
- if (!is_empty(pb))
- {
- new = data1_mk_tag_n(p->dh, p->mem, mc_stmnt, strlen(mc_stmnt), 0, top);
- data1_mk_text_n(p->dh, p->mem, pb, strlen(pb), new);
- }
+ if (!is_empty(pb))
+ {
+ new = data1_mk_tag_n(p->dh, p->mem, mc_stmnt, strlen(mc_stmnt), 0, top);
+ data1_mk_text_n(p->dh, p->mem, pb, strlen(pb), new);
+ }
}
}
else
}
mc_destroy_field(pf);
mc_destroy_context(c);
- wrbuf_free(buf, 1);
+ wrbuf_destroy(buf);
}
data1_node *grs_read_marcxml(struct grs_read_info *p)
if (!root)
return 0;
- for (e = data1_absyn_getelements(p->dh, root->u.root.absyn); e; e=e->next)
+ for (e = data1_absyn_getelements(p->dh, root); e; e=e->next)
{
data1_tag *tag = e->tag;
if (!root)
return 0;
- for (e = data1_absyn_getelements(p->dh, root->u.root.absyn); e; e=e->next)
+ for (e = data1_absyn_getelements(p->dh, root); e; e=e->next)
{
data1_tag *tag = e->tag;