X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Frecord_conv.c;h=731fa35654e4a92ba4643962fa75d9434183c6da;hp=18097244387df11b3355d033714bab7c7762e874;hb=9baecd2ded07c89696c86ab0a5ac8a324f47e779;hpb=922a7e99f2317972f9d6f3329d37a7583f57cbaa diff --git a/src/record_conv.c b/src/record_conv.c index 1809724..731fa35 100644 --- a/src/record_conv.c +++ b/src/record_conv.c @@ -1,5 +1,5 @@ /* 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. */ /** @@ -194,6 +194,7 @@ static void *construct_xslt(const xmlNode *ptr, { wrbuf_printf(wr_error, "Element : " "attribute 'stylesheet' expected"); + nmem_destroy(nmem); return 0; } else @@ -207,7 +208,8 @@ static void *construct_xslt(const xmlNode *ptr, stylesheet, stylesheet); if (path) wrbuf_printf(wr_error, " with path '%s'", path); - + + nmem_destroy(nmem); return 0; } info->xsp_doc = xmlParseFile(fullpath); @@ -217,6 +219,7 @@ static void *construct_xslt(const xmlNode *ptr, " xml parse failed: %s", stylesheet, fullpath); if (path) wrbuf_printf(wr_error, " with path '%s'", path); + nmem_destroy(nmem); return 0; } /* need to copy this before passing it to the processor. It will @@ -230,7 +233,7 @@ static void *construct_xslt(const xmlNode *ptr, wrbuf_printf(wr_error, " with path '%s'", path); wrbuf_printf(wr_error, " (" #if YAZ_HAVE_EXSLT - + "EXSLT enabled" #else "EXSLT not supported" @@ -270,7 +273,7 @@ static int convert_xslt(void *vinfo, WRBUF record, WRBUF wr_error) { xmlChar *out_buf = 0; int out_len; - + #if HAVE_XSLTSAVERESULTTOSTRING xsltSaveResultToString(&out_buf, &out_len, res, xsp); #else @@ -286,7 +289,7 @@ static int convert_xslt(void *vinfo, WRBUF record, WRBUF wr_error) { wrbuf_rewind(record); wrbuf_write(record, (const char *) out_buf, out_len); - + xmlFree(out_buf); } xmlFreeDoc(res); @@ -361,7 +364,7 @@ static void *construct_marc(const xmlNode *ptr, { wrbuf_printf(wr_error, "Element : expected attributes" "'inputformat', 'inputcharset', 'outputformat' or" - " 'outputcharset', got attribute '%s'", + " 'outputcharset', got attribute '%s'", attr->name); nmem_destroy(info->nmem); return 0; @@ -382,7 +385,7 @@ static void *construct_marc(const xmlNode *ptr, { info->input_format_mode = YAZ_MARC_MARCXML; /** Libxml2 generates UTF-8 encoding by default . - So we convert from UTF-8 to outputcharset (if defined) + So we convert from UTF-8 to outputcharset (if defined) */ if (!info->input_charset && info->output_charset) info->input_charset = "utf-8"; @@ -391,15 +394,15 @@ static void *construct_marc(const xmlNode *ptr, { wrbuf_printf(wr_error, "Element : " " Unsupported input format" - " defined by attribute value", + " defined by attribute value", input_format); nmem_destroy(info->nmem); return 0; } - + if (!output_format) { - wrbuf_printf(wr_error, + wrbuf_printf(wr_error, "Element : attribute 'outputformat' required"); nmem_destroy(info->nmem); return 0; @@ -434,7 +437,7 @@ static void *construct_marc(const xmlNode *ptr, { wrbuf_printf(wr_error, "Element : " " Unsupported output format" - " defined by attribute value", + " defined by attribute value", output_format); nmem_destroy(info->nmem); return 0; @@ -445,7 +448,7 @@ static void *construct_marc(const xmlNode *ptr, info->input_charset); if (!cd) { - wrbuf_printf(wr_error, + wrbuf_printf(wr_error, "Element :" " Unsupported character set mapping" " defined by attribute values", @@ -478,14 +481,14 @@ static int convert_marc(void *info, WRBUF record, WRBUF wr_error) { struct marc_info *mi = info; int ret = 0; - + yaz_iconv_t cd = yaz_iconv_open(mi->output_charset, mi->input_charset); yaz_marc_t mt = yaz_marc_create(); - + yaz_marc_xml(mt, mi->output_format_mode); if (mi->leader_spec) yaz_marc_leader_spec(mt, mi->leader_spec); - + if (cd) yaz_marc_iconv(mt, cd); if (mi->input_format_mode == YAZ_MARC_ISO2709) @@ -536,7 +539,7 @@ static int convert_marc(void *info, WRBUF record, WRBUF wr_error) static void destroy_marc(void *info) { struct marc_info *mi = info; - + nmem_destroy(mi->nmem); } @@ -544,7 +547,7 @@ int yaz_record_conv_configure_t(yaz_record_conv_t p, const xmlNode *ptr, struct yaz_record_conv_type *types) { struct yaz_record_conv_type bt[2]; - + /* register marc */ bt[0].construct = construct_marc; bt[0].convert = convert_marc; @@ -560,7 +563,7 @@ int yaz_record_conv_configure_t(yaz_record_conv_t p, const xmlNode *ptr, #else bt[0].next = types; #endif - + yaz_record_conv_reset(p); /* parsing element children */ @@ -613,7 +616,7 @@ static int yaz_record_conv_record_rule(yaz_record_conv_t p, int ret = 0; WRBUF record = output_record; /* pointer transfer */ wrbuf_rewind(p->wr_error); - + wrbuf_write(record, input_record_buf, input_record_len); for (; ret == 0 && r; r = r->next) ret = r->type->convert(r->info, record, p->wr_error); @@ -636,16 +639,16 @@ int yaz_record_conv_opac_record(yaz_record_conv_t p, yaz_marc_t mt = yaz_marc_create(); yaz_iconv_t cd = yaz_iconv_open(mi->output_charset, mi->input_charset); - + wrbuf_rewind(p->wr_error); yaz_marc_xml(mt, mi->output_format_mode); - + yaz_marc_iconv(mt, cd); - + yaz_opac_decode_wrbuf(mt, input_record, res); if (ret != -1) { - ret = yaz_record_conv_record_rule(p, + ret = yaz_record_conv_record_rule(p, r->next, wrbuf_buf(res), wrbuf_len(res), output_record); @@ -689,8 +692,8 @@ yaz_record_conv_t yaz_record_conv_create() p->rules = 0; p->path = 0; #if YAZ_HAVE_EXSLT - exsltRegisterAll(); -#endif + exsltRegisterAll(); +#endif return p; }