Changed the add_datafield_turbo_xml to match indicators as attributes

[yaz-moved-to-github.git] / src / marcdisp.c

diff --git a/src/marcdisp.c b/src/marcdisp.c
index 53d4e81..2561727 100644 (file)
--- a/src/marcdisp.c
+++ b/src/marcdisp.c
@@ -260,11 +260,11 @@ char *element_name_encode(yaz_marc_t mt, WRBUF buffer, char *code_data, size_t c
                wrbuf_puts(buffer, "-");
                int index;
                for (index = 0; index < code_len; index++) {
-                       sprintf(temp, "%02X", (unsigned char) code_data[index] & 0xFF);
-                       temp[2] = 0;
-                       wrbuf_puts(buffer, temp);
+                       sprintf(temp+2*index, "%02X", (unsigned char) code_data[index] & 0xFF);
                };
-               yaz_log(YLOG_WARN, "Using numeric value in element name: %s", wrbuf_cstr(buffer));
+               temp[2*code_len+1] = 0;
+               wrbuf_puts(buffer, temp);
+               yaz_log(YLOG_WARN, "Using numeric value in element name: %s", temp);
        }
 }
 
@@ -283,17 +283,16 @@ void yaz_marc_add_datafield_xml(yaz_marc_t mt, const xmlNode *ptr_tag,
     mt->subfield_pp = &n->u.datafield.subfields;
 }
 
-struct yaz_marc_node* yaz_marc_add_datafield_turbo_xml(yaz_marc_t mt, char *tag_value)
+void yaz_marc_add_datafield_turbo_xml(yaz_marc_t mt, char *tag_value, char *indicators)
 {
     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.indicator = indicators;
     n->u.datafield.subfields = 0;
 
-    /* make subfield_pp the current (last one) */
+    // 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)
@@ -700,9 +699,8 @@ static int yaz_marc_write_marcxml_ns1(yaz_marc_t mt, WRBUF wr,
                                         strlen(s->code_data + using_code_len));
                 marc_iconv_reset(mt, wr);
                                wrbuf_printf(wr, "</%s", subfield_name[turbo]);
-               if (turbo)
-                       wrbuf_iconv_write_cdata(wr, mt->iconv_cd,
-                                       s->code_data, using_code_len);
+                               if (turbo)
+                               element_name_encode(mt, wr, s->code_data, using_code_len);
                 wrbuf_puts(wr, ">\n");
             }
             wrbuf_printf(wr, "  </%s", datafield_name[turbo]);
@@ -743,9 +741,9 @@ static int yaz_marc_write_marcxml_ns1(yaz_marc_t mt, WRBUF wr,
             wrbuf_printf(wr, " -->\n");
             break;
         case YAZ_MARC_LEADER:
-            wrbuf_printf(wr, "  <%s>", leader_name[turbo]);
-            wrbuf_iconv_write_cdata(wr, 
-                                    0 /* no charset conversion for leader */,
+               wrbuf_printf(wr, "  <%s>", leader_name[turbo]);
+               wrbuf_iconv_write_cdata(wr,
+                                    0 , /* no charset conversion for leader */
                                     n->u.leader, strlen(n->u.leader));
             wrbuf_printf(wr, "</%s>\n", leader_name[turbo]);
         }
@@ -1362,11 +1360,6 @@ 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;
-*/
     }
 }