projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document s=ag
[yaz-moved-to-github.git]
/
src
/
marcdisp.c
diff --git
a/src/marcdisp.c
b/src/marcdisp.c
index
00d1ed8
..
da48198
100644
(file)
--- a/
src/marcdisp.c
+++ b/
src/marcdisp.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) 1995-2012 Index Data
* See the file LICENSE for details.
*/
* See the file LICENSE for details.
*/
@@
-20,7
+20,6
@@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <yaz/marcdisp.h>
#include <yaz/wrbuf.h>
#include <yaz/yaz-util.h>
#include <yaz/marcdisp.h>
#include <yaz/wrbuf.h>
#include <yaz/yaz-util.h>
@@
-343,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,
void yaz_marc_set_leader(yaz_marc_t mt, const char *leader_c,
int *indicator_length,
int *identifier_length,
@@
-355,6
+366,11
@@
void yaz_marc_set_leader(yaz_marc_t mt, const char *leader_c,
memcpy(leader, leader_c, 24);
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,
if (!atoi_n_check(leader+10, 1, indicator_length))
{
yaz_marc_cprintf(mt,
@@
-378,6
+394,9
@@
void yaz_marc_set_leader(yaz_marc_t mt, const char *leader_c,
" Assuming 0");
*base_address = 0;
}
" 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,
if (!atoi_n_check(leader+20, 1, length_data_entry))
{
yaz_marc_cprintf(mt,
@@
-402,6
+421,7
@@
void yaz_marc_set_leader(yaz_marc_t mt, const char *leader_c,
*length_implementation = 0;
leader[22] = '0';
}
*length_implementation = 0;
leader[22] = '0';
}
+ check_ascii(mt, leader, 23, '0');
if (mt->debug)
{
if (mt->debug)
{
@@
-964,13
+984,9
@@
static int yaz_marc_write_xml_turbo_xml(yaz_marc_t mt, xmlNode **root_ptr,
xmlAddChild(record_ptr, ptr);
break;
case YAZ_MARC_LEADER:
xmlAddChild(record_ptr, ptr);
break;
case YAZ_MARC_LEADER:
- {
- char *field = "leader";
- field = "l";
- xmlNewTextChild(record_ptr, ns_record, BAD_CAST field,
+ xmlNewTextChild(record_ptr, ns_record, BAD_CAST "l",
BAD_CAST n->u.leader);
BAD_CAST n->u.leader);
- }
- break;
+ break;
}
}
wrbuf_destroy(wr_cdata);
}
}
wrbuf_destroy(wr_cdata);
@@
-1193,8
+1209,7
@@
int yaz_marc_write_iso2709(yaz_marc_t mt, WRBUF wr)
switch(n->which)
{
case YAZ_MARC_DATAFIELD:
switch(n->which)
{
case YAZ_MARC_DATAFIELD:
- wrbuf_printf(wr, "%.*s", indicator_length,
- n->u.datafield.indicator);
+ wrbuf_write(wr, n->u.datafield.indicator, indicator_length);
for (s = n->u.datafield.subfields; s; s = s->next)
{
wrbuf_putc(wr, ISO2709_IDFS);
for (s = n->u.datafield.subfields; s; s = s->next)
{
wrbuf_putc(wr, ISO2709_IDFS);