* Copyright (C) 1995-2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: marcdisp.c,v 1.28 2006-04-20 20:35:02 adam Exp $
+ * $Id: marcdisp.c,v 1.30 2006-05-23 13:17:30 adam Exp $
*/
/**
n->u.comment = nmem_strdup(mt->nmem, comment);
}
-#if HAVE_XML2
-static char *yaz_marc_get_xml_text(const xmlNode *ptr_cdata, NMEM nmem)
-{
- char *cdata;
- int len = 0;
- const xmlNode *ptr;
-
- for (ptr = ptr_cdata; ptr; ptr = ptr->next)
- if (ptr->type == XML_TEXT_NODE)
- len += xmlStrlen(ptr->content);
- cdata = (char *) nmem_malloc(nmem, len+1);
- *cdata = '\0';
- for (ptr = ptr_cdata; ptr; ptr = ptr->next)
- if (ptr->type == XML_TEXT_NODE)
- strcat(cdata, (const char *) ptr->content);
- return cdata;
-}
-#endif
-
void yaz_marc_cprintf(yaz_marc_t mt, const char *fmt, ...)
{
va_list ap;
{
struct yaz_marc_node *n = yaz_marc_add_node(mt);
n->which = YAZ_MARC_CONTROLFIELD;
- n->u.controlfield.tag = yaz_marc_get_xml_text(ptr_tag, mt->nmem);
- n->u.controlfield.data = yaz_marc_get_xml_text(ptr_data, mt->nmem);
+ n->u.controlfield.tag = nmem_text_node_cdata(ptr_tag, mt->nmem);
+ n->u.controlfield.data = nmem_text_node_cdata(ptr_data, mt->nmem);
}
#endif
{
struct yaz_marc_node *n = yaz_marc_add_node(mt);
n->which = YAZ_MARC_DATAFIELD;
- n->u.datafield.tag = yaz_marc_get_xml_text(ptr_tag, mt->nmem);
+ n->u.datafield.tag = nmem_text_node_cdata(ptr_tag, mt->nmem);
n->u.datafield.indicator =
nmem_strdupn(mt->nmem, indicator, indicator_len);
n->u.datafield.subfields = 0;
wrbuf_printf(wr, "</controlfield>\n");
break;
case YAZ_MARC_COMMENT:
- wrbuf_printf(wr, "<!-- %s -->\n", n->u.comment);
+ wrbuf_printf(wr, "<!-- ");
+ wrbuf_puts(wr, n->u.comment);
+ wrbuf_printf(wr, " -->\n");
break;
case YAZ_MARC_LEADER:
wrbuf_printf(wr, " <leader>");
wrbuf_printf(wr, "%.*s", indicator_length,
n->u.datafield.indicator);
for (s = n->u.datafield.subfields; s; s = s->next)
- wrbuf_printf(wr, "%c%s", ISO2709_IDFS, s->code_data);
+ {
+ wrbuf_printf(wr, "%c", ISO2709_IDFS);
+ wrbuf_puts(wr, s->code_data);
+ }
wrbuf_printf(wr, "%c", ISO2709_FS);
break;
case YAZ_MARC_CONTROLFIELD:
- wrbuf_printf(wr, "%s%c", n->u.controlfield.data, ISO2709_FS);
+ wrbuf_puts(wr, n->u.controlfield.data);
+ wrbuf_printf(wr, "%c", ISO2709_FS);
break;
case YAZ_MARC_COMMENT:
break;