* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
- * $Id: d1_marc.c,v 1.21 2002-07-25 12:52:53 adam Exp $
+ * $Id: d1_marc.c,v 1.27 2002-08-28 19:34:50 adam Exp $
*/
static char *get_data(data1_node *n, int *len)
{
char *r;
- data1_node *np = 0;
while (n)
{
if (n->which == DATA1N_data)
{
+ 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)--;
- if (*len != 0)
- return n->u.data.data;
+ *len = *len - i;
+ if (*len > 0)
+ return n->u.data.data + i;
}
if (n->which == DATA1N_tag)
- np = n->child;
- n = n->next;
- if (!n)
- {
- n = np;
- np = 0;
- }
+ n = n->child;
+ else if (n->which == DATA1N_data)
+ n = n->next;
+ else
+ break;
}
r = "";
*len = strlen(r);
return 0;
}
-static int nodetomarc(data1_marctab *p, data1_node *n, int selected,
- char **buf, int *size)
+static int nodetomarc(data1_handle dh,
+ data1_marctab *p, data1_node *n, int selected,
+ char **buf, int *size)
{
int len = 26;
int dlen;
}
if (selected && !field->u.tag.node_selected)
continue;
+
+ subf = field->child;
+ if (!subf)
+ continue;
+
len += 4 + p->length_data_entry + p->length_starting
+ p->length_implementation;
base_address += 3 + p->length_data_entry + p->length_starting
+ p->length_implementation;
- subf = field->child;
if (subf->which == DATA1N_data)
is00X = 1;
+ if (!data1_is_xmlmode(dh))
+ {
+ if (subf->which == DATA1N_tag && !strcmp(subf->u.tag.tag, "@"))
+ is00X = 1;
+ }
+
if (!is00X)
len += p->indicator_length;
continue;
subf = field->child;
+ if (!subf)
+ continue;
if (subf->which == DATA1N_data)
is00X = 1;
+ if (!data1_is_xmlmode(dh))
+ {
+ if (subf->which == DATA1N_tag && !strcmp(subf->u.tag.tag, "@"))
+ is00X = 1;
+ }
if (is_indicator (p, subf))
{
n = data1_get_root_tag (dh, n);
if (!n)
return 0;
- *len = nodetomarc(p, n, selected, buf, size);
+ *len = nodetomarc(dh, p, n, selected, buf, size);
return *buf;
}