/** \brief path for opening files */
char *path;
-
- /** \brief handlers */
- struct yaz_record_conv_type *types;
};
struct marc_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,
+static void *construct_xslt(const xmlNode *ptr,
const char *path, WRBUF wr_error)
{
struct _xmlAttr *attr;
#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();
}
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_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;
}
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);
+ info = t->construct(ptr, p->path, p->wr_error);
if (info || wrbuf_len(p->wr_error))
break;
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,
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);
- }
-#endif
return p;
}