From: Adam Dickmeiss Date: Tue, 8 Feb 2005 13:51:30 +0000 (+0000) Subject: Added MarcXchange support. X-Git-Tag: YAZ.2.0.34~4 X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=60a702f390f7e2addfdab79f2328db3ba2897c8b;p=yaz-moved-to-github.git Added MarcXchange support. --- diff --git a/doc/tools.xml b/doc/tools.xml index e67661c..d9a57b7 100644 --- a/doc/tools.xml +++ b/doc/tools.xml @@ -1,4 +1,4 @@ - + Supporting Tools @@ -1967,6 +1967,7 @@ typedef struct oident #define YAZ_MARC_OAIMARC 2 #define YAZ_MARC_MARCXML 3 #define YAZ_MARC_ISO2709 4 + #define YAZ_MARC_XCHANGE 5 /* supply iconv handle for character set conversion .. */ void yaz_marc_iconv(yaz_marc_t mt, yaz_iconv_t cd); diff --git a/doc/yaz-marcdump-man.xml b/doc/yaz-marcdump-man.xml index f728d92..99029ce 100644 --- a/doc/yaz-marcdump-man.xml +++ b/doc/yaz-marcdump-man.xml @@ -1,5 +1,5 @@ - + yaz-marcdump @@ -16,6 +16,7 @@ yaz-marcdump + @@ -65,6 +66,15 @@ + -X + + Print MARC records in MarcXchange format. + This format is equivalent to YAZ_MARC_XCHANGE in + yaz/marcdisp.h. + + + + -I Print MARC records in ISO2709 format. diff --git a/include/yaz/marcdisp.h b/include/yaz/marcdisp.h index 51fcf0e..f027be3 100644 --- a/include/yaz/marcdisp.h +++ b/include/yaz/marcdisp.h @@ -23,7 +23,7 @@ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. * - * $Id: marcdisp.h,v 1.12 2005-02-02 20:50:38 adam Exp $ + * $Id: marcdisp.h,v 1.13 2005-02-08 13:51:30 adam Exp $ */ /** @@ -54,6 +54,7 @@ YAZ_EXPORT void yaz_marc_xml(yaz_marc_t mt, int xmlmode); #define YAZ_MARC_OAIMARC 2 #define YAZ_MARC_MARCXML 3 #define YAZ_MARC_ISO2709 4 +#define YAZ_MARC_XCHANGE 5 /* supply iconv handle for character set conversion .. */ YAZ_EXPORT void yaz_marc_iconv(yaz_marc_t mt, yaz_iconv_t cd); diff --git a/src/marcdisp.c b/src/marcdisp.c index dbee668..6c7ba4c 100644 --- a/src/marcdisp.c +++ b/src/marcdisp.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2005, Index Data ApS * See the file LICENSE for details. * - * $Id: marcdisp.c,v 1.15 2005-02-02 23:25:08 adam Exp $ + * $Id: marcdisp.c,v 1.16 2005-02-08 13:51:30 adam Exp $ */ /** @@ -72,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; @@ -82,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); @@ -92,37 +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(((const unsigned char *) buf)[10])) - indicator_length = atoi_n (buf+10, 1); - else - indicator_length = 2; - if (isdigit(((const unsigned char *) 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); - if (buf[20] <= '0' || buf[20] >= '9') + } + 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)) { - wrbuf_printf(wr, "\n"); - length_data_entry = 4; + if (produce_warnings) + wrbuf_printf(wr, "\n"); + length_data_entry = 4; + lead[20] = '4'; } - length_starting = atoi_n (buf+21, 1); - if (buf[21] <= '0' || buf[21] >= '9') + if (!atoi_n_check(buf+21, 1, &length_starting)) { - wrbuf_printf(wr, "\n"); - length_starting = 5; + 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'; } - length_implementation = atoi_n (buf+22, 1); if (mt->xml != YAZ_MARC_LINE) { @@ -165,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; } @@ -209,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; @@ -255,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)); @@ -332,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 == 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) @@ -417,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"); } @@ -465,6 +509,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: if (identifier_flag) wrbuf_puts (wr, " \n"); else @@ -484,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: diff --git a/util/marcdump.c b/util/marcdump.c index 3de8d76..34700cf 100644 --- a/util/marcdump.c +++ b/util/marcdump.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2005, Index Data ApS * See the file LICENSE for details. * - * $Id: marcdump.c,v 1.26 2005-01-15 19:47:15 adam Exp $ + * $Id: marcdump.c,v 1.27 2005-02-08 13:51:31 adam Exp $ */ #if HAVE_CONFIG_H @@ -45,7 +45,7 @@ static void usage(const char *prog) { - fprintf (stderr, "Usage: %s [-c cfile] [-f from] [-t to] [-x] [-O] [-X] [-I] [-v] file...\n", + fprintf (stderr, "Usage: %s [-c cfile] [-f from] [-t to] [-x] [-O] [-X] [-e] [-I] [-v] file...\n", prog); } @@ -123,7 +123,7 @@ int main (int argc, char **argv) #endif #endif - while ((r = options("pvc:xOXIf:t:2", argv, argc, &arg)) != -2) + while ((r = options("pvc:xOeXIf:t:2", argv, argc, &arg)) != -2) { int count; no++; @@ -146,6 +146,9 @@ int main (int argc, char **argv) case 'O': xml = YAZ_MARC_OAIMARC; break; + case 'e': + xml = YAZ_MARC_XCHANGE; + break; case 'X': xml = YAZ_MARC_MARCXML; break;