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
Simplify in a lot of places using odr_strdupn
[yaz-moved-to-github.git]
/
src
/
marcdisp.c
diff --git
a/src/marcdisp.c
b/src/marcdisp.c
index
da48198
..
ad9eed6
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-2012 Index Data
+ * Copyright (C) 1995-2013 Index Data
* See the file LICENSE for details.
*/
* See the file LICENSE for details.
*/
@@
-36,10
+36,10
@@
enum yaz_collection_state {
collection_first,
collection_second
};
collection_first,
collection_second
};
-
+
/** \brief node types for yaz_marc_node */
enum YAZ_MARC_NODE_TYPE
/** \brief node types for yaz_marc_node */
enum YAZ_MARC_NODE_TYPE
-{
+{
YAZ_MARC_DATAFIELD,
YAZ_MARC_CONTROLFIELD,
YAZ_MARC_COMMENT,
YAZ_MARC_DATAFIELD,
YAZ_MARC_CONTROLFIELD,
YAZ_MARC_COMMENT,
@@
-141,7
+141,7
@@
static int marc_exec_leader(const char *leader_spec, char *leader,
size_t size);
#if YAZ_HAVE_XML2
static int yaz_marc_write_xml_turbo_xml(yaz_marc_t mt, xmlNode **root_ptr,
size_t size);
#if YAZ_HAVE_XML2
static int yaz_marc_write_xml_turbo_xml(yaz_marc_t mt, xmlNode **root_ptr,
- const char *ns,
+ const char *ns,
const char *format,
const char *type);
#endif
const char *format,
const char *type);
#endif
@@
-245,7
+245,7
@@
void yaz_marc_add_datafield(yaz_marc_t mt, const char *tag,
}
/** \brief adds a attribute value to the element name if it is plain chars
}
/** \brief adds a attribute value to the element name if it is plain chars
-
+
If not, and if the attribute name is not null, it will append a
attribute element with the value if attribute name is null it will
return a non-zero value meaning it couldnt handle the value.
If not, and if the attribute name is not null, it will append a
attribute element with the value if attribute name is null it will
return a non-zero value meaning it couldnt handle the value.
@@
-347,7
+347,7
@@
static void check_ascii(yaz_marc_t mt, char *leader, int offset,
{
if (leader[offset] < ' ' || leader[offset] > 127)
{
{
if (leader[offset] < ' ' || leader[offset] > 127)
{
- yaz_marc_cprintf(mt,
+ yaz_marc_cprintf(mt,
"Leader character at offset %d is non-ASCII. "
"Setting value to '%c'", offset, ch_default);
leader[offset] = ch_default;
"Leader character at offset %d is non-ASCII. "
"Setting value to '%c'", offset, ch_default);
leader[offset] = ch_default;
@@
-371,53
+371,48
@@
void yaz_marc_set_leader(yaz_marc_t mt, const char *leader_c,
check_ascii(mt, leader, 7, 'a');
check_ascii(mt, leader, 8, '#');
check_ascii(mt, leader, 9, '#');
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))
+ if (!atoi_n_check(leader+10, 1, indicator_length) || *indicator_length == 0)
{
{
- yaz_marc_cprintf(mt,
- "Indicator length at offset 10 should hold a digit."
- " Assuming 2");
+ yaz_marc_cprintf(mt, "Indicator length at offset 10 should"
+ " hold a number 1-9. Assuming 2");
leader[10] = '2';
*indicator_length = 2;
}
leader[10] = '2';
*indicator_length = 2;
}
- if (!atoi_n_check(leader+11, 1, identifier_length))
+ if (!atoi_n_check(leader+11, 1, identifier_length) || *identifier_length == 0)
{
{
- yaz_marc_cprintf(mt,
- "Identifier length at offset 11 should hold a digit."
- " Assuming 2");
+ yaz_marc_cprintf(mt, "Identifier length at offset 11 should "
+ " hold a number 1-9. Assuming 2");
leader[11] = '2';
*identifier_length = 2;
}
if (!atoi_n_check(leader+12, 5, base_address))
{
leader[11] = '2';
*identifier_length = 2;
}
if (!atoi_n_check(leader+12, 5, base_address))
{
- yaz_marc_cprintf(mt,
- "Base address at offsets 12..16 should hold a number."
- " Assuming 0");
+ yaz_marc_cprintf(mt, "Base address at offsets 12..16 should"
+ " hold a number. Assuming 0");
*base_address = 0;
}
check_ascii(mt, leader, 17, '#');
check_ascii(mt, leader, 18, '#');
check_ascii(mt, leader, 19, '#');
*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))
+ if (!atoi_n_check(leader+20, 1, length_data_entry) ||
+ *length_data_entry < 3)
{
{
- yaz_marc_cprintf(mt,
- "Length data entry at offset 20 should hold a digit."
- " Assuming 4");
+ yaz_marc_cprintf(mt, "Length data entry at offset 20 should"
+ " hold a number 3-9. Assuming 4");
*length_data_entry = 4;
leader[20] = '4';
}
*length_data_entry = 4;
leader[20] = '4';
}
- if (!atoi_n_check(leader+21, 1, length_starting))
+ if (!atoi_n_check(leader+21, 1, length_starting) || *length_starting < 4)
{
{
- yaz_marc_cprintf(mt,
- "Length starting at offset 21 should hold a digit."
- " Assuming 5");
+ yaz_marc_cprintf(mt, "Length starting at offset 21 should"
+ " hold a number 4-9. Assuming 5");
*length_starting = 5;
leader[21] = '5';
}
if (!atoi_n_check(leader+22, 1, length_implementation))
{
*length_starting = 5;
leader[21] = '5';
}
if (!atoi_n_check(leader+22, 1, length_implementation))
{
- yaz_marc_cprintf(mt,
- "Length implementation at offset 22 should hold a digit."
- " Assuming 0");
+ yaz_marc_cprintf(mt, "Length implementation at offset 22 should"
+ " hold a number. Assuming 0");
*length_implementation = 0;
leader[22] = '0';
}
*length_implementation = 0;
leader[22] = '0';
}
@@
-463,14
+458,24
@@
static size_t cdata_one_character(yaz_marc_t mt, const char *buf)
size_t inbytesleft = i;
size_t r = yaz_iconv(mt->iconv_cd, (char**) &inp, &inbytesleft,
&outp, &outbytesleft);
size_t inbytesleft = i;
size_t r = yaz_iconv(mt->iconv_cd, (char**) &inp, &inbytesleft,
&outp, &outbytesleft);
+ yaz_iconv(mt->iconv_cd, 0, 0, &outp, &outbytesleft);
if (r != (size_t) (-1))
return i; /* got a complete sequence */
}
return 1; /* giving up */
}
if (r != (size_t) (-1))
return i; /* got a complete sequence */
}
return 1; /* giving up */
}
+ else
+ {
+ int error = 0;
+ size_t no_read = 0;
+ (void) yaz_read_UTF8_char((const unsigned char *) buf, strlen(buf),
+ &no_read, &error);
+ if (error == 0 && no_read > 0)
+ return no_read;
+ }
return 1; /* we don't know */
}
return 1; /* we don't know */
}
-
+
void yaz_marc_reset(yaz_marc_t mt)
{
nmem_reset(mt->nmem);
void yaz_marc_reset(yaz_marc_t mt)
{
nmem_reset(mt->nmem);
@@
-491,7
+496,7
@@
int yaz_marc_write_check(yaz_marc_t mt, WRBUF wr)
leader = n->u.leader;
break;
}
leader = n->u.leader;
break;
}
-
+
if (!leader)
return -1;
if (!atoi_n_check(leader+11, 1, &identifier_length))
if (!leader)
return -1;
if (!atoi_n_check(leader+11, 1, &identifier_length))
@@
-502,7
+507,7
@@
int yaz_marc_write_check(yaz_marc_t mt, WRBUF wr)
switch(n->which)
{
case YAZ_MARC_COMMENT:
switch(n->which)
{
case YAZ_MARC_COMMENT:
- wrbuf_iconv_write(wr, mt->iconv_cd,
+ wrbuf_iconv_write(wr, mt->iconv_cd,
n->u.comment, strlen(n->u.comment));
wrbuf_puts(wr, "\n");
break;
n->u.comment, strlen(n->u.comment));
wrbuf_puts(wr, "\n");
break;
@@
-537,7
+542,7
@@
int yaz_marc_write_line(yaz_marc_t mt, WRBUF wr)
leader = n->u.leader;
break;
}
leader = n->u.leader;
break;
}
-
+
if (!leader)
return -1;
if (!atoi_n_check(leader+11, 1, &identifier_length))
if (!leader)
return -1;
if (!atoi_n_check(leader+11, 1, &identifier_length))
@@
-555,12
+560,12
@@
int yaz_marc_write_line(yaz_marc_t mt, WRBUF wr)
{
size_t using_code_len = get_subfield_len(mt, s->code_data,
identifier_length);
{
size_t using_code_len = get_subfield_len(mt, s->code_data,
identifier_length);
-
- wrbuf_puts (wr, mt->subfield_str);
- wrbuf_iconv_write(wr, mt->iconv_cd, s->code_data,
+
+ wrbuf_puts (wr, mt->subfield_str);
+ wrbuf_iconv_write(wr, mt->iconv_cd, s->code_data,
using_code_len);
wrbuf_iconv_puts(wr, mt->iconv_cd, " ");
using_code_len);
wrbuf_iconv_puts(wr, mt->iconv_cd, " ");
- wrbuf_iconv_puts(wr, mt->iconv_cd,
+ wrbuf_iconv_puts(wr, mt->iconv_cd,
s->code_data + using_code_len);
marc_iconv_reset(mt, wr);
}
s->code_data + using_code_len);
marc_iconv_reset(mt, wr);
}
@@
-575,7
+580,7
@@
int yaz_marc_write_line(yaz_marc_t mt, WRBUF wr)
break;
case YAZ_MARC_COMMENT:
wrbuf_puts(wr, "(");
break;
case YAZ_MARC_COMMENT:
wrbuf_puts(wr, "(");
- wrbuf_iconv_write(wr, mt->iconv_cd,
+ wrbuf_iconv_write(wr, mt->iconv_cd,
n->u.comment, strlen(n->u.comment));
marc_iconv_reset(mt, wr);
wrbuf_puts(wr, ")\n");
n->u.comment, strlen(n->u.comment));
marc_iconv_reset(mt, wr);
wrbuf_puts(wr, ")\n");
@@
-649,7
+654,7
@@
static const char *subfield_name[2] = { "subfield", "s"};
\retval -1 failure
*/
static int yaz_marc_write_marcxml_wrbuf(yaz_marc_t mt, WRBUF wr,
\retval -1 failure
*/
static int yaz_marc_write_marcxml_wrbuf(yaz_marc_t mt, WRBUF wr,
- const char *ns,
+ const char *ns,
const char *format,
const char *type,
int turbo)
const char *format,
const char *type,
int turbo)
@@
-664,12
+669,12
@@
static int yaz_marc_write_marcxml_wrbuf(yaz_marc_t mt, WRBUF wr,
leader = n->u.leader;
break;
}
leader = n->u.leader;
break;
}
-
+
if (!leader)
return -1;
if (!atoi_n_check(leader+11, 1, &identifier_length))
return -1;
if (!leader)
return -1;
if (!atoi_n_check(leader+11, 1, &identifier_length))
return -1;
-
+
if (mt->enable_collection != no_collection)
{
if (mt->enable_collection == collection_first)
if (mt->enable_collection != no_collection)
{
if (mt->enable_collection == collection_first)
@@
-726,7
+731,7
@@
static int yaz_marc_write_marcxml_wrbuf(yaz_marc_t mt, WRBUF wr,
wrbuf_iconv_write_cdata(wr, mt->iconv_cd,
s->code_data, using_code_len);
wrbuf_iconv_puts(wr, mt->iconv_cd, "\">");
wrbuf_iconv_write_cdata(wr, mt->iconv_cd,
s->code_data, using_code_len);
wrbuf_iconv_puts(wr, mt->iconv_cd, "\">");
- }
+ }
else
{
element_name_append_attribute_value(mt, wr, "code", s->code_data, using_code_len);
else
{
element_name_append_attribute_value(mt, wr, "code", s->code_data, using_code_len);
@@
-793,7
+798,7
@@
static int yaz_marc_write_marcxml_wrbuf(yaz_marc_t mt, WRBUF wr,
}
static int yaz_marc_write_marcxml_ns(yaz_marc_t mt, WRBUF wr,
}
static int yaz_marc_write_marcxml_ns(yaz_marc_t mt, WRBUF wr,
- const char *ns,
+ const char *ns,
const char *format,
const char *type,
int turbo)
const char *format,
const char *type,
int turbo)
@@
-886,7
+891,7
@@
void add_marc_datafield_turbo_xml(yaz_marc_t mt, struct yaz_marc_node *n,
{
char ind_str[6];
char ind_val[2];
{
char ind_str[6];
char ind_val[2];
-
+
ind_val[0] = n->u.datafield.indicator[i];
ind_val[1] = '\0';
sprintf(ind_str, "%s%d", indicator_name[1], i+1);
ind_val[0] = n->u.datafield.indicator[i];
ind_val[1] = '\0';
sprintf(ind_str, "%s%d", indicator_name[1], i+1);
@@
-902,7
+907,7
@@
void add_marc_datafield_turbo_xml(yaz_marc_t mt, struct yaz_marc_node *n,
wrbuf_rewind(wr_cdata);
wrbuf_iconv_puts(wr_cdata, mt->iconv_cd, s->code_data + using_code_len);
marc_iconv_reset(mt, wr_cdata);
wrbuf_rewind(wr_cdata);
wrbuf_iconv_puts(wr_cdata, mt->iconv_cd, s->code_data + using_code_len);
marc_iconv_reset(mt, wr_cdata);
-
+
wrbuf_rewind(subfield_name);
wrbuf_puts(subfield_name, "s");
not_written = element_name_append_attribute_value(mt, subfield_name, 0, s->code_data, using_code_len) != 0;
wrbuf_rewind(subfield_name);
wrbuf_puts(subfield_name, "s");
not_written = element_name_append_attribute_value(mt, subfield_name, 0, s->code_data, using_code_len) != 0;
@@
-921,7
+926,7
@@
void add_marc_datafield_turbo_xml(yaz_marc_t mt, struct yaz_marc_node *n,
}
static int yaz_marc_write_xml_turbo_xml(yaz_marc_t mt, xmlNode **root_ptr,
}
static int yaz_marc_write_xml_turbo_xml(yaz_marc_t mt, xmlNode **root_ptr,
- const char *ns,
+ const char *ns,
const char *format,
const char *type)
{
const char *format,
const char *type)
{
@@
-938,7
+943,7
@@
static int yaz_marc_write_xml_turbo_xml(yaz_marc_t mt, xmlNode **root_ptr,
leader = n->u.leader;
break;
}
leader = n->u.leader;
break;
}
-
+
if (!leader)
return -1;
if (!atoi_n_check(leader+11, 1, &identifier_length))
if (!leader)
return -1;
if (!atoi_n_check(leader+11, 1, &identifier_length))
@@
-963,7
+968,7
@@
static int yaz_marc_write_xml_turbo_xml(yaz_marc_t mt, xmlNode **root_ptr,
char field[10];
field[0] = 'c';
field[4] = '\0';
char field[10];
field[0] = 'c';
field[4] = '\0';
-
+
switch(n->which)
{
case YAZ_MARC_DATAFIELD:
switch(n->which)
{
case YAZ_MARC_DATAFIELD:
@@
-973,7
+978,7
@@
static int yaz_marc_write_xml_turbo_xml(yaz_marc_t mt, xmlNode **root_ptr,
wrbuf_rewind(wr_cdata);
wrbuf_iconv_puts(wr_cdata, mt->iconv_cd, n->u.controlfield.data);
marc_iconv_reset(mt, wr_cdata);
wrbuf_rewind(wr_cdata);
wrbuf_iconv_puts(wr_cdata, mt->iconv_cd, n->u.controlfield.data);
marc_iconv_reset(mt, wr_cdata);
-
+
strncpy(field + 1, n->u.controlfield.tag, 3);
ptr = xmlNewTextChild(record_ptr, ns_record,
BAD_CAST field,
strncpy(field + 1, n->u.controlfield.tag, 3);
ptr = xmlNewTextChild(record_ptr, ns_record,
BAD_CAST field,
@@
-995,7
+1000,7
@@
static int yaz_marc_write_xml_turbo_xml(yaz_marc_t mt, xmlNode **root_ptr,
int yaz_marc_write_xml(yaz_marc_t mt, xmlNode **root_ptr,
int yaz_marc_write_xml(yaz_marc_t mt, xmlNode **root_ptr,
- const char *ns,
+ const char *ns,
const char *format,
const char *type)
{
const char *format,
const char *type)
{
@@
-1012,7
+1017,7
@@
int yaz_marc_write_xml(yaz_marc_t mt, xmlNode **root_ptr,
leader = n->u.leader;
break;
}
leader = n->u.leader;
break;
}
-
+
if (!leader)
return -1;
if (!atoi_n_check(leader+11, 1, &identifier_length))
if (!leader)
return -1;
if (!atoi_n_check(leader+11, 1, &identifier_length))
@@
-1078,11
+1083,11
@@
int yaz_marc_write_xml(yaz_marc_t mt, xmlNode **root_ptr,
wrbuf_rewind(wr_cdata);
wrbuf_iconv_puts(wr_cdata, mt->iconv_cd, n->u.controlfield.data);
marc_iconv_reset(mt, wr_cdata);
wrbuf_rewind(wr_cdata);
wrbuf_iconv_puts(wr_cdata, mt->iconv_cd, n->u.controlfield.data);
marc_iconv_reset(mt, wr_cdata);
-
+
ptr = xmlNewTextChild(record_ptr, ns_record,
BAD_CAST "controlfield",
BAD_CAST wrbuf_cstr(wr_cdata));
ptr = xmlNewTextChild(record_ptr, ns_record,
BAD_CAST "controlfield",
BAD_CAST wrbuf_cstr(wr_cdata));
-
+
xmlNewProp(ptr, BAD_CAST "tag", BAD_CAST n->u.controlfield.tag);
break;
case YAZ_MARC_COMMENT:
xmlNewProp(ptr, BAD_CAST "tag", BAD_CAST n->u.controlfield.tag);
break;
case YAZ_MARC_COMMENT:
@@
-1113,11
+1118,11
@@
int yaz_marc_write_iso2709(yaz_marc_t mt, WRBUF wr)
const char *leader = 0;
WRBUF wr_dir, wr_head, wr_data_tmp;
int base_address;
const char *leader = 0;
WRBUF wr_dir, wr_head, wr_data_tmp;
int base_address;
-
+
for (n = mt->nodes; n; n = n->next)
if (n->which == YAZ_MARC_LEADER)
leader = n->u.leader;
for (n = mt->nodes; n; n = n->next)
if (n->which == YAZ_MARC_LEADER)
leader = n->u.leader;
-
+
if (!leader)
return -1;
if (!atoi_n_check(leader+10, 1, &indicator_length))
if (!leader)
return -1;
if (!atoi_n_check(leader+10, 1, &indicator_length))
@@
-1160,7
+1165,7
@@
int yaz_marc_write_iso2709(yaz_marc_t mt, WRBUF wr)
wrbuf_printf(wr_dir, "%.3s", n->u.controlfield.tag);
wrbuf_rewind(wr_data_tmp);
wrbuf_printf(wr_dir, "%.3s", n->u.controlfield.tag);
wrbuf_rewind(wr_data_tmp);
- wrbuf_iconv_puts(wr_data_tmp, mt->iconv_cd,
+ wrbuf_iconv_puts(wr_data_tmp, mt->iconv_cd,
n->u.controlfield.data);
marc_iconv_reset(mt, wr_data_tmp);
wrbuf_iconv_putchar(wr_data_tmp, mt->iconv_cd, ' ');/* field sep */
n->u.controlfield.data);
marc_iconv_reset(mt, wr_data_tmp);
wrbuf_iconv_putchar(wr_data_tmp, mt->iconv_cd, ' ');/* field sep */
@@
-1195,7
+1200,7
@@
int yaz_marc_write_iso2709(yaz_marc_t mt, WRBUF wr)
wrbuf_printf(wr_head, "%05d", base_address);
/* from "original" leader */
wrbuf_write(wr_head, leader+17, 7);
wrbuf_printf(wr_head, "%05d", base_address);
/* from "original" leader */
wrbuf_write(wr_head, leader+17, 7);
-
+
wrbuf_write(wr, wrbuf_buf(wr_head), 24);
wrbuf_write(wr, wrbuf_buf(wr_dir), wrbuf_len(wr_dir));
wrbuf_destroy(wr_head);
wrbuf_write(wr, wrbuf_buf(wr_head), 24);
wrbuf_write(wr, wrbuf_buf(wr_dir), wrbuf_len(wr_dir));
wrbuf_destroy(wr_head);
@@
-1326,7
+1331,7
@@
static int marc_exec_leader(const char *leader_spec, char *leader, size_t size)
{
const char *vp = strchr(val+1, '\'');
size_t len;
{
const char *vp = strchr(val+1, '\'');
size_t len;
-
+
if (!vp)
return -1;
len = vp-val-1;
if (!vp)
return -1;
len = vp-val-1;
@@
-1352,7
+1357,7
@@
static int marc_exec_leader(const char *leader_spec, char *leader, size_t size)
int yaz_marc_decode_formatstr(const char *arg)
{
int yaz_marc_decode_formatstr(const char *arg)
{
- int mode = -1;
+ int mode = -1;
if (!strcmp(arg, "marc"))
mode = YAZ_MARC_ISO2709;
if (!strcmp(arg, "marcxml"))
if (!strcmp(arg, "marc"))
mode = YAZ_MARC_ISO2709;
if (!strcmp(arg, "marcxml"))