Fixed memory alloction errors. Added new function for turbo marcxml format. Handling...

diff --git a/src/marc_read_xml.c b/src/marc_read_xml.c
index 650106c..f68906a 100644 (file)
--- a/src/marc_read_xml.c
+++ b/src/marc_read_xml.c
@@ -99,13 +99,13 @@ const char *tag_value_extract(const char *name, char tag_buffer[5]) {
        return 0;
 }
 
        return 0;
 }
 

-// pattern <on character or -AB[CD]
+// pattern <one character or -AB[CD]

 const char *code_value_extract(const char *name, char tag_buffer[5]) {
        size_t length = strlen(name);
        if (length == 1 ) {
                return name;
        }
 const char *code_value_extract(const char *name, char tag_buffer[5]) {
        size_t length = strlen(name);
        if (length == 1 ) {
                return name;
        }

-       if (length > 2 && length < 5) {
+       if (length > 2 && length < 6) {

                if (name[0] != '-') {
                        return 0;
                }
                if (name[0] != '-') {
                        return 0;
                }

@@ -314,7 +314,7 @@ static int yaz_marc_read_xml_fields(yaz_marc_t mt, const xmlNode *ptr)
     return 0;
 }
 
     return 0;
 }
 

-struct yaz_marc_node* yaz_marc_add_datafield_turbo_xml(yaz_marc_t mt, const char *tag_value);
+struct yaz_marc_node* yaz_marc_add_datafield_turbo_xml(yaz_marc_t mt, char *tag_value);

 
 static int yaz_marc_read_turbo_xml_fields(yaz_marc_t mt, const xmlNode *ptr)
 {
 
 static int yaz_marc_read_turbo_xml_fields(yaz_marc_t mt, const xmlNode *ptr)
 {

@@ -325,7 +325,6 @@ static int yaz_marc_read_turbo_xml_fields(yaz_marc_t mt, const xmlNode *ptr)
             {
                        NMEM nmem = yaz_marc_get_nmem(mt);
                        char *buffer = (char *) nmem_malloc(nmem, 5);
             {
                        NMEM nmem = yaz_marc_get_nmem(mt);
                        char *buffer = (char *) nmem_malloc(nmem, 5);

-                       //Extract the tag value out of the rest of the element name

                        const char *tag_value = tag_value_extract((const char *)(ptr->name+1), buffer);
                 if (!tag_value)
                 {
                        const char *tag_value = tag_value_extract((const char *)(ptr->name+1), buffer);
                 if (!tag_value)
                 {

@@ -334,7 +333,6 @@ static int yaz_marc_read_turbo_xml_fields(yaz_marc_t mt, const xmlNode *ptr)
                     return -1;
                 }
                 yaz_marc_add_controlfield_turbo_xml(mt, tag_value, ptr->children);
                     return -1;
                 }
                 yaz_marc_add_controlfield_turbo_xml(mt, tag_value, ptr->children);

-                //wrbuf_destroy(tag_value);

             }
             else if (!strncmp((const char *) ptr->name, "d",1))
             {
             }
             else if (!strncmp((const char *) ptr->name, "d",1))
             {

diff --git a/src/marcdisp.c b/src/marcdisp.c
index bd03c00..75e6d3c 100644 (file)
--- a/src/marcdisp.c
+++ b/src/marcdisp.c
@@ -163,6 +163,16 @@ void yaz_marc_add_controlfield_xml(yaz_marc_t mt, const xmlNode *ptr_tag,
     n->u.controlfield.tag = nmem_text_node_cdata(ptr_tag, mt->nmem);
     n->u.controlfield.data = nmem_text_node_cdata(ptr_data, mt->nmem);
 }
     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
 
 
 #endif
 
 

@@ -527,6 +537,7 @@ int yaz_marc_write_trailer(yaz_marc_t mt, WRBUF wr)
         switch(mt->output_format)
         {
         case YAZ_MARC_MARCXML:
         switch(mt->output_format)
         {
         case YAZ_MARC_MARCXML:

+        case YAZ_MARC_TMARCXML:

             wrbuf_printf(wr, "</collection>\n");
             break;
         case YAZ_MARC_XCHANGE:
             wrbuf_printf(wr, "</collection>\n");
             break;
         case YAZ_MARC_XCHANGE:

@@ -751,6 +762,7 @@ void add_marc_datafield_turbo_xml(yaz_marc_t mt, struct yaz_marc_node *n, xmlNod
        char field[10];
        field[0] = 'd';
         strncpy(field + 1, n->u.datafield.tag, 3);
        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)
         ptr = xmlNewChild(record_ptr, ns_record, BAD_CAST field, 0);
     }
     if (n->u.datafield.indicator)

@@ -883,6 +895,7 @@ int yaz_marc_write_turbo_xml(yaz_marc_t mt, xmlNode **root_ptr,
                char field[10];
                                field[0] = 'c';
                 strncpy(field + 1, n->u.controlfield.tag, 3);
                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));
                 ptr = xmlNewTextChild(record_ptr, ns_record,
                                                                          BAD_CAST field,
                                                                          BAD_CAST wrbuf_cstr(wr_cdata));