-/*
- * Copyright (C) 2005-2006, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
* See the file LICENSE for details.
- *
- * $Id: record_conv.c,v 1.13 2006-12-13 11:25:17 adam Exp $
*/
/**
* \file record_conv.c
#include <yaz/xmalloc.h>
#include <yaz/nmem.h>
#include <yaz/tpath.h>
+#include <yaz/z-opac.h>
#if YAZ_HAVE_XML2
#include <libxml/parser.h>
} 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)
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;
{
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);
}
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;
if (!yaz_filepath_resolve(stylesheet, p->path, 0, fullpath))
{
wrbuf_printf(p->wr_error, "Element <xslt stylesheet=\"%s\"/>:"
- " could not locate stylesheet '%s' with path '%s'",
- stylesheet, fullpath, p->path);
+ " 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);
if (!xsp)
{
- wrbuf_printf(p->wr_error, "Element <xslt stylesheet=\"%s\"/>:"
- " parsing stylesheet '%s' with path '%s' failed,"
+ wrbuf_printf(p->wr_error, "Element: <xslt stylesheet=\"%s\"/>:"
+ " 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",
+
+ "EXSLT enabled"
#else
- " EXSLT not supported",
+ "EXSLT not supported"
#endif
- stylesheet, fullpath, p->path);
+ ")");
return -1;
}
else
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;
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 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 ret;
+}
+
int yaz_record_conv_record(yaz_record_conv_t p,
const char *input_record_buf,
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);
{
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
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)
projects / yaz-moved-to-github.git / blobdiff