X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Frecord_conv.c;h=860a3173bcb53182cee0cd8439ba5e1e9e76bfe9;hp=4f153a90c3c9662647c6d2b84c2aa9dc23421a1b;hb=3822378d7b75625b8b879025b22bffeb5483b788;hpb=44e854d75508bb9af4a36f2644db4757e30ac985 diff --git a/src/record_conv.c b/src/record_conv.c index 4f153a9..860a317 100644 --- a/src/record_conv.c +++ b/src/record_conv.c @@ -1,8 +1,8 @@ /* - * Copyright (C) 2005-2006, Index Data ApS + * Copyright (C) 2005-2007, Index Data ApS * See the file LICENSE for details. * - * $Id: record_conv.c,v 1.9 2006-05-25 07:43:58 adam Exp $ + * $Id: record_conv.c,v 1.14 2007-01-03 08:42:15 adam Exp $ */ /** * \file record_conv.c @@ -22,15 +22,15 @@ #include #include -#if HAVE_XML2 +#if YAZ_HAVE_XML2 #include #include #include -#if HAVE_XSLT +#if YAZ_HAVE_XSLT #include #include #endif -#if HAVE_EXSLT +#if YAZ_HAVE_EXSLT #include #endif @@ -64,7 +64,7 @@ enum YAZ_RECORD_CONV_RULE struct yaz_record_conv_rule { enum YAZ_RECORD_CONV_RULE which; union { -#if HAVE_XSLT +#if YAZ_HAVE_XSLT struct { xsltStylesheetPtr xsp; } xslt; @@ -81,6 +81,7 @@ struct yaz_record_conv_rule { /** \brief reset rules+configuration */ static void yaz_record_conv_reset(yaz_record_conv_t p) { + struct yaz_record_conv_rule *r; for (r = p->rules; r; r = r->next) { @@ -89,7 +90,7 @@ static void yaz_record_conv_reset(yaz_record_conv_t p) if (r->u.marc.iconv_t) yaz_iconv_close(r->u.marc.iconv_t); } -#if HAVE_XSLT +#if YAZ_HAVE_XSLT else if (r->which == YAZ_RECORD_CONV_RULE_XSLT) { xsltFreeStylesheet(r->u.xslt.xsp); @@ -112,7 +113,7 @@ yaz_record_conv_t yaz_record_conv_create() p->rules = 0; p->path = 0; -#if HAVE_EXSLT +#if YAZ_HAVE_EXSLT exsltRegisterAll(); #endif yaz_record_conv_reset(p); @@ -146,7 +147,7 @@ static struct yaz_record_conv_rule *add_rule(yaz_record_conv_t p, /** \brief parse 'xslt' conversion node */ static int conv_xslt(yaz_record_conv_t p, const xmlNode *ptr) { -#if HAVE_XSLT +#if YAZ_HAVE_XSLT struct _xmlAttr *attr; const char *stylesheet = 0; @@ -164,7 +165,8 @@ static int conv_xslt(yaz_record_conv_t p, const xmlNode *ptr) } if (!stylesheet) { - wrbuf_printf(p->wr_error, "Missing attribute 'stylesheet'"); + wrbuf_printf(p->wr_error, "Element : " + "attribute 'stylesheet' expected"); return -1; } else @@ -173,14 +175,22 @@ static int conv_xslt(yaz_record_conv_t p, const xmlNode *ptr) xsltStylesheetPtr xsp; if (!yaz_filepath_resolve(stylesheet, p->path, 0, fullpath)) { - wrbuf_printf(p->wr_error, "could not locate '%s'. Path=%s", - stylesheet, p->path); + wrbuf_printf(p->wr_error, "Element :" + " could not locate stylesheet '%s' with path '%s'", + stylesheet, fullpath, p->path); return -1; } xsp = xsltParseStylesheetFile((xmlChar*) fullpath); if (!xsp) { - wrbuf_printf(p->wr_error, "xsltParseStylesheetFile failed'"); + wrbuf_printf(p->wr_error, "Element :" + " parsing stylesheet '%s' with path '%s' failed," +#if YAZ_HAVE_EXSLT + " EXSLT enabled", +#else + " EXSLT not supported", +#endif + stylesheet, fullpath, p->path); return -1; } else @@ -227,13 +237,17 @@ static int conv_marc(yaz_record_conv_t p, const xmlNode *ptr) output_format = (const char *) attr->children->content; else { - wrbuf_printf(p->wr_error, "Bad attribute '%s'", attr->name); + wrbuf_printf(p->wr_error, "Element : expected attributes" + "'inputformat', 'inputcharset', 'outputformat' or" + " 'outputcharset', got attribute '%s'", + attr->name); return -1; } } if (!input_format) { - wrbuf_printf(p->wr_error, "Attribute 'inputformat' required"); + wrbuf_printf(p->wr_error, "Element : " + "attribute 'inputformat' required"); return -1; } else if (!strcmp(input_format, "marc")) @@ -251,13 +265,17 @@ static int conv_marc(yaz_record_conv_t p, const xmlNode *ptr) } else { - wrbuf_printf(p->wr_error, "Bad inputformat: '%s'", input_format); + wrbuf_printf(p->wr_error, "Element : " + " Unsupported input format" + " defined by attribute value", + input_format); return -1; } if (!output_format) { - wrbuf_printf(p->wr_error, "Attribute 'outputformat' required"); + wrbuf_printf(p->wr_error, + "Element : attribute 'outputformat' required"); return -1; } else if (!strcmp(output_format, "line")) @@ -282,7 +300,10 @@ static int conv_marc(yaz_record_conv_t p, const xmlNode *ptr) } else { - wrbuf_printf(p->wr_error, "Bad outputformat: '%s'", input_format); + wrbuf_printf(p->wr_error, "Element : " + " Unsupported output format" + " defined by attribute value", + output_format); return -1; } if (input_charset && output_charset) @@ -290,20 +311,24 @@ static int conv_marc(yaz_record_conv_t p, const xmlNode *ptr) cd = yaz_iconv_open(output_charset, input_charset); if (!cd) { - wrbuf_printf(p->wr_error, "Unsupported character set mamping" - " inputcharset=%s outputcharset=%s", + wrbuf_printf(p->wr_error, + "Element :" + " Unsupported character set mapping" + " defined by attribute values", input_charset, output_charset); return -1; } } else if (input_charset) { - wrbuf_printf(p->wr_error, "Attribute 'outputcharset' missing"); + wrbuf_printf(p->wr_error, "Element : " + "attribute 'outputcharset' missing"); return -1; } else if (output_charset) { - wrbuf_printf(p->wr_error, "Attribute 'inputcharset' missing"); + wrbuf_printf(p->wr_error, "Element : " + "attribute 'inputcharset' missing"); return -1; } r = add_rule(p, YAZ_RECORD_CONV_RULE_MARC); @@ -314,53 +339,33 @@ static int conv_marc(yaz_record_conv_t p, const xmlNode *ptr) return 0; } -int yaz_record_conv_configure(yaz_record_conv_t p, const void *ptr_v) +int yaz_record_conv_configure(yaz_record_conv_t p, const xmlNode *ptr) { - const xmlNode *ptr = ptr_v; - yaz_record_conv_reset(p); - if (ptr && ptr->type == XML_ELEMENT_NODE && - !strcmp((const char *) ptr->name, "convert")) - { - for (ptr = ptr->children; ptr; ptr = ptr->next) + /* parsing element children */ + for (ptr = ptr->children; ptr; ptr = ptr->next) { if (ptr->type != XML_ELEMENT_NODE) continue; if (!strcmp((const char *) ptr->name, "xslt")) - { - if (conv_xslt(p, ptr)) - return -1; - } - else if (!strcmp((const char *) ptr->name, "exslt")) - { -#if HAVE_EXSLT - if (conv_xslt(p, ptr)) - return -1; -#else - wrbuf_printf(p->wr_error, "exslt unsupported." - " YAZ compiled without EXSLT support"); - return -1; -#endif - } + { + if (conv_xslt(p, ptr)) + return -1; + } else if (!strcmp((const char *) ptr->name, "marc")) - { - if (conv_marc(p, ptr)) - return -1; - } + { + if (conv_marc(p, ptr)) + return -1; + } else - { - wrbuf_printf(p->wr_error, "Bad element '%s'." - "Expected marc, xslt, ..", ptr->name); - return -1; - } + { + wrbuf_printf(p->wr_error, "Element : expected " + " or element, got <%s>" + , ptr->name); + return -1; + } } - } - else - { - wrbuf_printf(p->wr_error, "Missing 'convert' element"); - return -1; - } return 0; } @@ -425,7 +430,7 @@ int yaz_record_conv_record(yaz_record_conv_t p, } yaz_marc_destroy(mt); } -#if HAVE_XSLT +#if YAZ_HAVE_XSLT else if (r->which == YAZ_RECORD_CONV_RULE_XSLT) { xmlDocPtr doc = xmlParseMemory(wrbuf_buf(record), @@ -440,21 +445,33 @@ int yaz_record_conv_record(yaz_record_conv_t p, xmlDocPtr res = xsltApplyStylesheet(r->u.xslt.xsp, doc, 0); if (res) { - xmlChar *out_buf; + xmlChar *out_buf = 0; int out_len; +#if YAZ_HAVE_XSLTSAVERESULTTOSTRING xsltSaveResultToString(&out_buf, &out_len, res, r->u.xslt.xsp); - - wrbuf_rewind(record); - wrbuf_write(record, (const char *) out_buf, out_len); - - xmlFree(out_buf); +#else + xmlDocDumpFormatMemory (res, &out_buf, &out_len, 1); +#endif + if (!out_buf) + { + wrbuf_printf(p->wr_error, + "xsltSaveResultToString failed"); + ret = -1; + } + else + { + wrbuf_rewind(record); + wrbuf_write(record, (const char *) out_buf, out_len); + + xmlFree(out_buf); + } xmlFreeDoc(res); } else { - wrbuf_printf(p->wr_error, "xsltApplyStylesheet faailed"); + wrbuf_printf(p->wr_error, "xsltApplyStylesheet failed"); ret = -1; } xmlFreeDoc(doc);