/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2012 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
/**
{
wrbuf_printf(wr_error, "Element <xslt>: "
"attribute 'stylesheet' expected");
- return 0;
+ nmem_destroy(nmem);
}
else
{
stylesheet, stylesheet);
if (path)
wrbuf_printf(wr_error, " with path '%s'", path);
-
+
+ nmem_destroy(nmem);
return 0;
}
info->xsp_doc = xmlParseFile(fullpath);
" 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
wrbuf_printf(wr_error, " with path '%s'", path);
wrbuf_printf(wr_error, " ("
#if YAZ_HAVE_EXSLT
-
+
"EXSLT enabled"
#else
"EXSLT not supported"
")");
xmlFreeDoc(info->xsp_doc);
nmem_destroy(info->nmem);
- return 0;
}
else
{
{
xmlChar *out_buf = 0;
int out_len;
-
+
#if HAVE_XSLTSAVERESULTTOSTRING
xsltSaveResultToString(&out_buf, &out_len, res, xsp);
#else
{
wrbuf_rewind(record);
wrbuf_write(record, (const char *) out_buf, out_len);
-
+
xmlFree(out_buf);
}
xmlFreeDoc(res);
/* YAZ_HAVE_XSLT */
#endif
+static void *construct_solrmarc(const xmlNode *ptr,
+ const char *path, WRBUF wr_error)
+{
+ if (strcmp((const char *) ptr->name, "solrmarc"))
+ return 0;
+ return wr_error; /* any non-null ptr will do; we don't use it later*/
+}
+
+static int convert_solrmarc(void *info, WRBUF record, WRBUF wr_error)
+{
+ WRBUF w = wrbuf_alloc();
+ const char *buf = wrbuf_buf(record);
+ size_t i, sz = wrbuf_len(record);
+ for (i = 0; i < sz; i++)
+ {
+ int ch;
+ if (buf[i] == '#' && i < sz - 3 && buf[i+3] == ';'
+ && atoi_n_check(buf+i+1, 2, &ch))
+ i += 3;
+ else
+ ch = buf[i];
+ wrbuf_putc(w, ch);
+ }
+ wrbuf_rewind(record);
+ wrbuf_write(record, wrbuf_buf(w), wrbuf_len(w));
+ wrbuf_destroy(w);
+ return 0;
+}
+
+static void destroy_solrmarc(void *info)
+{
+}
static void *construct_marc(const xmlNode *ptr,
const char *path, WRBUF wr_error)
nmem_destroy(nmem);
return 0;
}
-
info->nmem = nmem;
info->input_charset = 0;
info->output_charset = 0;
{
wrbuf_printf(wr_error, "Element <marc>: expected attributes"
"'inputformat', 'inputcharset', 'outputformat' or"
- " 'outputcharset', got attribute '%s'",
+ " 'outputcharset', got attribute '%s'",
attr->name);
nmem_destroy(info->nmem);
return 0;
{
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";
}
+ else if (!strcmp(input_format, "json"))
+ {
+ info->input_format_mode = YAZ_MARC_JSON;
+ }
else
{
wrbuf_printf(wr_error, "Element <marc inputformat='%s'>: "
" 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 <marc>: attribute 'outputformat' required");
nmem_destroy(info->nmem);
return 0;
if (info->input_charset && !info->output_charset)
info->output_charset = "utf-8";
}
+ else if (!strcmp(output_format, "json"))
+ {
+ info->output_format_mode = YAZ_MARC_JSON;
+ if (info->input_charset && !info->output_charset)
+ info->output_charset = "utf-8";
+ }
else
{
wrbuf_printf(wr_error, "Element <marc outputformat='%s'>: "
" Unsupported output format"
- " defined by attribute value",
+ " defined by attribute value",
output_format);
nmem_destroy(info->nmem);
return 0;
info->input_charset);
if (!cd)
{
- wrbuf_printf(wr_error,
+ wrbuf_printf(wr_error,
"Element <marc inputcharset='%s' outputcharset='%s'>:"
" Unsupported character set mapping"
" defined by attribute values",
{
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)
static void destroy_marc(void *info)
{
struct marc_info *mi = info;
-
+
nmem_destroy(mi->nmem);
}
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];
-
+ struct yaz_record_conv_type bt[3];
+ size_t i = 0;
+
/* register marc */
- bt[0].construct = construct_marc;
- bt[0].convert = convert_marc;
- bt[0].destroy = destroy_marc;
+ bt[i].construct = construct_marc;
+ bt[i].convert = convert_marc;
+ bt[i++].destroy = destroy_marc;
+
+ bt[i-1].next = &bt[i];
+ bt[i].construct = construct_solrmarc;
+ bt[i].convert = convert_solrmarc;
+ bt[i++].destroy = destroy_solrmarc;
#if YAZ_HAVE_XSLT
/* register xslt */
- bt[0].next = &bt[1];
- bt[1].next = types;
- bt[1].construct = construct_xslt;
- bt[1].convert = convert_xslt;
- bt[1].destroy = destroy_xslt;
-#else
- bt[0].next = types;
+ bt[i-1].next = &bt[i];
+ bt[i].construct = construct_xslt;
+ bt[i].convert = convert_xslt;
+ bt[i++].destroy = destroy_xslt;
#endif
-
+
+ bt[i-1].next = types;
yaz_record_conv_reset(p);
/* parsing element children */
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);
int ret = 0;
struct yaz_record_conv_rule *r = p->rules;
if (!r || r->type->construct != construct_marc)
+ {
+ wrbuf_puts(p->wr_error, "Expecting MARC rule as first rule for OPAC");
ret = -1; /* no marc rule so we can't do OPAC */
+ }
else
{
struct marc_info *mi = r->info;
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);
p->wr_error = wrbuf_alloc();
p->rules = 0;
p->path = 0;
-#if YAZ_HAVE_EXSLT
- exsltRegisterAll();
-#endif
return p;
}