struct yaz_marc_t_ {
WRBUF m_wr;
NMEM nmem;
- int xml;
+ int input_format;
+ int output_format;
int debug;
int write_using_libxml2;
- int turbo_format;
enum yaz_collection_state enable_collection;
yaz_iconv_t iconv_cd;
char subfield_str[8];
yaz_marc_t yaz_marc_create(void)
{
yaz_marc_t mt = (yaz_marc_t) xmalloc(sizeof(*mt));
- mt->xml = YAZ_MARC_LINE;
+ mt->output_format = YAZ_MARC_LINE;
mt->debug = 0;
mt->write_using_libxml2 = 0;
mt->enable_collection = no_collection;
n->u.controlfield.tag = nmem_text_node_cdata(ptr_tag, mt->nmem);
n->u.controlfield.data = nmem_text_node_cdata(ptr_data, mt->nmem);
}
+
+void yaz_marc_add_controlfield_turbo_xml(yaz_marc_t mt, const char *tag,
+ const xmlNode *ptr_data)
+{
+ struct yaz_marc_node *n = yaz_marc_add_node(mt);
+ n->which = YAZ_MARC_CONTROLFIELD;
+ n->u.controlfield.tag = tag;
+ n->u.controlfield.data = nmem_text_node_cdata(ptr_data, mt->nmem);
+}
+
#endif
/* make subfield_pp the current (last one) */
mt->subfield_pp = &n->u.datafield.subfields;
}
+
+struct yaz_marc_node* yaz_marc_add_datafield_turbo_xml(yaz_marc_t mt, char *tag_value)
+{
+ struct yaz_marc_node *n = yaz_marc_add_node(mt);
+ n->which = YAZ_MARC_DATAFIELD;
+ n->u.datafield.tag = tag_value;
+ n->u.datafield.indicator = 0;
+ n->u.datafield.subfields = 0;
+
+ /* make subfield_pp the current (last one) */
+ mt->subfield_pp = &n->u.datafield.subfields;
+ return n;
+}
+
+void yaz_marc_datafield_set_indicators(struct yaz_marc_node *n, char *indicator)
+{
+ n->u.datafield.indicator = indicator;
+}
+
#endif
void yaz_marc_add_subfield(yaz_marc_t mt,
{
if (mt->enable_collection == collection_second)
{
- switch(mt->xml)
+ switch(mt->output_format)
{
case YAZ_MARC_MARCXML:
+ case YAZ_MARC_TMARCXML:
wrbuf_printf(wr, "</collection>\n");
break;
case YAZ_MARC_XCHANGE:
int yaz_marc_write_mode(yaz_marc_t mt, WRBUF wr)
{
- switch(mt->xml)
+ switch(mt->output_format)
{
case YAZ_MARC_LINE:
return yaz_marc_write_line(mt, wr);
int ret;
xmlNode *root_ptr;
- if (!mt->turbo_format)
+ if (yaz_marc_get_write_format(mt) == YAZ_MARC_MARCXML)
ret = yaz_marc_write_xml(mt, &root_ptr, ns, format, type);
- else
+ else // Check for Turbo XML
ret = yaz_marc_write_turbo_xml(mt, &root_ptr, ns, format, type);
if (ret == 0)
{
/* http://www.loc.gov/marc/bibliographic/ecbdldrd.html#mrcblea */
if (!mt->leader_spec)
yaz_marc_modify_leader(mt, 9, "a");
- return yaz_marc_write_marcxml_ns(mt, wr, "http://www.loc.gov/MARC21/slim",
+ char *name_space = "http://www.loc.gov/MARC21/slim";
+ if (mt->output_format == YAZ_MARC_TMARCXML)
+ name_space = "http://www.indexdata.com/MARC21/turboxml";
+ return yaz_marc_write_marcxml_ns(mt, wr, name_space,
0, 0);
}
#if YAZ_HAVE_XML2
-void add_marc_datafield_xml2(yaz_marc_t mt, struct yaz_marc_node *n, xmlNode *record_ptr, xmlNsPtr ns_record, WRBUF wr_cdata, int identifier_length)
+void add_marc_datafield_turbo_xml(yaz_marc_t mt, struct yaz_marc_node *n, xmlNode *record_ptr, xmlNsPtr ns_record, WRBUF wr_cdata, int identifier_length)
{
xmlNode *ptr;
struct yaz_marc_subfield *s;
- int turbo = mt->turbo_format;
+ int turbo = mt->output_format == YAZ_MARC_TMARCXML;
if (!turbo) {
ptr = xmlNewChild(record_ptr, ns_record, BAD_CAST "datafield", 0);
xmlNewProp(ptr, BAD_CAST "tag", BAD_CAST n->u.datafield.tag);
char field[10];
field[0] = 'd';
strncpy(field + 1, n->u.datafield.tag, 3);
+ field[4] = '\0';
ptr = xmlNewChild(record_ptr, ns_record, BAD_CAST field, 0);
}
if (n->u.datafield.indicator)
char ind_str[6];
char ind_val[2];
- sprintf(ind_str, "ind%d", i+1);
ind_val[0] = n->u.datafield.indicator[i];
ind_val[1] = '\0';
- xmlNewProp(ptr, BAD_CAST ind_str, BAD_CAST ind_val);
+ if (!turbo) {
+ sprintf(ind_str, "ind%d", i+1);
+ xmlNewProp(ptr, BAD_CAST ind_str, BAD_CAST ind_val);
+ }
+ else {
+ sprintf(ind_str, "i%d", i+1);
+ xmlNewTextChild(ptr, ns_record, BAD_CAST ind_str, BAD_CAST ind_val);
+ }
}
}
WRBUF subfield_name = wrbuf_alloc();
(s->code_data[0] >= 'A' && s->code_data[0] <= 'Z'))
{
wrbuf_iconv_write(subfield_name, mt->iconv_cd,s->code_data, using_code_len);
- ptr_subfield = xmlNewTextChild(ptr, ns_record,
- BAD_CAST wrbuf_cstr(subfield_name),
- BAD_CAST wrbuf_cstr(wr_cdata));
}
- else
- //TODO FIX
- yaz_log(YLOG_WARN, "Dropping subfield: %s", s->code_data);
+ else {
+ char buffer[2*using_code_len + 1];
+ int index;
+ for (index = 0; index < using_code_len; index++) {
+ sprintf(buffer + 2*index, "%02X", (unsigned char) s->code_data[index] & 0xFF);
+ };
+ buffer[2*(index+1)] = 0;
+ wrbuf_puts(subfield_name, "-");
+ wrbuf_puts(subfield_name, buffer);
+ yaz_log(YLOG_WARN, "Using numeric value in element name: %s", buffer);
+ }
+ ptr_subfield = xmlNewTextChild(ptr, ns_record,
+ BAD_CAST wrbuf_cstr(subfield_name),
+ BAD_CAST wrbuf_cstr(wr_cdata));
}
}
wrbuf_destroy(subfield_name);
xmlNode *record_ptr;
xmlNsPtr ns_record;
WRBUF wr_cdata = 0;
- int turbo = mt->turbo_format;
+ int turbo = mt->output_format == YAZ_MARC_TMARCXML;
for (n = mt->nodes; n; n = n->next)
if (n->which == YAZ_MARC_LEADER)
{
switch(n->which)
{
case YAZ_MARC_DATAFIELD:
- add_marc_datafield_xml2(mt, n, record_ptr, ns_record, wr_cdata, identifier_length);
+ add_marc_datafield_turbo_xml(mt, n, record_ptr, ns_record, wr_cdata, identifier_length);
break;
case YAZ_MARC_CONTROLFIELD:
wrbuf_rewind(wr_cdata);
char field[10];
field[0] = 'c';
strncpy(field + 1, n->u.controlfield.tag, 3);
+ field[4] = '\0';
ptr = xmlNewTextChild(record_ptr, ns_record,
BAD_CAST field,
BAD_CAST wrbuf_cstr(wr_cdata));
return r;
}
-void yaz_marc_xml(yaz_marc_t mt, int xmlmode)
+void yaz_marc_set_read_format(yaz_marc_t mt, int format)
+{
+ if (mt)
+ mt->input_format = format;
+}
+
+int yaz_marc_get_read_format(yaz_marc_t mt)
{
if (mt)
- mt->xml = xmlmode;
+ return mt->input_format;
+ return -1;
}
+
+void yaz_marc_set_write_format(yaz_marc_t mt, int format)
+{
+ if (mt) {
+ mt->output_format = format;
+ // Force using libxml2
+ if (mt->output_format == YAZ_MARC_TMARCXML)
+ mt->write_using_libxml2 = 1;
+ }
+}
+
+int yaz_marc_get_write_format(yaz_marc_t mt)
+{
+ if (mt)
+ return mt->output_format;
+ return -1;
+}
+
+
+/**
+ * Deprecated, use yaz_marc_set_write_format
+ */
+void yaz_marc_xml(yaz_marc_t mt, int xmlmode)
+{
+ yaz_marc_set_write_format(mt, xmlmode);
+}
+
+
+
void yaz_marc_debug(yaz_marc_t mt, int level)
{
if (mt)
mt->write_using_libxml2 = enable;
}
-void yaz_marc_write_turbo_format(yaz_marc_t mt, int enable)
+int yaz_marc_is_turbo_format(yaz_marc_t mt)
{
- mt->turbo_format = enable;
+ return mt->output_format == YAZ_MARC_TMARCXML;
}
projects / yaz-moved-to-github.git / blobdiff