X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fmarcdisp.c;h=6c7ba4c8286a1b89d1057524493e097a33cc49e2;hp=171e5a3dff1264acb944a34bea00ea550a493e85;hb=60a702f390f7e2addfdab79f2328db3ba2897c8b;hpb=537450adf56c59b3f26ac9320cc6dd12b3ffdbb5 diff --git a/src/marcdisp.c b/src/marcdisp.c index 171e5a3..6c7ba4c 100644 --- a/src/marcdisp.c +++ b/src/marcdisp.c @@ -1,8 +1,13 @@ /* - * Copyright (c) 1995-2004, Index Data + * Copyright (C) 1995-2005, Index Data ApS * See the file LICENSE for details. * - * $Id: marcdisp.c,v 1.7 2004-10-01 11:45:48 adam Exp $ + * $Id: marcdisp.c,v 1.16 2005-02-08 13:51:30 adam Exp $ + */ + +/** + * \file marcdisp.c + * \brief Implements MARC display - and conversion utilities */ #if HAVE_CONFIG_H @@ -21,6 +26,8 @@ struct yaz_marc_t_ { int xml; int debug; yaz_iconv_t iconv_cd; + char subfield_str[8]; + char endline_str[8]; }; yaz_marc_t yaz_marc_create(void) @@ -30,9 +37,23 @@ yaz_marc_t yaz_marc_create(void) mt->debug = 0; mt->m_wr = wrbuf_alloc(); mt->iconv_cd = 0; + strcpy(mt->subfield_str, " $"); + strcpy(mt->endline_str, "\n"); return mt; } +void yaz_marc_subfield_str(yaz_marc_t mt, const char *s) +{ + strncpy(mt->subfield_str, s, sizeof(mt->subfield_str)-1); + mt->subfield_str[sizeof(mt->subfield_str)-1] = '\0'; +} + +void yaz_marc_endline_str(yaz_marc_t mt, const char *s) +{ + strncpy(mt->endline_str, s, sizeof(mt->endline_str)-1); + mt->endline_str[sizeof(mt->endline_str)-1] = '\0'; +} + void yaz_marc_destroy(yaz_marc_t mt) { if (!mt) @@ -51,6 +72,14 @@ static void marc_cdata (yaz_marc_t mt, const char *buf, size_t len, WRBUF wr) wrbuf_iconv_write_cdata(wr, mt->iconv_cd, buf, len); } +static int atoi_n_check(const char *buf, int size, int *val) +{ + if (!isdigit(*(const unsigned char *) buf)) + return 0; + *val = atoi_n(buf, size); + return 1; +} + int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr) { int entry_p; @@ -61,6 +90,14 @@ int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr) int length_data_entry; int length_starting; int length_implementation; + char lead[24]; + int produce_warnings = 0; + + if (mt->debug) + produce_warnings = 1; + if (mt->xml == YAZ_MARC_SIMPLEXML || mt->xml == YAZ_MARC_OAIMARC + || mt->xml == YAZ_MARC_MARCXML || mt->xml == YAZ_MARC_XCHANGE) + produce_warnings = 1; wrbuf_rewind(wr); @@ -71,27 +108,57 @@ int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr) { char str[40]; - sprintf (str, "Record length %d - aborting\n", record_length); - wrbuf_puts (wr, str); + wrbuf_printf(wr, "\n", + record_length); } return -1; } + memcpy(lead, buf, 24); /* se can modify the header for output */ + /* ballout if bsize is known and record_length is less than that */ if (bsize != -1 && record_length > bsize) return -1; - if (isdigit(buf[10])) - indicator_length = atoi_n (buf+10, 1); - else - indicator_length = 2; - if (isdigit(buf[11])) - identifier_length = atoi_n (buf+11, 1); - else + if (!atoi_n_check(buf+10, 1, &indicator_length)) + { + if (produce_warnings) + wrbuf_printf(wr, "\n"); + lead[10] = '2'; + indicator_length = 2; + } + if (!atoi_n_check(buf+11, 1, &identifier_length)) + { + if (produce_warnings) + wrbuf_printf(wr, "\n"); + lead[11] = '2'; identifier_length = 2; - base_address = atoi_n (buf+12, 5); - - length_data_entry = atoi_n (buf+20, 1); - length_starting = atoi_n (buf+21, 1); - length_implementation = atoi_n (buf+22, 1); + } + if (!atoi_n_check(buf+12, 5, &base_address)) + { + if (produce_warnings) + wrbuf_printf(wr, "\n"); + base_address = 0; + } + if (!atoi_n_check(buf+20, 1, &length_data_entry)) + { + if (produce_warnings) + wrbuf_printf(wr, "\n"); + length_data_entry = 4; + lead[20] = '4'; + } + if (!atoi_n_check(buf+21, 1, &length_starting)) + { + if (produce_warnings) + wrbuf_printf(wr, "\n"); + length_starting = 5; + lead[21] = '5'; + } + if (!atoi_n_check(buf+22, 1, &length_implementation)) + { + if (produce_warnings) + wrbuf_printf(wr, "\n"); + length_implementation = 0; + lead[22] = '0'; + } if (mt->xml != YAZ_MARC_LINE) { @@ -134,13 +201,16 @@ int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr) wr, "\n" " "); -#if 1 - marc_cdata(mt, buf, 9, wr); - marc_cdata(mt, "a", 1, wr); /* set leader to signal unicode */ - marc_cdata(mt, buf+10, 14, wr); -#else - marc_cdata(mt, buf, 24, wr); /* leave header as is .. */ -#endif + lead[9] = 'a'; /* set leader to signal unicode */ + marc_cdata(mt, lead, 24, wr); + wrbuf_printf(wr, "\n"); + break; + case YAZ_MARC_XCHANGE: + wrbuf_printf( + wr, + "\n" + " "); + marc_cdata(mt, lead, 24, wr); wrbuf_printf(wr, "\n"); break; } @@ -178,8 +248,9 @@ int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr) } if (mt->debug && base_address != entry_p+1) { - wrbuf_printf (wr," \n", base_address, entry_p+1); + if (produce_warnings) + wrbuf_printf (wr," \n", base_address, entry_p+1); } base_address = entry_p+1; @@ -224,9 +295,9 @@ int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr) } wrbuf_putc(wr_dir, ISO2709_FS); wrbuf_printf(wr_head, "%05d", data_p+1 + base_address); - wrbuf_write(wr_head, buf+5, 7); + wrbuf_write(wr_head, lead+5, 7); wrbuf_printf(wr_head, "%05d", base_address); - wrbuf_write(wr_head, buf+17, 7); + wrbuf_write(wr_head, lead+17, 7); wrbuf_write(wr, wrbuf_buf(wr_head), 24); wrbuf_write(wr, wrbuf_buf(wr_dir), wrbuf_len(wr_dir)); @@ -242,10 +313,12 @@ int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr) int end_offset; int i, j; char tag[4]; - int identifier_flag = 1; + int identifier_flag = 0; + int entry_p0; memcpy (tag, buf+entry_p, 3); entry_p += 3; + entry_p0 = entry_p; tag[3] = '\0'; data_length = atoi_n (buf+entry_p, length_data_entry); entry_p += length_data_entry; @@ -254,14 +327,29 @@ int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr) i = data_offset + base_address; end_offset = i+data_length-1; - if (indicator_length < 4 && indicator_length > 0) + if (mt->debug) + { + wrbuf_printf(wr, "\n", + entry_p0, data_length, data_offset); + } + + if (memcmp (tag, "00", 2)) + identifier_flag = 1; /* if not 00X assume subfields */ + else if (indicator_length < 4 && indicator_length > 0) { - if (buf[i + indicator_length] != ISO2709_IDFS) - identifier_flag = 0; + /* Danmarc 00X have subfields */ + if (buf[i + indicator_length] == ISO2709_IDFS) + identifier_flag = 1; + else if (buf[i + indicator_length + 1] == ISO2709_IDFS) + identifier_flag = 2; } - else if (!memcmp (tag, "00", 2)) - identifier_flag = 0; - + + if (mt->debug) + { + wrbuf_printf(wr, "\n", + identifier_flag); + } + switch(mt->xml) { case YAZ_MARC_LINE: @@ -284,6 +372,7 @@ int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr) wrbuf_printf(wr, "\""); break; case YAZ_MARC_MARCXML: + case YAZ_MARC_XCHANGE: if (identifier_flag) wrbuf_printf (wr, " xml) @@ -317,6 +407,7 @@ int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr) wrbuf_printf(wr, "\""); break; case YAZ_MARC_MARCXML: + case YAZ_MARC_XCHANGE: wrbuf_printf(wr, " ind%d=\"", j+1); marc_cdata(mt, buf+i, 1, wr); wrbuf_printf(wr, "\""); @@ -324,7 +415,7 @@ int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr) } } if (mt->xml == YAZ_MARC_SIMPLEXML || mt->xml == YAZ_MARC_MARCXML - || mt->xml == YAZ_MARC_OAIMARC) + || mt->xml == YAZ_MARC_OAIMARC || mt->xml == YAZ_MARC_XCHANGE) { wrbuf_puts (wr, ">"); if (identifier_flag) @@ -350,7 +441,7 @@ int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr) i += identifier_length; break; case YAZ_MARC_LINE: - wrbuf_puts (wr, " $"); + wrbuf_puts (wr, mt->subfield_str); marc_cdata(mt, buf+i, identifier_length-1, wr); i = i+identifier_length-1; wrbuf_putc (wr, ' '); @@ -368,6 +459,7 @@ int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr) wrbuf_puts (wr, "\">"); break; case YAZ_MARC_MARCXML: + case YAZ_MARC_XCHANGE: wrbuf_puts (wr, " xml == YAZ_MARC_SIMPLEXML || mt->xml == YAZ_MARC_MARCXML || + mt->xml == YAZ_MARC_XCHANGE || mt->xml == YAZ_MARC_OAIMARC) wrbuf_puts (wr, "\n"); } @@ -399,11 +492,11 @@ int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr) marc_cdata(mt, buf + i, 1, wr); } if (mt->xml == YAZ_MARC_LINE) - wrbuf_putc (wr, '\n'); + wrbuf_puts (wr, mt->endline_str); if (i < end_offset) - wrbuf_puts (wr, " \n"); + wrbuf_printf(wr, " \n", data_length); if (buf[i] != ISO2709_RS && buf[i] != ISO2709_FS) - wrbuf_puts (wr, " \n"); + wrbuf_printf(wr, " \n", data_length); switch(mt->xml) { case YAZ_MARC_SIMPLEXML: @@ -411,15 +504,16 @@ int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr) break; case YAZ_MARC_OAIMARC: if (identifier_flag) - wrbuf_puts (wr, " \n"); + wrbuf_puts (wr, "\n"); else - wrbuf_puts (wr, " \n"); + wrbuf_puts (wr, "\n"); break; case YAZ_MARC_MARCXML: + case YAZ_MARC_XCHANGE: if (identifier_flag) wrbuf_puts (wr, " \n"); else - wrbuf_puts (wr, " \n"); + wrbuf_puts (wr, "\n"); break; } } @@ -435,6 +529,7 @@ int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr) wrbuf_puts (wr, "\n"); break; case YAZ_MARC_MARCXML: + case YAZ_MARC_XCHANGE: wrbuf_puts (wr, "\n"); break; case YAZ_MARC_ISO2709: