/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2012 Index Data
+ * Copyright (C) 1995-2013 Index Data
* See the file LICENSE for details.
*/
/**
/** \brief path for opening files */
char *path;
-
- /** \brief handlers */
- struct yaz_record_conv_type *types;
};
struct marc_info {
const char *output_charset;
int input_format_mode;
int output_format_mode;
+ const char *leader_spec;
};
/** \brief tranformation info (rule info) */
p->rules_p = &p->rules;
}
-void yaz_record_conv_add_type(yaz_record_conv_t p,
- struct yaz_record_conv_type *type)
-{
- struct yaz_record_conv_type **tp = &p->types;
- while (*tp)
- tp = &(*tp)->next;
- *tp = xmalloc(sizeof(*type));
- memcpy(*tp, type, sizeof(*type));
- (*tp)->next = 0;
-}
-
void yaz_record_conv_destroy(yaz_record_conv_t p)
{
if (p)
{
- struct yaz_record_conv_type *t = p->types;
-
yaz_record_conv_reset(p);
nmem_destroy(p->nmem);
wrbuf_destroy(p->wr_error);
- while (t)
- {
- struct yaz_record_conv_type *t_next = t->next;
- xfree(t);
- t = t_next;
- }
xfree(p->path);
xfree(p);
}
}
#if YAZ_HAVE_XSLT
-static void *construct_xslt(yaz_record_conv_t p, const xmlNode *ptr,
+struct xslt_info {
+ NMEM nmem;
+ xmlDocPtr xsp_doc;
+ const char **xsl_parms;
+};
+
+static void *construct_xslt(const xmlNode *ptr,
const char *path, WRBUF wr_error)
{
struct _xmlAttr *attr;
const char *stylesheet = 0;
+ struct xslt_info *info = 0;
+ NMEM nmem = 0;
+ int max_parms = 10;
+ int no_parms = 0;
if (strcmp((const char *) ptr->name, "xslt"))
return 0;
return 0;
}
}
+ nmem = nmem_create();
+ info = nmem_malloc(nmem, sizeof(*info));
+ info->nmem = nmem;
+ info->xsl_parms = nmem_malloc(
+ nmem, (2 * max_parms + 1) * sizeof(*info->xsl_parms));
+
+ for (ptr = ptr->children; ptr; ptr = ptr->next)
+ {
+ const char *name = 0;
+ const char *value = 0;
+ char *qvalue = 0;
+ if (ptr->type != XML_ELEMENT_NODE)
+ continue;
+ if (strcmp((const char *) ptr->name, "param"))
+ {
+ wrbuf_printf(wr_error, "Bad element '%s'"
+ "Expected param.", ptr->name);
+ nmem_destroy(nmem);
+ return 0;
+ }
+ for (attr = ptr->properties; attr; attr = attr->next)
+ {
+ if (!xmlStrcmp(attr->name, BAD_CAST "name") &&
+ attr->children && attr->children->type == XML_TEXT_NODE)
+ name = (const char *) attr->children->content;
+ else if (!xmlStrcmp(attr->name, BAD_CAST "value") &&
+ attr->children && attr->children->type == XML_TEXT_NODE)
+ value = (const char *) attr->children->content;
+ else
+ {
+ wrbuf_printf(wr_error, "Bad attribute '%s'"
+ "Expected name or value.", attr->name);
+ nmem_destroy(nmem);
+ return 0;
+ }
+ }
+ if (!name || !value)
+ {
+ wrbuf_printf(wr_error, "Missing attributes name or value");
+ nmem_destroy(nmem);
+ return 0;
+ }
+ if (no_parms >= max_parms)
+ {
+ wrbuf_printf(wr_error, "Too many parameters given");
+ nmem_destroy(nmem);
+ return 0;
+ }
+
+ qvalue = nmem_malloc(nmem, strlen(value) + 3);
+ strcpy(qvalue, "\'");
+ strcat(qvalue, value);
+ strcat(qvalue, "\'");
+
+ info->xsl_parms[2 * no_parms] = nmem_strdup(nmem, name);
+ info->xsl_parms[2 * no_parms + 1] = qvalue;
+ no_parms++;
+ }
+
+ info->xsl_parms[2 * no_parms] = '\0';
+
if (!stylesheet)
{
wrbuf_printf(wr_error, "Element <xslt>: "
"attribute 'stylesheet' expected");
+ nmem_destroy(nmem);
return 0;
}
else
{
char fullpath[1024];
xsltStylesheetPtr xsp;
- xmlDocPtr xsp_doc;
if (!yaz_filepath_resolve(stylesheet, path, 0, fullpath))
{
wrbuf_printf(wr_error, "Element <xslt stylesheet=\"%s\"/>:"
stylesheet, stylesheet);
if (path)
wrbuf_printf(wr_error, " with path '%s'", path);
-
+
+ nmem_destroy(nmem);
return 0;
}
- xsp_doc = xmlParseFile(fullpath);
- if (!xsp_doc)
+ info->xsp_doc = xmlParseFile(fullpath);
+ if (!info->xsp_doc)
{
wrbuf_printf(wr_error, "Element: <xslt stylesheet=\"%s\"/>:"
" 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
be encapsulated in the xsp and destroyed by xsltFreeStylesheet */
- xsp = xsltParseStylesheetDoc(xmlCopyDoc(xsp_doc, 1));
+ xsp = xsltParseStylesheetDoc(xmlCopyDoc(info->xsp_doc, 1));
if (!xsp)
{
wrbuf_printf(wr_error, "Element: <xslt stylesheet=\"%s\"/>:"
wrbuf_printf(wr_error, " with path '%s'", path);
wrbuf_printf(wr_error, " ("
#if YAZ_HAVE_EXSLT
-
+
"EXSLT enabled"
#else
"EXSLT not supported"
#endif
")");
- xmlFreeDoc(xsp_doc);
+ xmlFreeDoc(info->xsp_doc);
+ nmem_destroy(info->nmem);
return 0;
}
else
{
xsltFreeStylesheet(xsp);
- return xsp_doc;
+ return info;
}
}
return 0;
}
-static int convert_xslt(void *info, WRBUF record, WRBUF wr_error)
+static int convert_xslt(void *vinfo, WRBUF record, WRBUF wr_error)
{
int ret = 0;
+ struct xslt_info *info = vinfo;
+
xmlDocPtr doc = xmlParseMemory(wrbuf_buf(record),
wrbuf_len(record));
if (!doc)
}
else
{
- xmlDocPtr xsp_doc = xmlCopyDoc((xmlDocPtr) info, 1);
+ xmlDocPtr xsp_doc = xmlCopyDoc(info->xsp_doc, 1);
xsltStylesheetPtr xsp = xsltParseStylesheetDoc(xsp_doc);
- xmlDocPtr res = xsltApplyStylesheet(xsp, doc, 0);
+ xmlDocPtr res = xsltApplyStylesheet(xsp, doc, info->xsl_parms);
if (res)
{
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);
return ret;
}
-static void destroy_xslt(void *info)
+static void destroy_xslt(void *vinfo)
{
+ struct xslt_info *info = vinfo;
+
if (info)
{
- xmlDocPtr xsp_doc = info;
- xmlFreeDoc(xsp_doc);
+ xmlFreeDoc(info->xsp_doc);
+ nmem_destroy(info->nmem);
}
}
#endif
-static void *construct_marc(yaz_record_conv_t p, const xmlNode *ptr,
+static void *construct_marc(const xmlNode *ptr,
const char *path, WRBUF wr_error)
{
NMEM nmem = nmem_create();
info->output_charset = 0;
info->input_format_mode = 0;
info->output_format_mode = 0;
+ info->leader_spec = 0;
for (attr = ptr->properties; attr; attr = attr->next)
{
else if (!xmlStrcmp(attr->name, BAD_CAST "outputformat") &&
attr->children && attr->children->type == XML_TEXT_NODE)
output_format = (const char *) attr->children->content;
+ else if (!xmlStrcmp(attr->name, BAD_CAST "leaderspec") &&
+ attr->children && attr->children->type == XML_TEXT_NODE)
+ info->leader_spec =
+ nmem_strdup(info->nmem,(const char *) attr->children->content);
else
{
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;
}
if (!input_format)
{
- wrbuf_printf(p->wr_error, "Element <marc>: "
+ wrbuf_printf(wr_error, "Element <marc>: "
"attribute 'inputformat' required");
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";
{
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;
{
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(p->wr_error,
+ wrbuf_printf(wr_error,
"Element <marc inputcharset='%s' outputcharset='%s'>:"
" Unsupported character set mapping"
" defined by attribute values",
}
yaz_iconv_close(cd);
}
- else if (info->input_charset)
+ else if (!info->output_charset)
{
wrbuf_printf(wr_error, "Element <marc>: "
"attribute 'outputcharset' missing");
nmem_destroy(info->nmem);
return 0;
}
- else if (info->output_charset)
+ else if (!info->input_charset)
{
wrbuf_printf(wr_error, "Element <marc>: "
"attribute 'inputcharset' missing");
nmem_destroy(info->nmem);
return 0;
}
- info->input_charset = nmem_strdup(p->nmem, info->input_charset);
- info->output_charset = nmem_strdup(p->nmem, info->output_charset);
+ info->input_charset = nmem_strdup(info->nmem, info->input_charset);
+ info->output_charset = nmem_strdup(info->nmem, info->output_charset);
return info;
}
{
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(yaz_record_conv_t p, const xmlNode *ptr)
+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];
+
+ /* register marc */
+ bt[0].construct = construct_marc;
+ bt[0].convert = convert_marc;
+ bt[0].destroy = destroy_marc;
+
+#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;
+#endif
+
yaz_record_conv_reset(p);
/* parsing element children */
void *info = 0;
if (ptr->type != XML_ELEMENT_NODE)
continue;
- for (t = p->types; t; t = t->next)
+ for (t = &bt[0]; t; t = t->next)
{
wrbuf_rewind(p->wr_error);
- info = t->construct(p, ptr, p->path, p->wr_error);
- if (info)
+ info = t->construct(ptr, p->path, p->wr_error);
+
+ if (info || wrbuf_len(p->wr_error))
break;
+ /* info== 0 and no error reported , ie not handled by it */
}
if (!info)
{
- wrbuf_printf(p->wr_error, "Element <backend>: expected "
- "<marc> or <xslt> element, got <%s>"
- , ptr->name);
+ if (wrbuf_len(p->wr_error) == 0)
+ wrbuf_printf(p->wr_error, "Element <backend>: expected "
+ "<marc> or <xslt> element, got <%s>"
+ , ptr->name);
return -1;
}
r = (struct yaz_record_conv_rule *) nmem_malloc(p->nmem, sizeof(*r));
r->next = 0;
r->info = info;
- r->type = t;
+ r->type = nmem_malloc(p->nmem, sizeof(*t));
+ memcpy(r->type, t, sizeof(*t));
*p->rules_p = r;
p->rules_p = &r->next;
}
return 0;
}
+int yaz_record_conv_configure(yaz_record_conv_t p, const xmlNode *ptr)
+{
+ return yaz_record_conv_configure_t(p, ptr, 0);
+}
+
static int yaz_record_conv_record_rule(yaz_record_conv_t p,
struct yaz_record_conv_rule *r,
const char *input_record_buf,
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);
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;
- p->types = 0;
-
#if YAZ_HAVE_EXSLT
- exsltRegisterAll();
-#endif
- { /* register marc */
- struct yaz_record_conv_type t;
-
- t.construct = construct_marc;
- t.convert = convert_marc;
- t.destroy = destroy_marc;
-
- yaz_record_conv_add_type(p, &t);
- }
-#if YAZ_HAVE_XSLT
- { /* register xslt */
- struct yaz_record_conv_type t;
-
- t.construct = construct_xslt;
- t.convert = convert_xslt;
- t.destroy = destroy_xslt;
-
- yaz_record_conv_add_type(p, &t);
- }
+ exsltRegisterAll();
#endif
return p;
}
projects / yaz-moved-to-github.git / blobdiff