X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmarcdisp.c;h=1680ea50041ebae881550ae1da7111e656df842c;hb=461dbf959bb1d556261c66300d6b0eabb0ae0909;hp=f56f280f35dd9a2d39f040ea41fb202b9df0bb93;hpb=e26a0bc5ba4e66ca15bc2863b545e7d6b7d9752e;p=yaz-moved-to-github.git diff --git a/src/marcdisp.c b/src/marcdisp.c index f56f280..1680ea5 100644 --- a/src/marcdisp.c +++ b/src/marcdisp.c @@ -2,7 +2,7 @@ * 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.32 2006-08-01 09:28:04 adam Exp $ */ /** @@ -26,7 +26,7 @@ #include #include -#if HAVE_XML2 +#if YAZ_HAVE_XML2 #include #include #endif @@ -132,25 +132,6 @@ void yaz_marc_add_comment(yaz_marc_t mt, char *comment) 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; @@ -200,14 +181,14 @@ void yaz_marc_add_controlfield(yaz_marc_t mt, const char *tag, } } -#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) { 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 @@ -225,13 +206,13 @@ void yaz_marc_add_datafield(yaz_marc_t mt, const char *tag, 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) { 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; @@ -567,7 +548,9 @@ static int yaz_marc_write_marcxml_ns(yaz_marc_t mt, WRBUF wr, wrbuf_printf(wr, "\n"); break; case YAZ_MARC_COMMENT: - wrbuf_printf(wr, "\n", n->u.comment); + wrbuf_printf(wr, "\n"); break; case YAZ_MARC_LEADER: wrbuf_printf(wr, " "); @@ -607,7 +590,7 @@ int yaz_marc_write_iso2709(yaz_marc_t mt, WRBUF wr) 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) @@ -627,6 +610,7 @@ int yaz_marc_write_iso2709(yaz_marc_t mt, WRBUF wr) 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) { @@ -638,12 +622,20 @@ int yaz_marc_write_iso2709(yaz_marc_t mt, WRBUF wr) 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: @@ -679,6 +671,7 @@ int yaz_marc_write_iso2709(yaz_marc_t mt, WRBUF wr) 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) { @@ -689,11 +682,15 @@ int yaz_marc_write_iso2709(yaz_marc_t mt, WRBUF wr) 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; @@ -705,7 +702,7 @@ int yaz_marc_write_iso2709(yaz_marc_t mt, WRBUF wr) 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)