X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmarcdisp.c;h=e5fd62ee464bab483a1abb094a97cd46b6a88876;hb=926357dcfb7a359cc7a23766460cef5fe21156ee;hp=f56f280f35dd9a2d39f040ea41fb202b9df0bb93;hpb=e26a0bc5ba4e66ca15bc2863b545e7d6b7d9752e;p=yaz-moved-to-github.git diff --git a/src/marcdisp.c b/src/marcdisp.c index f56f280..e5fd62e 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.34 2006-08-28 14:18:22 adam Exp $ */ /** @@ -26,7 +26,7 @@ #include #include -#if HAVE_XML2 +#if YAZ_HAVE_XML2 #include #include #endif @@ -87,6 +87,7 @@ struct yaz_marc_t_ { yaz_iconv_t iconv_cd; char subfield_str[8]; char endline_str[8]; + char *leader_spec; struct yaz_marc_node *nodes; struct yaz_marc_node **nodes_pp; struct yaz_marc_subfield **subfield_pp; @@ -99,6 +100,7 @@ yaz_marc_t yaz_marc_create(void) mt->debug = 0; mt->m_wr = wrbuf_alloc(); mt->iconv_cd = 0; + mt->leader_spec = 0; strcpy(mt->subfield_str, " $"); strcpy(mt->endline_str, "\n"); @@ -112,10 +114,15 @@ void yaz_marc_destroy(yaz_marc_t mt) if (!mt) return ; nmem_destroy(mt->nmem); - wrbuf_free (mt->m_wr, 1); - xfree (mt); + wrbuf_free(mt->m_wr, 1); + xfree(mt->leader_spec); + xfree(mt); } +static int marc_exec_leader(const char *leader_spec, char *leader, + size_t size); + + struct yaz_marc_node *yaz_marc_add_node(yaz_marc_t mt) { struct yaz_marc_node *n = nmem_malloc(mt->nmem, sizeof(*n)); @@ -132,25 +139,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; @@ -177,6 +165,7 @@ void yaz_marc_add_leader(yaz_marc_t mt, const char *leader, size_t leader_len) struct yaz_marc_node *n = yaz_marc_add_node(mt); n->which = YAZ_MARC_LEADER; n->u.leader = nmem_strdupn(mt->nmem, leader, leader_len); + marc_exec_leader(mt->leader_spec, n->u.leader, leader_len); } void yaz_marc_add_controlfield(yaz_marc_t mt, const char *tag, @@ -200,14 +189,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 +214,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; @@ -441,15 +430,20 @@ int yaz_marc_write_line(yaz_marc_t mt, WRBUF wr) wrbuf_puts (wr, mt->subfield_str); wrbuf_iconv_write(wr, mt->iconv_cd, s->code_data, using_code_len); - wrbuf_printf(wr, " "); + wrbuf_iconv_puts(wr, mt->iconv_cd, " "); wrbuf_iconv_puts(wr, mt->iconv_cd, s->code_data + using_code_len); + wrbuf_iconv_puts(wr, mt->iconv_cd, " "); + wr->pos--; } wrbuf_puts (wr, mt->endline_str); break; case YAZ_MARC_CONTROLFIELD: - wrbuf_printf(wr, "%s ", n->u.controlfield.tag); + wrbuf_printf(wr, "%s", n->u.controlfield.tag); + wrbuf_iconv_puts(wr, mt->iconv_cd, " "); wrbuf_iconv_puts(wr, mt->iconv_cd, n->u.controlfield.data); + wrbuf_iconv_puts(wr, mt->iconv_cd, " "); + wr->pos--; wrbuf_puts (wr, mt->endline_str); break; case YAZ_MARC_COMMENT: @@ -518,6 +512,7 @@ static int yaz_marc_write_marcxml_ns(yaz_marc_t mt, WRBUF wr, for (n = mt->nodes; n; n = n->next) { struct yaz_marc_subfield *s; + switch(n->which) { case YAZ_MARC_DATAFIELD: @@ -533,7 +528,7 @@ static int yaz_marc_write_marcxml_ns(yaz_marc_t mt, WRBUF wr, wrbuf_printf(wr, " ind%d=\"", i+1); wrbuf_iconv_write_cdata(wr, mt->iconv_cd, n->u.datafield.indicator+i, 1); - wrbuf_printf(wr, "\""); + wrbuf_iconv_puts(wr, mt->iconv_cd, "\""); } } wrbuf_printf(wr, ">\n"); @@ -547,14 +542,15 @@ static int yaz_marc_write_marcxml_ns(yaz_marc_t mt, WRBUF wr, : cdata_one_character(mt, s->code_data); - wrbuf_puts(wr, " iconv_cd, " iconv_cd, s->code_data, using_code_len); - wrbuf_puts(wr, "\">"); + wrbuf_iconv_puts(wr, mt->iconv_cd, "\">"); wrbuf_iconv_write_cdata(wr, mt->iconv_cd, s->code_data + using_code_len, strlen(s->code_data + using_code_len)); - wrbuf_puts(wr, "\n"); + wrbuf_iconv_puts(wr, mt->iconv_cd, ""); + wrbuf_puts(wr, "\n"); } wrbuf_printf(wr, " \n"); break; @@ -562,12 +558,15 @@ static int yaz_marc_write_marcxml_ns(yaz_marc_t mt, WRBUF wr, wrbuf_printf(wr, " iconv_cd, n->u.controlfield.tag, strlen(n->u.controlfield.tag)); - wrbuf_printf(wr, "\">"); + wrbuf_iconv_puts(wr, mt->iconv_cd, "\">"); wrbuf_iconv_puts(wr, mt->iconv_cd, n->u.controlfield.data); - wrbuf_printf(wr, "\n"); + wrbuf_iconv_puts(wr, mt->iconv_cd, ""); + wrbuf_puts(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, " "); @@ -583,7 +582,8 @@ static int yaz_marc_write_marcxml_ns(yaz_marc_t mt, WRBUF wr, int yaz_marc_write_marcxml(yaz_marc_t mt, WRBUF wr) { - yaz_marc_modify_leader(mt, 9, "a"); + if (!mt->leader_spec) + yaz_marc_modify_leader(mt, 9, "a"); return yaz_marc_write_marcxml_ns(mt, wr, "http://www.loc.gov/MARC21/slim", 0, 0); } @@ -607,7 +607,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,24 +627,37 @@ 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) { int data_length = 0; struct yaz_marc_subfield *s; + switch(n->which) { case YAZ_MARC_DATAFIELD: wrbuf_printf(wr_dir, "%.3s", n->u.datafield.tag); data_length += indicator_length; + wrbuf_rewind(wr_data_tmp); for (s = n->u.datafield.subfields; s; s = s->next) - data_length += 1+strlen(s->code_data); - data_length++; + { + /* write dummy IDFS + content */ + wrbuf_iconv_putchar(wr_data_tmp, mt->iconv_cd, ' '); + wrbuf_iconv_puts(wr_data_tmp, mt->iconv_cd, s->code_data); + } + /* write dummy FS (makes MARC-8 to become ASCII) */ + wrbuf_iconv_putchar(wr_data_tmp, mt->iconv_cd, ' '); + data_length += wrbuf_len(wr_data_tmp); break; case YAZ_MARC_CONTROLFIELD: wrbuf_printf(wr_dir, "%.3s", n->u.controlfield.tag); - data_length += strlen(n->u.controlfield.data); - data_length++; + + wrbuf_rewind(wr_data_tmp); + wrbuf_iconv_puts(wr_data_tmp, mt->iconv_cd, + n->u.controlfield.data); + wrbuf_iconv_putchar(wr_data_tmp, mt->iconv_cd, ' ');/* field sep */ + data_length += wrbuf_len(wr_data_tmp); break; case YAZ_MARC_COMMENT: break; @@ -679,21 +692,33 @@ 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) { struct yaz_marc_subfield *s; + switch(n->which) { case YAZ_MARC_DATAFIELD: 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_FS); + { + wrbuf_putc(wr, ISO2709_IDFS); + wrbuf_iconv_puts(wr, mt->iconv_cd, s->code_data); + /* write dummy blank - makes MARC-8 to become ASCII */ + wrbuf_iconv_putchar(wr, mt->iconv_cd, ' '); + wr->pos--; + } + wrbuf_putc(wr, 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); + /* write dummy blank - makes MARC-8 to become ASCII */ + wrbuf_iconv_putchar(wr, mt->iconv_cd, ' '); + wr->pos--; + wrbuf_putc(wr, ISO2709_FS); break; case YAZ_MARC_COMMENT: break; @@ -705,7 +730,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) @@ -1195,6 +1220,64 @@ int marc_display (const char *buf, FILE *outf) return marc_display_ex (buf, outf, 0); } +int yaz_marc_leader_spec(yaz_marc_t mt, const char *leader_spec) +{ + xfree(mt->leader_spec); + mt->leader_spec = 0; + if (leader_spec) + { + char dummy_leader[24]; + if (marc_exec_leader(leader_spec, dummy_leader, 24)) + return -1; + mt->leader_spec = xstrdup(leader_spec); + } + return 0; +} + +static int marc_exec_leader(const char *leader_spec, char *leader, size_t size) +{ + const char *cp = leader_spec; + while (cp) + { + char val[21]; + int pos; + int no_read = 0, no = 0; + + no = sscanf(cp, "%d=%20[^,]%n", &pos, val, &no_read); + if (no < 2 || no_read < 3) + return -1; + if (pos < 0 || pos >= size) + return -1; + + if (*val == '\'') + { + const char *vp = strchr(val+1, '\''); + size_t len; + + if (!vp) + return -1; + len = vp-val-1; + if (len + pos > size) + return -1; + memcpy(leader + pos, val+1, len); + } + else if (*val >= '0' && *val <= '9') + { + int ch = atoi(val); + leader[pos] = ch; + } + else + return -1; + cp += no_read; + if (*cp != ',') + break; + + cp++; + } + return 0; +} + + /* * Local variables: * c-basic-offset: 4