X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmarcdisp.c;h=da48198e2d3ebc8ccaad043bcaef0509600610fb;hb=62b57dd7f9c0ee57788bbcfb1f81697900587027;hp=50447bed9460ceb1dbab97752b536adafdd03f81;hpb=887a9c6336d4731d898e185b5bd08cc6424114a8;p=yaz-moved-to-github.git diff --git a/src/marcdisp.c b/src/marcdisp.c index 50447be..da48198 100644 --- a/src/marcdisp.c +++ b/src/marcdisp.c @@ -342,6 +342,18 @@ void yaz_marc_add_subfield(yaz_marc_t mt, } } +static void check_ascii(yaz_marc_t mt, char *leader, int offset, + int ch_default) +{ + if (leader[offset] < ' ' || leader[offset] > 127) + { + yaz_marc_cprintf(mt, + "Leader character at offset %d is non-ASCII. " + "Setting value to '%c'", offset, ch_default); + leader[offset] = ch_default; + } +} + void yaz_marc_set_leader(yaz_marc_t mt, const char *leader_c, int *indicator_length, int *identifier_length, @@ -354,6 +366,11 @@ void yaz_marc_set_leader(yaz_marc_t mt, const char *leader_c, memcpy(leader, leader_c, 24); + check_ascii(mt, leader, 5, 'a'); + check_ascii(mt, leader, 6, 'a'); + check_ascii(mt, leader, 7, 'a'); + check_ascii(mt, leader, 8, '#'); + check_ascii(mt, leader, 9, '#'); if (!atoi_n_check(leader+10, 1, indicator_length)) { yaz_marc_cprintf(mt, @@ -377,6 +394,9 @@ void yaz_marc_set_leader(yaz_marc_t mt, const char *leader_c, " Assuming 0"); *base_address = 0; } + check_ascii(mt, leader, 17, '#'); + check_ascii(mt, leader, 18, '#'); + check_ascii(mt, leader, 19, '#'); if (!atoi_n_check(leader+20, 1, length_data_entry)) { yaz_marc_cprintf(mt, @@ -401,6 +421,7 @@ void yaz_marc_set_leader(yaz_marc_t mt, const char *leader_c, *length_implementation = 0; leader[22] = '0'; } + check_ascii(mt, leader, 23, '0'); if (mt->debug) {