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
record_render: simplify a bit
[yaz-moved-to-github.git]
/
src
/
record_render.c
diff --git
a/src/record_render.c
b/src/record_render.c
index
983667a
..
c48406c
100644
(file)
--- a/
src/record_render.c
+++ b/
src/record_render.c
@@
-34,7
+34,7
@@
static yaz_iconv_t iconv_create_charset(const char *record_charset,
yaz_iconv_t cd = 0;
char *from_set1 = 0;
char *from_set2 = 0;
yaz_iconv_t cd = 0;
char *from_set1 = 0;
char *from_set2 = 0;
- char *to_set = 0;
+ char *to_set = "utf-8";
if (record_charset && *record_charset)
{
char *cp = charset_buf;
if (record_charset && *record_charset)
{
char *cp = charset_buf;
@@
-62,11
+62,11
@@
static yaz_iconv_t iconv_create_charset(const char *record_charset,
}
if (from_set1)
}
if (from_set1)
- cd = yaz_iconv_open(to_set ? to_set : "UTF-8", from_set1);
+ cd = yaz_iconv_open(to_set, from_set1);
if (cd2)
{
if (from_set2)
if (cd2)
{
if (from_set2)
- *cd2 = yaz_iconv_open(to_set ? to_set : "UTF-8", from_set2);
+ *cd2 = yaz_iconv_open(to_set, from_set2);
else
*cd2 = 0;
}
else
*cd2 = 0;
}
@@
-276,7
+276,7
@@
static const char *base64_render(NMEM nmem, WRBUF wrbuf,
const char *expr, const char *type_spec)
{
#if YAZ_HAVE_XML2
const char *expr, const char *type_spec)
{
#if YAZ_HAVE_XML2
- xmlDocPtr doc = xmlParseMemory(buf, *len);
+ xmlDocPtr doc = xmlParseMemory(buf, strlen(buf));
if (doc)
{
xmlChar *buf_out;
if (doc)
{
xmlChar *buf_out;
@@
-325,7
+325,8
@@
static const char *base64_render(NMEM nmem, WRBUF wrbuf,
wrbuf_rewind(wrbuf);
wrbuf_write(wrbuf, (const char *) buf_out, len_out);
buf = wrbuf_cstr(wrbuf);
wrbuf_rewind(wrbuf);
wrbuf_write(wrbuf, (const char *) buf_out, len_out);
buf = wrbuf_cstr(wrbuf);
- *len = len_out;
+ if (len)
+ *len = len_out;
}
xmlFreeDoc(doc);
xmlFree(buf_out);
}
xmlFreeDoc(doc);
xmlFree(buf_out);
@@
-366,6
+367,8
@@
const char *yaz_record_render(Z_NamePlusRecord *npr, const char *schema,
{
size_t j = 0;
i = i + 8; /* skip charset= */
{
size_t j = 0;
i = i + 8; /* skip charset= */
+ while (cp[i] == ' ')
+ i++;
for (j = 0; cp[i] && cp[i] != ';' && cp[i] != ' '; i++)
{
if (j < sizeof(charset)-1)
for (j = 0; cp[i] && cp[i] != ';' && cp[i] != ' '; i++)
{
if (j < sizeof(charset)-1)
@@
-377,6
+380,8
@@
const char *yaz_record_render(Z_NamePlusRecord *npr, const char *schema,
{
size_t j = 0;
i = i + 7;
{
size_t j = 0;
i = i + 7;
+ while (cp[i] == ' ')
+ i++;
for (j = 0; cp[i] && cp[i] != ';' && cp[i] != ' '; i++)
{
if (j < sizeof(format)-1)
for (j = 0; cp[i] && cp[i] != ';' && cp[i] != ' '; i++)
{
if (j < sizeof(format)-1)
@@
-388,7
+393,8
@@
const char *yaz_record_render(Z_NamePlusRecord *npr, const char *schema,
{
size_t i0;
i = i + 7;
{
size_t i0;
i = i + 7;
-
+ while (cp[i] == ' ')
+ i++;
i0 = i;
while (cp[i] && cp[i] != ';')
i++;
i0 = i;
while (cp[i] && cp[i] != ';')
i++;
@@
-459,7
+465,7
@@
const char *yaz_record_render(Z_NamePlusRecord *npr, const char *schema,
if (base64_xpath)
{
char *type_spec = nmem_malloc(nmem,
if (base64_xpath)
{
char *type_spec = nmem_malloc(nmem,
- strlen(format) + strlen(charset) + 11);
+ strlen(type) + strlen(charset) + 11);
strcpy(type_spec, type);
if (*charset)
{
strcpy(type_spec, type);
if (*charset)
{