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
Support for turbo marcxml
[yaz-moved-to-github.git]
/
src
/
zoom-c.c
diff --git
a/src/zoom-c.c
b/src/zoom-c.c
index
42f30a0
..
44a5646
100644
(file)
--- a/
src/zoom-c.c
+++ b/
src/zoom-c.c
@@
-2081,8
+2081,9
@@
static const char *get_record_format(ZOOM_record rec, int *len,
if (*format == '1' && len)
{
/* try to XML format res */
if (*format == '1' && len)
{
/* try to XML format res */
- xmlKeepBlanksDefault(0);
- xmlDocPtr doc = xmlParseMemory(res, *len);
+ xmlDocPtr doc;
+ xmlKeepBlanksDefault(0); /* get get xmlDocFormatMemory to work! */
+ doc = xmlParseMemory(res, *len);
if (doc)
{
if (rec->xml_mem)
if (doc)
{
if (rec->xml_mem)
@@
-2195,6
+2196,11
@@
ZOOM_API(const char *)
return get_record_format(rec, len, npr, YAZ_MARC_MARCXML, charset,
format);
}
return get_record_format(rec, len, npr, YAZ_MARC_MARCXML, charset,
format);
}
+ else if (!strcmp(type, "txml"))
+ {
+ return get_record_format(rec, len, npr, YAZ_MARC_TMARCXML, charset,
+ format);
+ }
else if (!strcmp(type, "raw"))
{
return get_record_format(rec, len, npr, YAZ_MARC_ISO2709, charset,
else if (!strcmp(type, "raw"))
{
return get_record_format(rec, len, npr, YAZ_MARC_ISO2709, charset,
@@
-4669,6
+4675,11
@@
ZOOM_API(int) ZOOM_connection_get_timeout(ZOOM_connection c)
return ZOOM_options_get_int(c->options, "timeout", 30);
}
return ZOOM_options_get_int(c->options, "timeout", 30);
}
+ZOOM_API(void) ZOOM_connection_close(ZOOM_connection c)
+{
+ do_close(c);
+}
+
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4