* Copyright (C) 1995-2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: marcdisp.c,v 1.29 2006-05-02 20:47:45 adam Exp $
+ * $Id: marcdisp.c,v 1.32 2006-08-01 09:28:04 adam Exp $
*/
/**
#include <yaz/wrbuf.h>
#include <yaz/yaz-util.h>
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
#include <libxml/parser.h>
#include <libxml/tree.h>
#endif
}
}
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
void yaz_marc_add_controlfield_xml(yaz_marc_t mt, const xmlNode *ptr_tag,
const xmlNode *ptr_data)
{
mt->subfield_pp = &n->u.datafield.subfields;
}
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
void yaz_marc_add_datafield_xml(yaz_marc_t mt, const xmlNode *ptr_tag,
const char *indicator, size_t indicator_len)
{
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>");
int length_implementation;
int data_offset = 0;
const char *leader = 0;
- WRBUF wr_dir, wr_head;
+ WRBUF wr_dir, wr_head, wr_data_tmp;
int base_address;
for (n = mt->nodes; n; n = n->next)
if (!atoi_n_check(leader+22, 1, &length_implementation))
return -1;
+ wr_data_tmp = wrbuf_alloc();
wr_dir = wrbuf_alloc();
for (n = mt->nodes; n; n = n->next)
{
wrbuf_printf(wr_dir, "%.3s", n->u.datafield.tag);
data_length += indicator_length;
for (s = n->u.datafield.subfields; s; s = s->next)
- data_length += 1+strlen(s->code_data);
+ {
+ wrbuf_rewind(wr_data_tmp);
+ wrbuf_iconv_puts(wr_data_tmp, mt->iconv_cd, s->code_data);
+ data_length += 1+wrbuf_len(wr_data_tmp);
+ }
data_length++;
break;
case YAZ_MARC_CONTROLFIELD:
wrbuf_printf(wr_dir, "%.3s", n->u.controlfield.tag);
- data_length += strlen(n->u.controlfield.data);
+
+ wrbuf_rewind(wr_data_tmp);
+ wrbuf_iconv_puts(wr_data_tmp, mt->iconv_cd,
+ n->u.controlfield.data);
+ data_length += wrbuf_len(wr_data_tmp);
data_length++;
break;
case YAZ_MARC_COMMENT:
wrbuf_write(wr, wrbuf_buf(wr_dir), wrbuf_len(wr_dir));
wrbuf_free(wr_head, 1);
wrbuf_free(wr_dir, 1);
+ wrbuf_free(wr_data_tmp, 1);
for (n = mt->nodes; n; n = n->next)
{
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_iconv_puts(wr, mt->iconv_cd, 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_iconv_puts(wr, mt->iconv_cd, n->u.controlfield.data);
+ wrbuf_printf(wr, "%c", ISO2709_FS);
break;
case YAZ_MARC_COMMENT:
break;
return 0;
}
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
int yaz_marc_read_xml_subfields(yaz_marc_t mt, const xmlNode *ptr)
{
for (; ptr; ptr = ptr->next)