X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fsoap.c;h=3de5e292673833f4de0dad6d66d8997edfe0e83f;hp=316cae80e1c0a92703edce2530d702980c0c71e0;hb=4c176312acdc3444c9afc820f76a393e64668e52;hpb=b462b5047a365a76a5be26341e62b69076a33d3a

diff --git a/src/soap.c b/src/soap.c
index 316cae8..3de5e29 100644
--- a/src/soap.c
+++ b/src/soap.c
@@ -1,8 +1,15 @@
 /*
- * Copyright (c) 2002-2004, Index Data.
+ * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: soap.c,v 1.5 2004-01-07 20:36:44 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>
@@ -14,11 +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";
 
-int z_soap_codec_enc(ODR o, Z_SOAP **pp, 
-		     char **content_buf, int *content_len,
-		     Z_SOAP_Handler *handlers,
-		     const char *encoding,
-		     const char *stylesheet)
+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)
     {
@@ -109,7 +116,7 @@ int z_soap_codec_enc(ODR o, Z_SOAP **pp,
             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;
@@ -148,7 +155,8 @@ int z_soap_codec_enc(ODR o, Z_SOAP **pp,
                 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;
@@ -203,6 +211,8 @@ 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);
+	    body_ptr->children = 0;
+	    xmlFreeNode(envelope_ptr);
         }
 	if (stylesheet)
 	{
@@ -232,10 +242,10 @@ int z_soap_codec_enc(ODR o, Z_SOAP **pp,
     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,
-		     const char *stylesheet)
+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"
@@ -257,11 +267,20 @@ int z_soap_codec_enc(ODR o, Z_SOAP **pp,
     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)
 {
-    return z_soap_codec_enc(o, pp, content_buf, content_len, handlers, 0, 0);
+    return z_soap_codec_enc(o, pp, content_buf, content_len, handlers, 0);
 }
 
 int z_soap_error(ODR o, Z_SOAP *p,