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
Added support for multiple languages and charsets to be specified
[yaz-moved-to-github.git]
/
src
/
soap.c
diff --git
a/src/soap.c
b/src/soap.c
index
96a9ac1
..
3de5e29
100644
(file)
--- a/
src/soap.c
+++ b/
src/soap.c
@@
-1,8
+1,15
@@
/*
/*
- * Copyright (c) 2002-2003, Index Data.
+ * Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
* See the file LICENSE for details.
*
- * $Id: soap.c,v 1.4 2004-01-05 09:34:42 adam Exp $
+ * $Id: soap.c,v 1.10 2005-01-15 19:47:14 adam Exp $
+ */
+/**
+ * \file soap.c
+ * \brief Implements SOAP
+ *
+ * This implements encoding and decoding of SOAP packages using
+ * Libxml2.
*/
#include <yaz/soap.h>
*/
#include <yaz/soap.h>
@@
-14,10
+21,11
@@
static const char *soap_v1_1 = "http://schemas.xmlsoap.org/soap/envelope/";
static const char *soap_v1_2 = "http://www.w3.org/2001/06/soap-envelope";
static const char *soap_v1_1 = "http://schemas.xmlsoap.org/soap/envelope/";
static const char *soap_v1_2 = "http://www.w3.org/2001/06/soap-envelope";
-int z_soap_codec_enc(ODR o, Z_SOAP **pp,
- char **content_buf, int *content_len,
- Z_SOAP_Handler *handlers,
- const char *encoding)
+int z_soap_codec_enc_xsl(ODR o, Z_SOAP **pp,
+ char **content_buf, int *content_len,
+ Z_SOAP_Handler *handlers,
+ const char *encoding,
+ const char *stylesheet)
{
if (o->direction == ODR_DECODE)
{
{
if (o->direction == ODR_DECODE)
{
@@
-108,7
+116,7
@@
int z_soap_codec_enc(ODR o, Z_SOAP **pp,
ptr = ptr->children;
p->which = Z_SOAP_fault;
ptr = ptr->children;
p->which = Z_SOAP_fault;
- p->u.fault = odr_malloc(o, sizeof(*p->u.fault));
+ p->u.fault = (Z_SOAP_Fault *) odr_malloc(o, sizeof(*p->u.fault));
p->u.fault->fault_code = 0;
p->u.fault->fault_string = 0;
p->u.fault->details = 0;
p->u.fault->fault_code = 0;
p->u.fault->fault_string = 0;
p->u.fault->details = 0;
@@
-147,7
+155,8
@@
int z_soap_codec_enc(ODR o, Z_SOAP **pp,
else
{
p->which = Z_SOAP_generic;
else
{
p->which = Z_SOAP_generic;
- p->u.generic = odr_malloc(o, sizeof(*p->u.generic));
+ p->u.generic = (Z_SOAP_Generic *)
+ odr_malloc(o, sizeof(*p->u.generic));
p->u.generic->no = i;
p->u.generic->ns = handlers[i].ns;
p->u.generic->p = handler_data;
p->u.generic->no = i;
p->u.generic->ns = handlers[i].ns;
p->u.generic->p = handler_data;
@@
-202,7
+211,18
@@
int z_soap_codec_enc(ODR o, Z_SOAP **pp,
if (p->which == Z_SOAP_generic && !strcmp(p->ns, "SRU"))
{
xmlDocSetRootElement(doc, body_ptr->children);
if (p->which == Z_SOAP_generic && !strcmp(p->ns, "SRU"))
{
xmlDocSetRootElement(doc, body_ptr->children);
+ body_ptr->children = 0;
+ xmlFreeNode(envelope_ptr);
}
}
+ if (stylesheet)
+ {
+ char *content = odr_malloc(o, strlen(stylesheet) + 40);
+
+ xmlNodePtr pi, ptr = xmlDocGetRootElement(doc);
+ sprintf(content, "type=\"text/xsl\" href=\"%s\"", stylesheet);
+ pi = xmlNewPI("xml-stylesheet", content);
+ xmlAddPrevSibling(ptr, pi);
+ }
if (1)
{
xmlChar *buf_out;
if (1)
{
xmlChar *buf_out;
@@
-222,9
+242,10
@@
int z_soap_codec_enc(ODR o, Z_SOAP **pp,
return 0;
}
#else
return 0;
}
#else
-int z_soap_codec_enc(ODR o, Z_SOAP **pp,
- char **content_buf, int *content_len,
- Z_SOAP_Handler *handlers, const char *encoding)
+int z_soap_codec_enc_xsl(ODR o, Z_SOAP **pp,
+ char **content_buf, int *content_len,
+ Z_SOAP_Handler *handlers, const char *encoding,
+ const char *stylesheet)
{
static char *err_xml =
"<?xml version=\"1.0\"?>\n"
{
static char *err_xml =
"<?xml version=\"1.0\"?>\n"
@@
-246,6
+267,15
@@
int z_soap_codec_enc(ODR o, Z_SOAP **pp,
return -1;
}
#endif
return -1;
}
#endif
+int z_soap_codec_enc(ODR o, Z_SOAP **pp,
+ char **content_buf, int *content_len,
+ Z_SOAP_Handler *handlers,
+ const char *encoding)
+{
+ return z_soap_codec_enc_xsl(o, pp, content_buf, content_len, handlers,
+ encoding, 0);
+}
+
int z_soap_codec(ODR o, Z_SOAP **pp,
char **content_buf, int *content_len,
Z_SOAP_Handler *handlers)
int z_soap_codec(ODR o, Z_SOAP **pp,
char **content_buf, int *content_len,
Z_SOAP_Handler *handlers)