X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Frecord_conv.c;h=851ec9f5112932578f43a81b003ef409da455b72;hp=9d8a934089e33afb82ceda21b546a265965193a4;hb=4efb9de61a4284830d3dde10a992a42067879c84;hpb=fc6d778b923000b5c6ad8e108b0b184178a9d33f diff --git a/src/record_conv.c b/src/record_conv.c index 9d8a934..851ec9f 100644 --- a/src/record_conv.c +++ b/src/record_conv.c @@ -1,8 +1,6 @@ -/* - * Copyright (C) 2005-2006, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2009 Index Data * See the file LICENSE for details. - * - * $Id: record_conv.c,v 1.11 2006-07-06 10:17:53 adam Exp $ */ /** * \file record_conv.c @@ -21,6 +19,7 @@ #include #include #include +#include #if YAZ_HAVE_XML2 #include @@ -59,18 +58,18 @@ enum YAZ_RECORD_CONV_RULE YAZ_RECORD_CONV_RULE_MARC }; - /** \brief tranformation info (rule info) */ struct yaz_record_conv_rule { enum YAZ_RECORD_CONV_RULE which; union { #if YAZ_HAVE_XSLT struct { - xsltStylesheetPtr xsp; + xmlDocPtr xsp_doc; } xslt; #endif struct { - yaz_iconv_t iconv_t; + const char *input_charset; + const char *output_charset; int input_format; int output_format; } marc; @@ -81,18 +80,18 @@ 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) { if (r->which == YAZ_RECORD_CONV_RULE_MARC) { - if (r->u.marc.iconv_t) - yaz_iconv_close(r->u.marc.iconv_t); + ; } #if YAZ_HAVE_XSLT else if (r->which == YAZ_RECORD_CONV_RULE_XSLT) { - xsltFreeStylesheet(r->u.xslt.xsp); + xmlFreeDoc(r->u.xslt.xsp_doc); } #endif } @@ -106,7 +105,7 @@ static void yaz_record_conv_reset(yaz_record_conv_t p) yaz_record_conv_t yaz_record_conv_create() { - yaz_record_conv_t p = xmalloc(sizeof(*p)); + yaz_record_conv_t p = (yaz_record_conv_t) xmalloc(sizeof(*p)); p->nmem = nmem_create(); p->wr_error = wrbuf_alloc(); p->rules = 0; @@ -125,7 +124,7 @@ void yaz_record_conv_destroy(yaz_record_conv_t p) { yaz_record_conv_reset(p); nmem_destroy(p->nmem); - wrbuf_free(p->wr_error, 1); + wrbuf_destroy(p->wr_error); xfree(p->path); xfree(p); } @@ -135,7 +134,8 @@ void yaz_record_conv_destroy(yaz_record_conv_t p) static struct yaz_record_conv_rule *add_rule(yaz_record_conv_t p, enum YAZ_RECORD_CONV_RULE type) { - struct yaz_record_conv_rule *r = nmem_malloc(p->nmem, sizeof(*r)); + struct yaz_record_conv_rule *r = (struct yaz_record_conv_rule *) + nmem_malloc(p->nmem, sizeof(*r)); r->which = type; r->next = 0; *p->rules_p = r; @@ -164,30 +164,57 @@ 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 { char fullpath[1024]; xsltStylesheetPtr xsp; + xmlDocPtr xsp_doc; 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'", + stylesheet, fullpath); + if (p->path) + wrbuf_printf(p->wr_error, " with path '%s'", p->path); + return -1; } - xsp = xsltParseStylesheetFile((xmlChar*) fullpath); + xsp_doc = xmlParseFile(fullpath); + if (!xsp_doc) + { + wrbuf_printf(p->wr_error, "Element: :" + " xml parse failed: %s", stylesheet, fullpath); + if (p->path) + wrbuf_printf(p->wr_error, " with path '%s'", p->path); + return -1; + } + xsp = xsltParseStylesheetDoc(xsp_doc); if (!xsp) { - wrbuf_printf(p->wr_error, "xsltParseStylesheetFile failed'"); + wrbuf_printf(p->wr_error, "Element: :" + " xslt parse failed: %s", stylesheet, fullpath); + if (p->path) + wrbuf_printf(p->wr_error, " with path '%s'", p->path); + wrbuf_printf(p->wr_error, " (" +#if YAZ_HAVE_EXSLT + + "EXSLT enabled" +#else + "EXSLT not supported" +#endif + ")"); return -1; } else { struct yaz_record_conv_rule *r = add_rule(p, YAZ_RECORD_CONV_RULE_XSLT); - r->u.xslt.xsp = xsp; + r->u.xslt.xsp_doc = xmlCopyDoc(xsp_doc, 1); + xsltFreeStylesheet(xsp); /* will free xsp_doc */ } } return 0; @@ -209,7 +236,6 @@ static int conv_marc(yaz_record_conv_t p, const xmlNode *ptr) int input_format_mode = 0; int output_format_mode = 0; struct yaz_record_conv_rule *r; - yaz_iconv_t cd = 0; for (attr = ptr->properties; attr; attr = attr->next) { @@ -227,13 +253,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 +281,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,86 +316,117 @@ 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) { - cd = yaz_iconv_open(output_charset, input_charset); + yaz_iconv_t 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; } + yaz_iconv_close(cd); } 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); - r->u.marc.iconv_t = cd; + r->u.marc.input_charset = nmem_strdup(p->nmem, input_charset); + r->u.marc.output_charset = nmem_strdup(p->nmem, output_charset); r->u.marc.input_format = input_format_mode; r->u.marc.output_format = output_format_mode; 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 YAZ_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; + } } - } + return 0; +} + +static int yaz_record_conv_record_rule(yaz_record_conv_t p, + struct yaz_record_conv_rule *r, + const char *input_record_buf, + size_t input_record_len, + WRBUF output_record); + +int yaz_record_conv_opac_record(yaz_record_conv_t p, + Z_OPACRecord *input_record, + WRBUF output_record) +{ + int ret = 0; + struct yaz_record_conv_rule *r = p->rules; + if (!r || r->which != YAZ_RECORD_CONV_RULE_MARC) + ret = -1; /* no marc rule so we can't do OPAC */ else { - wrbuf_printf(p->wr_error, "Missing 'convert' element"); - return -1; + WRBUF res = wrbuf_alloc(); + yaz_marc_t mt = yaz_marc_create(); + yaz_iconv_t cd = yaz_iconv_open(r->u.marc.output_charset, + r->u.marc.input_charset); + + wrbuf_rewind(p->wr_error); + yaz_marc_xml(mt, r->u.marc.output_format); + + yaz_marc_iconv(mt, cd); + + yaz_opac_decode_wrbuf(mt, input_record, res); + if (ret != -1) + { + ret = yaz_record_conv_record_rule(p, + r->next, + wrbuf_buf(res), wrbuf_len(res), + output_record); + } + yaz_marc_destroy(mt); + if (cd) + yaz_iconv_close(cd); + wrbuf_destroy(res); } - return 0; + return ret; } int yaz_record_conv_record(yaz_record_conv_t p, @@ -369,9 +434,19 @@ int yaz_record_conv_record(yaz_record_conv_t p, size_t input_record_len, WRBUF output_record) { + return yaz_record_conv_record_rule(p, p->rules, + input_record_buf, + input_record_len, output_record); +} + +static int yaz_record_conv_record_rule(yaz_record_conv_t p, + struct yaz_record_conv_rule *r, + const char *input_record_buf, + size_t input_record_len, + WRBUF output_record) +{ int ret = 0; WRBUF record = output_record; /* pointer transfer */ - struct yaz_record_conv_rule *r = p->rules; wrbuf_rewind(p->wr_error); wrbuf_write(record, input_record_buf, input_record_len); @@ -379,12 +454,15 @@ int yaz_record_conv_record(yaz_record_conv_t p, { if (r->which == YAZ_RECORD_CONV_RULE_MARC) { + yaz_iconv_t cd = + yaz_iconv_open(r->u.marc.output_charset, + r->u.marc.input_charset); yaz_marc_t mt = yaz_marc_create(); yaz_marc_xml(mt, r->u.marc.output_format); - if (r->u.marc.iconv_t) - yaz_marc_iconv(mt, r->u.marc.iconv_t); + if (cd) + yaz_marc_iconv(mt, cd); if (r->u.marc.input_format == YAZ_MARC_ISO2709) { int sz = yaz_marc_read_iso2709(mt, wrbuf_buf(record), @@ -423,6 +501,8 @@ int yaz_record_conv_record(yaz_record_conv_t p, if (ret) wrbuf_printf(p->wr_error, "yaz_marc_write_mode failed"); } + if (cd) + yaz_iconv_close(cd); yaz_marc_destroy(mt); } #if YAZ_HAVE_XSLT @@ -437,15 +517,16 @@ int yaz_record_conv_record(yaz_record_conv_t p, } else { - xmlDocPtr res = xsltApplyStylesheet(r->u.xslt.xsp, doc, 0); + xmlDocPtr xsp_doc = xmlCopyDoc(r->u.xslt.xsp_doc, 1); + xsltStylesheetPtr xsp = xsltParseStylesheetDoc(xsp_doc); + xmlDocPtr res = xsltApplyStylesheet(xsp, doc, 0); if (res) { xmlChar *out_buf = 0; int out_len; #if YAZ_HAVE_XSLTSAVERESULTTOSTRING - xsltSaveResultToString(&out_buf, &out_len, res, - r->u.xslt.xsp); + xsltSaveResultToString(&out_buf, &out_len, res, xsp); #else xmlDocDumpFormatMemory (res, &out_buf, &out_len, 1); #endif @@ -470,6 +551,7 @@ int yaz_record_conv_record(yaz_record_conv_t p, ret = -1; } xmlFreeDoc(doc); + xsltFreeStylesheet(xsp); /* frees xsp_doc too */ } } #endif @@ -479,7 +561,7 @@ int yaz_record_conv_record(yaz_record_conv_t p, const char *yaz_record_conv_get_error(yaz_record_conv_t p) { - return wrbuf_buf(p->wr_error); + return wrbuf_cstr(p->wr_error); } void yaz_record_conv_set_path(yaz_record_conv_t p, const char *path) @@ -494,6 +576,7 @@ void yaz_record_conv_set_path(yaz_record_conv_t p, const char *path) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab