X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fsoap.c;h=5eb176f8465503c4a64a623e52566cbd2900b132;hb=afabe5eef1993c5b71602942f2e50a0d27ecbf33;hp=f33f2de06a71e2bec0643496420d2bc5510125ae;hpb=06eb0818f902a5d6805b656e0ba2e39ac2ed7817;p=yaz-moved-to-github.git

diff --git a/src/soap.c b/src/soap.c
index f33f2de..5eb176f 100644
--- a/src/soap.c
+++ b/src/soap.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2002-2003, Index Data.
+ * Copyright (c) 2002-2004, Index Data.
  * See the file LICENSE for details.
  *
- * $Id: soap.c,v 1.3 2003-12-20 00:51:19 adam Exp $
+ * $Id: soap.c,v 1.7 2004-01-14 00:15:56 adam Exp $
  */
 
 #include <yaz/soap.h>
@@ -14,26 +14,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_error(ODR o, Z_SOAP *p,
-                 const char *fault_code, const char *fault_string,
-                 const char *details)
-{
-    p->which = Z_SOAP_error;
-    p->u.soap_error = (Z_SOAP_Fault *) 
-        odr_malloc(o, sizeof(*p->u.soap_error));
-    p->u.soap_error->fault_code = odr_strdup(o, fault_code);
-    p->u.soap_error->fault_string = odr_strdup(o, fault_string);
-    if (details)
-        p->u.soap_error->details = odr_strdup(o, details);
-    else
-        p->u.soap_error->details = 0;
-    return -1;
-}
-
-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)
     {
@@ -218,7 +203,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);
+	    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;
@@ -238,9 +234,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)
+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"
@@ -262,6 +259,15 @@ 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)
@@ -269,3 +275,19 @@ int z_soap_codec(ODR o, Z_SOAP **pp,
     return z_soap_codec_enc(o, pp, content_buf, content_len, handlers, 0);
 }
 
+int z_soap_error(ODR o, Z_SOAP *p,
+                 const char *fault_code, const char *fault_string,
+                 const char *details)
+{
+    p->which = Z_SOAP_error;
+    p->u.soap_error = (Z_SOAP_Fault *) 
+        odr_malloc(o, sizeof(*p->u.soap_error));
+    p->u.soap_error->fault_code = odr_strdup(o, fault_code);
+    p->u.soap_error->fault_string = odr_strdup(o, fault_string);
+    if (details)
+        p->u.soap_error->details = odr_strdup(o, details);
+    else
+        p->u.soap_error->details = 0;
+    return -1;
+}
+