projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use schema in Z39.50 Update.
[yaz-moved-to-github.git]
/
src
/
record_conv.c
diff --git
a/src/record_conv.c
b/src/record_conv.c
index
9d8a934
..
524171e
100644
(file)
--- a/
src/record_conv.c
+++ b/
src/record_conv.c
@@
-1,8
+1,8
@@
/*
/*
- * Copyright (C) 2005-2006, Index Data ApS
+ * Copyright (C) 2005-2007, Index Data ApS
* See the file LICENSE for details.
*
* See the file LICENSE for details.
*
- * $Id: record_conv.c,v 1.11 2006-07-06 10:17:53 adam Exp $
+ * $Id: record_conv.c,v 1.16 2007-05-06 20:12:20 adam Exp $
*/
/**
* \file record_conv.c
*/
/**
* \file record_conv.c
@@
-81,6
+81,7
@@
struct yaz_record_conv_rule {
/** \brief reset rules+configuration */
static void yaz_record_conv_reset(yaz_record_conv_t p)
{
/** \brief reset rules+configuration */
static void yaz_record_conv_reset(yaz_record_conv_t p)
{
+
struct yaz_record_conv_rule *r;
for (r = p->rules; r; r = r->next)
{
struct yaz_record_conv_rule *r;
for (r = p->rules; r; r = r->next)
{
@@
-106,7
+107,7
@@
static void yaz_record_conv_reset(yaz_record_conv_t p)
yaz_record_conv_t yaz_record_conv_create()
{
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;
p->nmem = nmem_create();
p->wr_error = wrbuf_alloc();
p->rules = 0;
@@
-125,7
+126,7
@@
void yaz_record_conv_destroy(yaz_record_conv_t p)
{
yaz_record_conv_reset(p);
nmem_destroy(p->nmem);
{
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);
}
xfree(p->path);
xfree(p);
}
@@
-135,7
+136,8
@@
void yaz_record_conv_destroy(yaz_record_conv_t p)
static struct yaz_record_conv_rule *add_rule(yaz_record_conv_t p,
enum YAZ_RECORD_CONV_RULE type)
{
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;
r->which = type;
r->next = 0;
*p->rules_p = r;
@@
-164,7
+166,8
@@
static int conv_xslt(yaz_record_conv_t p, const xmlNode *ptr)
}
if (!stylesheet)
{
}
if (!stylesheet)
{
- wrbuf_printf(p->wr_error, "Missing attribute 'stylesheet'");
+ wrbuf_printf(p->wr_error, "Element <xslt>: "
+ "attribute 'stylesheet' expected");
return -1;
}
else
return -1;
}
else
@@
-173,14
+176,22
@@
static int conv_xslt(yaz_record_conv_t p, const xmlNode *ptr)
xsltStylesheetPtr xsp;
if (!yaz_filepath_resolve(stylesheet, p->path, 0, fullpath))
{
xsltStylesheetPtr xsp;
if (!yaz_filepath_resolve(stylesheet, p->path, 0, fullpath))
{
- wrbuf_printf(p->wr_error, "could not locate '%s'. Path=%s",
- stylesheet, p->path);
+ wrbuf_printf(p->wr_error, "Element <xslt stylesheet=\"%s\"/>:"
+ " could not locate stylesheet '%s' with path '%s'",
+ stylesheet, fullpath, p->path);
return -1;
}
xsp = xsltParseStylesheetFile((xmlChar*) fullpath);
if (!xsp)
{
return -1;
}
xsp = xsltParseStylesheetFile((xmlChar*) fullpath);
if (!xsp)
{
- wrbuf_printf(p->wr_error, "xsltParseStylesheetFile failed'");
+ wrbuf_printf(p->wr_error, "Element <xslt stylesheet=\"%s\"/>:"
+ " parsing stylesheet '%s' with path '%s' failed,"
+#if YAZ_HAVE_EXSLT
+ " EXSLT enabled",
+#else
+ " EXSLT not supported",
+#endif
+ stylesheet, fullpath, p->path);
return -1;
}
else
return -1;
}
else
@@
-227,13
+238,17
@@
static int conv_marc(yaz_record_conv_t p, const xmlNode *ptr)
output_format = (const char *) attr->children->content;
else
{
output_format = (const char *) attr->children->content;
else
{
- wrbuf_printf(p->wr_error, "Bad attribute '%s'", attr->name);
+ wrbuf_printf(p->wr_error, "Element <marc>: expected attributes"
+ "'inputformat', 'inputcharset', 'outputformat' or"
+ " 'outputcharset', got attribute '%s'",
+ attr->name);
return -1;
}
}
if (!input_format)
{
return -1;
}
}
if (!input_format)
{
- wrbuf_printf(p->wr_error, "Attribute 'inputformat' required");
+ wrbuf_printf(p->wr_error, "Element <marc>: "
+ "attribute 'inputformat' required");
return -1;
}
else if (!strcmp(input_format, "marc"))
return -1;
}
else if (!strcmp(input_format, "marc"))
@@
-251,13
+266,17
@@
static int conv_marc(yaz_record_conv_t p, const xmlNode *ptr)
}
else
{
}
else
{
- wrbuf_printf(p->wr_error, "Bad inputformat: '%s'", input_format);
+ wrbuf_printf(p->wr_error, "Element <marc inputformat='%s'>: "
+ " Unsupported input format"
+ " defined by attribute value",
+ input_format);
return -1;
}
if (!output_format)
{
return -1;
}
if (!output_format)
{
- wrbuf_printf(p->wr_error, "Attribute 'outputformat' required");
+ wrbuf_printf(p->wr_error,
+ "Element <marc>: attribute 'outputformat' required");
return -1;
}
else if (!strcmp(output_format, "line"))
return -1;
}
else if (!strcmp(output_format, "line"))
@@
-282,7
+301,10
@@
static int conv_marc(yaz_record_conv_t p, const xmlNode *ptr)
}
else
{
}
else
{
- wrbuf_printf(p->wr_error, "Bad outputformat: '%s'", input_format);
+ wrbuf_printf(p->wr_error, "Element <marc outputformat='%s'>: "
+ " Unsupported output format"
+ " defined by attribute value",
+ output_format);
return -1;
}
if (input_charset && output_charset)
return -1;
}
if (input_charset && output_charset)
@@
-290,20
+312,24
@@
static int conv_marc(yaz_record_conv_t p, const xmlNode *ptr)
cd = yaz_iconv_open(output_charset, input_charset);
if (!cd)
{
cd = yaz_iconv_open(output_charset, input_charset);
if (!cd)
{
- wrbuf_printf(p->wr_error, "Unsupported character set mamping"
- " inputcharset=%s outputcharset=%s",
+ wrbuf_printf(p->wr_error,
+ "Element <marc inputcharset='%s' outputcharset='%s'>:"
+ " Unsupported character set mapping"
+ " defined by attribute values",
input_charset, output_charset);
return -1;
}
}
else if (input_charset)
{
input_charset, output_charset);
return -1;
}
}
else if (input_charset)
{
- wrbuf_printf(p->wr_error, "Attribute 'outputcharset' missing");
+ wrbuf_printf(p->wr_error, "Element <marc>: "
+ "attribute 'outputcharset' missing");
return -1;
}
else if (output_charset)
{
return -1;
}
else if (output_charset)
{
- wrbuf_printf(p->wr_error, "Attribute 'inputcharset' missing");
+ wrbuf_printf(p->wr_error, "Element <marc>: "
+ "attribute 'inputcharset' missing");
return -1;
}
r = add_rule(p, YAZ_RECORD_CONV_RULE_MARC);
return -1;
}
r = add_rule(p, YAZ_RECORD_CONV_RULE_MARC);
@@
-314,53
+340,33
@@
static int conv_marc(yaz_record_conv_t p, const xmlNode *ptr)
return 0;
}
return 0;
}
-int yaz_record_conv_configure(yaz_record_conv_t p, const void *ptr_v)
+int yaz_record_conv_configure(yaz_record_conv_t p, const xmlNode *ptr)
{
{
- const xmlNode *ptr = ptr_v;
-
yaz_record_conv_reset(p);
yaz_record_conv_reset(p);
- if (ptr && ptr->type == XML_ELEMENT_NODE &&
- !strcmp((const char *) ptr->name, "convert"))
- {
- for (ptr = ptr->children; ptr; ptr = ptr->next)
+ /* parsing element children */
+ for (ptr = ptr->children; ptr; ptr = ptr->next)
{
if (ptr->type != XML_ELEMENT_NODE)
continue;
if (!strcmp((const char *) ptr->name, "xslt"))
{
if (ptr->type != XML_ELEMENT_NODE)
continue;
if (!strcmp((const char *) ptr->name, "xslt"))
- {
- if (conv_xslt(p, ptr))
- return -1;
- }
- else if (!strcmp((const char *) ptr->name, "exslt"))
- {
-#if YAZ_HAVE_EXSLT
- if (conv_xslt(p, ptr))
- return -1;
-#else
- wrbuf_printf(p->wr_error, "exslt unsupported."
- " YAZ compiled without EXSLT support");
- return -1;
-#endif
- }
+ {
+ if (conv_xslt(p, ptr))
+ return -1;
+ }
else if (!strcmp((const char *) ptr->name, "marc"))
else if (!strcmp((const char *) ptr->name, "marc"))
- {
- if (conv_marc(p, ptr))
- return -1;
- }
+ {
+ if (conv_marc(p, ptr))
+ return -1;
+ }
else
else
- {
- wrbuf_printf(p->wr_error, "Bad element '%s'."
- "Expected marc, xslt, ..", ptr->name);
- return -1;
- }
+ {
+ wrbuf_printf(p->wr_error, "Element <backend>: expected "
+ "<marc> or <xslt> element, got <%s>"
+ , ptr->name);
+ return -1;
+ }
}
}
- }
- else
- {
- wrbuf_printf(p->wr_error, "Missing 'convert' element");
- return -1;
- }
return 0;
}
return 0;
}
@@
-479,7
+485,7
@@
int yaz_record_conv_record(yaz_record_conv_t p,
const char *yaz_record_conv_get_error(yaz_record_conv_t p)
{
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)
}
void yaz_record_conv_set_path(yaz_record_conv_t p, const char *path)