-/* $Id: d1_marc.c,v 1.11 2005-02-02 08:03:22 adam Exp $
+/* $Id: d1_marc.c,v 1.12 2005-02-02 19:37:27 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
* Locate some data under this node. This routine should handle variants
* prettily.
*/
-static char *get_data(data1_node *n, int *len)
+static char *get_data(data1_node *n, int *len, int chop)
{
char *r;
{
int i;
*len = n->u.data.len;
-
- for (i = 0; i<*len; i++)
- if (!d1_isspace(n->u.data.data[i]))
- break;
- while (*len && d1_isspace(n->u.data.data[*len - 1]))
- (*len)--;
- *len = *len - i;
- if (*len > 0)
- return n->u.data.data + i;
+
+ if (chop)
+ {
+ for (i = 0; i<*len; i++)
+ if (!d1_isspace(n->u.data.data[i]))
+ break;
+ while (*len && d1_isspace(n->u.data.data[*len - 1]))
+ (*len)--;
+ *len = *len - i;
+ if (*len > 0)
+ return n->u.data.data + i;
+ }
+ else
+ if (*len > 0)
+ return n->u.data.data;
}
if (n->which == DATA1N_tag)
n = n->child;
else if (!strcmp(field->u.tag.tag, "leader"))
{
int dlen = 0;
- char *dbuf = get_data(subf, &dlen);
+ char *dbuf = get_data(subf, &dlen, 0);
if (dlen > 24)
dlen = 24;
if (dbuf && dlen > 0)
{
if (!control_field)
len += p->identifier_length;
- get_data(subf, &dlen);
+ get_data(subf, &dlen, control_field ? 0 : 1);
len += dlen;
}
}
memcpy (op + data_p+1, identifier, p->identifier_length-1);
data_p += p->identifier_length;
}
- data = get_data(subf, &dlen);
+ data = get_data(subf, &dlen, control_field ? 0 : 1);
memcpy (op + data_p, data, dlen);
data_p += dlen;
}