} xslt;
#endif
struct {
- yaz_iconv_t iconv_t;
+ const char *input_charset;
+ const char *output_charset;
int input_format;
int output_format;
} marc;
{
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)
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)
{
}
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,
input_charset, output_charset);
return -1;
}
+ yaz_iconv_close(cd);
}
else if (input_charset)
{
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 ret = 0;
struct yaz_record_conv_rule *r = p->rules;
- WRBUF res = wrbuf_alloc();
- yaz_marc_t mt = yaz_marc_create();
-
- wrbuf_rewind(p->wr_error);
- yaz_marc_xml(mt, r->u.marc.output_format);
- if (r->u.marc.iconv_t)
- yaz_marc_iconv(mt, r->u.marc.iconv_t);
- yaz_opac_decode_wrbuf(mt, input_record, res);
- if (ret != -1)
+ if (!r || r->which != YAZ_RECORD_CONV_RULE_MARC)
+ ret = -1; /* no marc rule so we can't do OPAC */
+ else
{
- ret = yaz_record_conv_record_rule(p,
- r->next,
- wrbuf_buf(res), wrbuf_len(res),
- output_record);
+ 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);
}
- yaz_marc_destroy(mt);
- wrbuf_destroy(res);
return ret;
}
{
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),
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