Changeset 1729

Timestamp:

08/12/08 17:55:24 (4 months ago)

Author:

xkovah

Message:

I can see the data is getting returned in the expected XML format, but it is not a question of the correct way to send and receive such formats from perl

Files:

• capture-mod/trunk/CaptureSoapServer.cpp (modified) (1 diff)
• capture-mod/trunk/CaptureSoapServer.h (modified) (1 diff)
• capture-mod/trunk/capture.junks.res.xml (modified) (1 diff)
• capture-mod/trunk/capture.wsdl (modified) (3 diffs)
• capture-mod/trunk/captureGSOAP.h (modified) (1 diff)
• capture-mod/trunk/client.pl (modified) (1 diff)
• capture-mod/trunk/install/CaptureBAT.exe (modified) (previous)
• capture-mod/trunk/soapC.cpp (modified) (10 diffs)
• capture-mod/trunk/soapClient.cpp (modified) (1 diff)
• capture-mod/trunk/soapH.h (modified) (18 diffs)
• capture-mod/trunk/soapServer.cpp (modified) (3 diffs)
• capture-mod/trunk/soapStub.h (modified) (17 diffs)

capture-mod/trunk/CaptureSoapServer.cpp

@@ -100 +100 @@
-}
-
-
-char * a, ns__myStruct2
+
+struct soap *soap, char * a, ns__myStruct
-{
-    printf("in ns__struct\n");
-2
+
-    bob.first = "bob";
-    bob.last = "dole";
-&
+
-
-    return SOAP_OK;
-}
-*/
-
+

capture-mod/trunk/CaptureSoapServer.h

@@ -4 +4 @@
-
-#pragma once
-
+//
-#include "Thread.h"
-

capture-mod/trunk/capture.junks.res.xml

@@ -7 +7 @@
- xmlns:ns="capture">
- <SOAP-ENV:Body SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
-Struct-1
+s
-   <first></first>
-   <last></last>
-Struct-1
+s
- </SOAP-ENV:Body>
-</SOAP-ENV:Envelope>

capture-mod/trunk/capture.wsdl

@@ -26 +26 @@
-  attributeFormDefault="unqualified">
-  <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
+  <complexType name="myStruct">
+   <complexContent>
+    <restriction base="ns:s">
+    </restriction>
+   </complexContent>
+  </complexType>
+  <complexType name="s">
+   <sequence>
+     <element name="first" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
+     <element name="last" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
+   </sequence>
+  </complexType>
- </schema>
-
-</types>
+
+<message name="junks">
+ <part name="a" type="xsd:string"/>
+</message>
+
+<message name="s">
+ <part name="first" type="xsd:string"/>
+ <part name="last" type="xsd:string"/>
+</message>
-
-<message name="addRequest">
@@ -65 +86 @@
-
-<portType name="capturePortType">
+ <operation name="junks">
+  <documentation>Service definition of function ns__junks</documentation>
+  <input message="tns:junks"/>
+  <output message="tns:s"/>
+ </operation>
- <operation name="add">
-  <documentation>Service definition of function ns__add</documentation>
@@ -89 +115 @@
-<binding name="capture" type="tns:capturePortType">
- <SOAP:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="junks">
+  <SOAP:operation style="rpc" soapAction=""/>
+  <input>
+     <SOAP:body use="encoded" namespace="capture" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+  </input>
+  <output>
+     <SOAP:body use="encoded" namespace="capture" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+  </output>
+ </operation>
- <operation name="add">
-  <SOAP:operation style="rpc" soapAction=""/>

capture-mod/trunk/captureGSOAP.h

@@ -8 +8 @@
-//gsoap ns service namespace: capture
-
-
-
+
+s
-    char * first; 
-    char * last;
-
-
+
-
-
-
+
-
-int ns__add(int a, int b, int &result); 

capture-mod/trunk/client.pl

@@ -20 +20 @@
-    -> result;
-
+
+$res = SOAP::Lite
+    -> proxy('http://192.168.0.131:1234/')
+    -> ns('capture')
+    -> junks($structData)
+    -> result;
+
-print Dumper($res);
-
+
+$res = SOAP::Lite
+    -> proxy('http://192.168.0.131:1234/')
+    -> ns('capture');
+
+my $som = $res->junks($structData);
+
+my @hashRes = $som->paramsall;
+
+join(":", @hashRes);
+print @hashRes;
+
+
+
+

capture-mod/trunk/soapC.cpp

@@ -8 +8 @@
-#include "soapH.h"
-
-8:4
+9:2
-
-
@@ -178 +178 @@
-    case SOAP_TYPE_ns__addResponse:
-        return soap_in_ns__addResponse(soap, NULL, NULL, "ns:addResponse");
+    case SOAP_TYPE_ns__junks:
+        return soap_in_ns__junks(soap, NULL, NULL, "ns:junks");
+    case SOAP_TYPE_ns__myStruct:
+        return soap_in_ns__myStruct(soap, NULL, NULL, "ns:myStruct");
+    case SOAP_TYPE_s:
+        return soap_in_s(soap, NULL, NULL, "s");
-    case SOAP_TYPE_PointerTostring:
-        return soap_in_PointerTostring(soap, NULL, NULL, "xsd:string");
@@ -232 +238 @@
-        {   *type = SOAP_TYPE_ns__addResponse;
-            return soap_in_ns__addResponse(soap, NULL, NULL, NULL);
+        }
+        if (!soap_match_tag(soap, t, "ns:junks"))
+        {   *type = SOAP_TYPE_ns__junks;
+            return soap_in_ns__junks(soap, NULL, NULL, NULL);
+        }
+        if (!soap_match_tag(soap, t, "ns:myStruct"))
+        {   *type = SOAP_TYPE_ns__myStruct;
+            return soap_in_ns__myStruct(soap, NULL, NULL, NULL);
+        }
+        if (!soap_match_tag(soap, t, "s"))
+        {   *type = SOAP_TYPE_s;
+            return soap_in_s(soap, NULL, NULL, NULL);
-        }
-        if (!soap_match_tag(soap, t, "xsd:string"))
@@ -333 +351 @@
-    case SOAP_TYPE_ns__addResponse:
-        return soap_out_ns__addResponse(soap, tag, id, (const struct ns__addResponse *)ptr, "ns:addResponse");
+    case SOAP_TYPE_ns__junks:
+        return soap_out_ns__junks(soap, tag, id, (const struct ns__junks *)ptr, "ns:junks");
+    case SOAP_TYPE_ns__myStruct:
+        return soap_out_ns__myStruct(soap, tag, id, (const struct s *)ptr, "ns:myStruct");
+    case SOAP_TYPE_s:
+        return soap_out_s(soap, tag, id, (const struct s *)ptr, "s");
-    case SOAP_TYPE_PointerTostring:
-        return soap_out_PointerTostring(soap, tag, id, (char **const*)ptr, "xsd:string");
@@ -382 +406 @@
-        soap_serialize_ns__addResponse(soap, (const struct ns__addResponse *)ptr);
-        break;
+    case SOAP_TYPE_ns__junks:
+        soap_serialize_ns__junks(soap, (const struct ns__junks *)ptr);
+        break;
+    case SOAP_TYPE_ns__myStruct:
+        soap_serialize_ns__myStruct(soap, (const struct s *)ptr);
+        break;
+    case SOAP_TYPE_s:
+        soap_serialize_s(soap, (const struct s *)ptr);
+        break;
-    case SOAP_TYPE_PointerTostring:
-        soap_serialize_PointerTostring(soap, (char **const*)ptr);
@@ -403 +436 @@
-    switch (t)
-    {
+    case SOAP_TYPE_s:
+        return (void*)soap_instantiate_s(soap, -1, type, arrayType, n);
+    case SOAP_TYPE_ns__junks:
+        return (void*)soap_instantiate_ns__junks(soap, -1, type, arrayType, n);
-    case SOAP_TYPE_ns__addResponse:
-        return (void*)soap_instantiate_ns__addResponse(soap, -1, type, arrayType, n);
@@ -439 +476 @@
-        return (void*)soap_instantiate_SOAP_ENV__Fault(soap, -1, type, arrayType, n);
-#endif
+    case SOAP_TYPE_ns__myStruct:
+        return (void*)soap_instantiate_ns__myStruct(soap, -1, type, arrayType, n);
-    }
-    return NULL;
@@ -446 +485 @@
-{   switch (p->type)
-    {
+    case SOAP_TYPE_s:
+        if (p->size < 0)
+            delete (struct s*)p->ptr;
+        else
+            delete[] (struct s*)p->ptr;
+        break;
+    case SOAP_TYPE_ns__junks:
+        if (p->size < 0)
+            delete (struct ns__junks*)p->ptr;
+        else
+            delete[] (struct ns__junks*)p->ptr;
+        break;
-    case SOAP_TYPE_ns__addResponse:
-        if (p->size < 0)
@@ -523 +574 @@
-        else
-            delete[] (struct SOAP_ENV__Fault*)p->ptr;
+        break;
+    case SOAP_TYPE_ns__myStruct:
+        if (p->size < 0)
+            delete (struct s*)p->ptr;
+        else
+            delete[] (struct s*)p->ptr;
-        break;
-    default:    return SOAP_ERR;
@@ -2197 +2254 @@
-}
-
+SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__junks(struct soap *soap, struct ns__junks *a)
+{
+    (void)soap; (void)a; /* appease -Wall -Werror */
+    soap_default_string(soap, &a->a);
+}
+
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns__junks(struct soap *soap, const struct ns__junks *a)
+{
+    (void)soap; (void)a; /* appease -Wall -Werror */
+    soap_serialize_string(soap, &a->a);
+}
+
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns__junks(struct soap *soap, const struct ns__junks *a, const char *tag, const char *type)
+{
+    register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns__junks);
+    if (soap_out_ns__junks(soap, tag, id, a, type))
+        return soap->error;
+    return soap_putindependent(soap);
+}
+
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns__junks(struct soap *soap, const char *tag, int id, const struct ns__junks *a, const char *type)
+{
+    if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns__junks), type))
+        return soap->error;
+    if (soap_out_string(soap, "a", -1, &a->a, ""))
+        return soap->error;
+    return soap_element_end_out(soap, tag);
+}
+
+SOAP_FMAC3 struct ns__junks * SOAP_FMAC4 soap_get_ns__junks(struct soap *soap, struct ns__junks *p, const char *tag, const char *type)
+{
+    if ((p = soap_in_ns__junks(soap, tag, p, type)))
+        if (soap_getindependent(soap))
+            return NULL;
+    return p;
+}
+
+SOAP_FMAC3 struct ns__junks * SOAP_FMAC4 soap_in_ns__junks(struct soap *soap, const char *tag, struct ns__junks *a, const char *type)
+{
+    short soap_flag_a = 1;
+    if (soap_element_begin_in(soap, tag, 0, type))
+        return NULL;
+    a = (struct ns__junks *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns__junks, sizeof(struct ns__junks), 0, NULL, NULL, NULL);
+    if (!a)
+        return NULL;
+    soap_default_ns__junks(soap, a);
+    if (soap->body && !*soap->href)
+    {
+        for (;;)
+        {   soap->error = SOAP_TAG_MISMATCH;
+            if (soap_flag_a && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+                if (soap_in_string(soap, "a", &a->a, "xsd:string"))
+                {   soap_flag_a--;
+                    continue;
+                }
+            if (soap->error == SOAP_TAG_MISMATCH)
+                soap->error = soap_ignore_element(soap);
+            if (soap->error == SOAP_NO_TAG)
+                break;
+            if (soap->error)
+                return NULL;
+        }
+        if (soap_element_end_in(soap, tag))
+            return NULL;
+    }
+    else
+    {   a = (struct ns__junks *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns__junks, 0, sizeof(struct ns__junks), 0, NULL);
+        if (soap->body && soap_element_end_in(soap, tag))
+            return NULL;
+    }
+    return a;
+}
+
+SOAP_FMAC5 struct ns__junks * SOAP_FMAC6 soap_new_ns__junks(struct soap *soap, int n)
+{   return soap_instantiate_ns__junks(soap, n, NULL, NULL, NULL);
+}
+
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ns__junks(struct soap *soap, struct ns__junks *p)
+{   soap_delete(soap, p);
+}
+
+SOAP_FMAC3 struct ns__junks * SOAP_FMAC4 soap_instantiate_ns__junks(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+{
+    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns__junks(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+    struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ns__junks, n, soap_fdelete);
+    if (!cp)
+        return NULL;
+    if (n < 0)
+    {   cp->ptr = (void*)new struct ns__junks;
+        if (size)
+            *size = sizeof(struct ns__junks);
+    }
+    else
+    {   cp->ptr = (void*)new struct ns__junks[n];
+        if (!cp->ptr)
+        {   soap->error = SOAP_EOM;
+            return NULL;
+        }
+        if (size)
+            *size = n * sizeof(struct ns__junks);
+    }
+        DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
+    return (struct ns__junks*)cp->ptr;
+}
+SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns__junks(struct soap *soap, int st, int tt, void *p, size_t len, const void *q, size_t n)
+{
+    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct ns__junks %p -> %p\n", q, p));
+    *(struct ns__junks*)p = *(struct ns__junks*)q;
+}
+
+SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__myStruct(struct soap *soap, struct s *a)
+{   soap_default_s(soap, a);
+}
+
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns__myStruct(struct soap *soap, struct s const*a)
+{   soap_serialize_s(soap, a);
+}
+
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns__myStruct(struct soap *soap, const struct s *a, const char *tag, const char *type)
+{
+    register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns__myStruct);
+    if (soap_out_ns__myStruct(soap, tag, id, a, type))
+        return soap->error;
+    return soap_putindependent(soap);
+}
+
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns__myStruct(struct soap *soap, const char *tag, int id, const struct s *a, const char *type)
+{
+    if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns__myStruct), type))
+        return soap->error;
+    if (soap_out_string(soap, "first", -1, &a->first, ""))
+        return soap->error;
+    if (soap_out_string(soap, "last", -1, &a->last, ""))
+        return soap->error;
+    return soap_element_end_out(soap, tag);
+}
+
+SOAP_FMAC3 struct s * SOAP_FMAC4 soap_get_ns__myStruct(struct soap *soap, struct s *p, const char *tag, const char *type)
+{
+    if ((p = soap_in_ns__myStruct(soap, tag, p, type)))
+        if (soap_getindependent(soap))
+            return NULL;
+    return p;
+}
+
+SOAP_FMAC3 struct s * SOAP_FMAC4 soap_in_ns__myStruct(struct soap *soap, const char *tag, struct s *a, const char *type)
+{
+    short soap_flag_first = 1, soap_flag_last = 1;
+    if (soap_element_begin_in(soap, tag, 0, type))
+        return NULL;
+    a = (struct s *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns__myStruct, sizeof(struct s), 0, NULL, NULL, NULL);
+    if (!a)
+        return NULL;
+    soap_default_ns__myStruct(soap, a);
+    if (soap->body && !*soap->href)
+    {
+        for (;;)
+        {   soap->error = SOAP_TAG_MISMATCH;
+            if (soap_flag_first && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+                if (soap_in_string(soap, "first", &a->first, "xsd:string"))
+                {   soap_flag_first--;
+                    continue;
+                }
+            if (soap_flag_last && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+                if (soap_in_string(soap, "last", &a->last, "xsd:string"))
+                {   soap_flag_last--;
+                    continue;
+                }
+            if (soap->error == SOAP_TAG_MISMATCH)
+                soap->error = soap_ignore_element(soap);
+            if (soap->error == SOAP_NO_TAG)
+                break;
+            if (soap->error)
+                return NULL;
+        }
+        if (soap_element_end_in(soap, tag))
+            return NULL;
+    }
+    else
+    {   a = (struct s *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns__myStruct, 0, sizeof(struct s), 0, NULL);
+        if (soap->body && soap_element_end_in(soap, tag))
+            return NULL;
+    }
+    return a;
+}
+
+SOAP_FMAC5 struct s * SOAP_FMAC6 soap_new_ns__myStruct(struct soap *soap, int n)
+{   return soap_instantiate_ns__myStruct(soap, n, NULL, NULL, NULL);
+}
+
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ns__myStruct(struct soap *soap, struct s *p)
+{   soap_delete(soap, p);
+}
+
+SOAP_FMAC3 struct s * SOAP_FMAC4 soap_instantiate_ns__myStruct(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+{
+    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns__myStruct(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+    struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ns__myStruct, n, soap_fdelete);
+    if (!cp)
+        return NULL;
+    if (n < 0)
+    {   cp->ptr = (void*)new struct s;
+        if (size)
+            *size = sizeof(struct s);
+    }
+    else
+    {   cp->ptr = (void*)new struct s[n];
+        if (!cp->ptr)
+        {   soap->error = SOAP_EOM;
+            return NULL;
+        }
+        if (size)
+            *size = n * sizeof(struct s);
+    }
+        DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
+    return (struct s*)cp->ptr;
+}
+SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns__myStruct(struct soap *soap, int st, int tt, void *p, size_t len, const void *q, size_t n)
+{
+    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct s %p -> %p\n", q, p));
+    *(struct s*)p = *(struct s*)q;
+}
+
+SOAP_FMAC3 void SOAP_FMAC4 soap_default_s(struct soap *soap, struct s *a)
+{
+    (void)soap; (void)a; /* appease -Wall -Werror */
+    soap_default_string(soap, &a->first);
+    soap_default_string(soap, &a->last);
+}
+
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_s(struct soap *soap, const struct s *a)
+{
+    (void)soap; (void)a; /* appease -Wall -Werror */
+    soap_serialize_string(soap, &a->first);
+    soap_serialize_string(soap, &a->last);
+}
+
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_s(struct soap *soap, const struct s *a, const char *tag, const char *type)
+{
+    register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_s);
+    if (soap_out_s(soap, tag, id, a, type))
+        return soap->error;
+    return soap_putindependent(soap);
+}
+
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_s(struct soap *soap, const char *tag, int id, const struct s *a, const char *type)
+{
+    if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_s), type))
+        return soap->error;
+    if (soap_out_string(soap, "first", -1, &a->first, ""))
+        return soap->error;
+    if (soap_out_string(soap, "last", -1, &a->last, ""))
+        return soap->error;
+    return soap_element_end_out(soap, tag);
+}
+
+SOAP_FMAC3 struct s * SOAP_FMAC4 soap_get_s(struct soap *soap, struct s *p, const char *tag, const char *type)
+{
+    if ((p = soap_in_s(soap, tag, p, type)))
+        if (soap_getindependent(soap))
+            return NULL;
+    return p;
+}
+
+SOAP_FMAC3 struct s * SOAP_FMAC4 soap_in_s(struct soap *soap, const char *tag, struct s *a, const char *type)
+{
+    short soap_flag_first = 1, soap_flag_last = 1;
+    if (soap_element_begin_in(soap, tag, 0, type))
+        return NULL;
+    a = (struct s *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_s, sizeof(struct s), 0, NULL, NULL, NULL);
+    if (!a)
+        return NULL;
+    soap_default_s(soap, a);
+    if (soap->body && !*soap->href)
+    {
+        for (;;)
+        {   soap->error = SOAP_TAG_MISMATCH;
+            if (soap_flag_first && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+                if (soap_in_string(soap, "first", &a->first, "xsd:string"))
+                {   soap_flag_first--;
+                    continue;
+                }
+            if (soap_flag_last && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+                if (soap_in_string(soap, "last", &a->last, "xsd:string"))
+                {   soap_flag_last--;
+                    continue;
+                }
+            if (soap->error == SOAP_TAG_MISMATCH)
+                soap->error = soap_ignore_element(soap);
+            if (soap->error == SOAP_NO_TAG)
+                break;
+            if (soap->error)
+                return NULL;
+        }
+        if (soap_element_end_in(soap, tag))
+            return NULL;
+    }
+    else
+    {   a = (struct s *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_s, 0, sizeof(struct s), 0, NULL);
+        if (soap->body && soap_element_end_in(soap, tag))
+            return NULL;
+    }
+    return a;
+}
+
+SOAP_FMAC5 struct s * SOAP_FMAC6 soap_new_s(struct soap *soap, int n)
+{   return soap_instantiate_s(soap, n, NULL, NULL, NULL);
+}
+
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_s(struct soap *soap, struct s *p)
+{   soap_delete(soap, p);
+}
+
+SOAP_FMAC3 struct s * SOAP_FMAC4 soap_instantiate_s(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+{
+    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_s(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+    struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_s, n, soap_fdelete);
+    if (!cp)
+        return NULL;
+    if (n < 0)
+    {   cp->ptr = (void*)new struct s;
+        if (size)
+            *size = sizeof(struct s);
+    }
+    else
+    {   cp->ptr = (void*)new struct s[n];
+        if (!cp->ptr)
+        {   soap->error = SOAP_EOM;
+            return NULL;
+        }
+        if (size)
+            *size = n * sizeof(struct s);
+    }
+        DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
+    return (struct s*)cp->ptr;
+}
+SOAP_FMAC3 void SOAP_FMAC4 soap_copy_s(struct soap *soap, int st, int tt, void *p, size_t len, const void *q, size_t n)
+{
+    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct s %p -> %p\n", q, p));
+    *(struct s*)p = *(struct s*)q;
+}
+
-#ifndef WITH_NOGLOBAL
-

capture-mod/trunk/soapClient.cpp

@@ -7 +7 @@
-#include "soapH.h"
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns__add(struct soap *soap, const char *soap_endpoint, const char *soap_action, int a, int b, int &result)

capture-mod/trunk/soapH.h

@@ -49 +49 @@
-
-#ifndef SOAP_TYPE_double
-18
+23
-#endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_double(struct soap*, double *);
@@ -60 +60 @@
-
-#ifndef SOAP_TYPE_SOAP_ENV__Fault
-0
+5
-#endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Fault(struct soap*, struct SOAP_ENV__Fault *);
@@ -78 +78 @@
-
-#ifndef SOAP_TYPE_SOAP_ENV__Reason
-29
+34
-#endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Reason(struct soap*, struct SOAP_ENV__Reason *);
@@ -96 +96 @@
-
-#ifndef SOAP_TYPE_SOAP_ENV__Detail
-26
+31
-#endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Detail(struct soap*, struct SOAP_ENV__Detail *);
@@ -114 +114 @@
-
-#ifndef SOAP_TYPE_SOAP_ENV__Code
-4
+9
-#endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Code(struct soap*, struct SOAP_ENV__Code *);
@@ -132 +132 @@
-
-#ifndef SOAP_TYPE_SOAP_ENV__Header
-3
+8
-#endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Header(struct soap*, struct SOAP_ENV__Header *);
@@ -148 +148 @@
-
-#ifndef SOAP_TYPE_ns__sub
-2
+7
-#endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__sub(struct soap*, struct ns__sub *);
@@ -162 +162 @@
-
-#ifndef SOAP_TYPE_ns__subResponse
-1
+6
-#endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__subResponse(struct soap*, struct ns__subResponse *);
@@ -176 +176 @@
-
-#ifndef SOAP_TYPE_ns__visit
-17
+22
-#endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__visit(struct soap*, struct ns__visit *);
@@ -190 +190 @@
-
-#ifndef SOAP_TYPE_ns__visitResponse
-16
+21
-#endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__visitResponse(struct soap*, struct ns__visitResponse *);
@@ -204 +204 @@
-
-#ifndef SOAP_TYPE_ns__ping
-4
+9
-#endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__ping(struct soap*, struct ns__ping *);
@@ -218 +218 @@
-
-#ifndef SOAP_TYPE_ns__pingResponse
-3
+8
-#endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__pingResponse(struct soap*, struct ns__pingResponse *);
@@ -232 +232 @@
-
-#ifndef SOAP_TYPE_ns__add
-0
+5
-#endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__add(struct soap*, struct ns__add *);
@@ -246 +246 @@
-
-#ifndef SOAP_TYPE_ns__addResponse
-9
+14
-#endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__addResponse(struct soap*, struct ns__addResponse *);
@@ -259 +259 @@
-SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns__addResponse(struct soap*, int, int, void*, size_t, const void*, size_t);
-
+#ifndef SOAP_TYPE_ns__junks
+#define SOAP_TYPE_ns__junks (11)
+#endif
+SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__junks(struct soap*, struct ns__junks *);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns__junks(struct soap*, const struct ns__junks *);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns__junks(struct soap*, const struct ns__junks *, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns__junks(struct soap*, const char*, int, const struct ns__junks *, const char*);
+SOAP_FMAC3 struct ns__junks * SOAP_FMAC4 soap_get_ns__junks(struct soap*, struct ns__junks *, const char*, const char*);
+SOAP_FMAC3 struct ns__junks * SOAP_FMAC4 soap_in_ns__junks(struct soap*, const char*, struct ns__junks *, const char*);
+SOAP_FMAC5 struct ns__junks * SOAP_FMAC6 soap_new_ns__junks(struct soap*, int);
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ns__junks(struct soap*, struct ns__junks*);
+SOAP_FMAC3 struct ns__junks * SOAP_FMAC4 soap_instantiate_ns__junks(struct soap*, int, const char*, const char*, size_t*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns__junks(struct soap*, int, int, void*, size_t, const void*, size_t);
+
+#ifndef SOAP_TYPE_ns__myStruct
+#define SOAP_TYPE_ns__myStruct (8)
+#endif
+SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__myStruct(struct soap*, struct s *);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns__myStruct(struct soap*, struct s const*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns__myStruct(struct soap*, const struct s *, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns__myStruct(struct soap*, const char*, int, const struct s *, const char*);
+SOAP_FMAC3 struct s * SOAP_FMAC4 soap_get_ns__myStruct(struct soap*, struct s *, const char*, const char*);
+SOAP_FMAC3 struct s * SOAP_FMAC4 soap_in_ns__myStruct(struct soap*, const char*, struct s *, const char*);
+SOAP_FMAC5 struct s * SOAP_FMAC6 soap_new_ns__myStruct(struct soap*, int);
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ns__myStruct(struct soap*, struct s*);
+SOAP_FMAC3 struct s * SOAP_FMAC4 soap_instantiate_ns__myStruct(struct soap*, int, const char*, const char*, size_t*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns__myStruct(struct soap*, int, int, void*, size_t, const void*, size_t);
+
+#ifndef SOAP_TYPE_s
+#define SOAP_TYPE_s (7)
+#endif
+SOAP_FMAC3 void SOAP_FMAC4 soap_default_s(struct soap*, struct s *);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_s(struct soap*, const struct s *);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_s(struct soap*, const struct s *, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_s(struct soap*, const char*, int, const struct s *, const char*);
+SOAP_FMAC3 struct s * SOAP_FMAC4 soap_get_s(struct soap*, struct s *, const char*, const char*);
+SOAP_FMAC3 struct s * SOAP_FMAC4 soap_in_s(struct soap*, const char*, struct s *, const char*);
+SOAP_FMAC5 struct s * SOAP_FMAC6 soap_new_s(struct soap*, int);
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_s(struct soap*, struct s*);
+SOAP_FMAC3 struct s * SOAP_FMAC4 soap_instantiate_s(struct soap*, int, const char*, const char*, size_t*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_copy_s(struct soap*, int, int, void*, size_t, const void*, size_t);
+
-#ifndef WITH_NOGLOBAL
-
-#ifndef SOAP_TYPE_PointerToSOAP_ENV__Reason
-2
+7
-#endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Reason(struct soap*, struct SOAP_ENV__Reason *const*);
@@ -275 +317 @@
-
-#ifndef SOAP_TYPE_PointerToSOAP_ENV__Detail
-1
+6
-#endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Detail(struct soap*, struct SOAP_ENV__Detail *const*);
@@ -288 +330 @@
-
-#ifndef SOAP_TYPE_PointerToSOAP_ENV__Code
-25
+30
-#endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Code(struct soap*, struct SOAP_ENV__Code *const*);
@@ -299 +341 @@
-
-#ifndef SOAP_TYPE_PointerTostring
-1
+6
-#endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTostring(struct soap*, char **const*);

capture-mod/trunk/soapServer.cpp

@@ -7 +7 @@
-#include "soapH.h"
-
-8:4
+9:2
-
-
@@ -74 +74 @@
-{
-    soap_peek_element(soap);
+    if (!soap_match_tag(soap, soap->tag, "ns:junks"))
+        return soap_serve_ns__junks(soap);
-    if (!soap_match_tag(soap, soap->tag, "ns:add"))
-        return soap_serve_ns__add(soap);
@@ -86 +88 @@
-#endif
-
+SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns__junks(struct soap *soap)
+{   struct ns__junks soap_tmp_ns__junks;
+    struct s result;
+    soap_default_ns__myStruct(soap, &result);
+    soap_default_ns__junks(soap, &soap_tmp_ns__junks);
+    soap->encodingStyle = "";
+    if (!soap_get_ns__junks(soap, &soap_tmp_ns__junks, "ns:junks", NULL))
+        return soap->error;
+    if (soap_body_end_in(soap)
+     || soap_envelope_end_in(soap)
+     || soap_end_recv(soap))
+        return soap->error;
+    soap->error = ns__junks(soap, soap_tmp_ns__junks.a, result);
+    if (soap->error)
+        return soap->error;
+    soap_serializeheader(soap);
+    soap_serialize_ns__myStruct(soap, &result);
+    if (soap_begin_count(soap))
+        return soap->error;
+    if (soap->mode & SOAP_IO_LENGTH)
+    {   if (soap_envelope_begin_out(soap)
+         || soap_putheader(soap)
+         || soap_body_begin_out(soap)
+         || soap_put_ns__myStruct(soap, &result, "ns:myStruct", "")
+         || soap_body_end_out(soap)
+         || soap_envelope_end_out(soap))
+             return soap->error;
+    };
+    if (soap_end_count(soap)
+     || soap_response(soap, SOAP_OK)
+     || soap_envelope_begin_out(soap)
+     || soap_putheader(soap)
+     || soap_body_begin_out(soap)
+     || soap_put_ns__myStruct(soap, &result, "ns:myStruct", "")
+     || soap_body_end_out(soap)
+     || soap_envelope_end_out(soap)
+     || soap_end_send(soap))
+        return soap->error;
+    return soap_closesock(soap);
+}
+
-SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns__add(struct soap *soap)
-{   struct ns__add soap_tmp_ns__add;

capture-mod/trunk/soapStub.h

@@ -28 +28 @@
-#endif
-
+#ifndef SOAP_TYPE_s
+#define SOAP_TYPE_s (7)
+/* s */
+struct s
+{
+public:
+    char *first;    /* SOAP 1.2 RPC return element (when namespace qualified) */    /* optional element of type xsd:string */
+    char *last; /* optional element of type xsd:string */
+};
+#endif
+
+#ifndef SOAP_TYPE_ns__junks
+#define SOAP_TYPE_ns__junks (11)
+/* ns:junks */
+struct ns__junks
+{
+public:
+    char *a;    /* optional element of type xsd:string */
+};
+#endif
+
-#ifndef SOAP_TYPE_ns__addResponse
-9
+14
-/* ns:addResponse */
-struct ns__addResponse
@@ -39 +60 @@
-
-#ifndef SOAP_TYPE_ns__add
-0
+5
-/* ns:add */
-struct ns__add
@@ -50 +71 @@
-
-#ifndef SOAP_TYPE_ns__pingResponse
-3
+8
-/* ns:pingResponse */
-struct ns__pingResponse
@@ -60 +81 @@
-
-#ifndef SOAP_TYPE_ns__ping
-4
+9
-/* ns:ping */
-struct ns__ping
@@ -70 +91 @@
-
-#ifndef SOAP_TYPE_ns__visitResponse
-16
+21
-/* ns:visitResponse */
-struct ns__visitResponse
@@ -80 +101 @@
-
-#ifndef SOAP_TYPE_ns__visit
-17
+22
-/* ns:visit */
-struct ns__visit
@@ -90 +111 @@
-
-#ifndef SOAP_TYPE_ns__subResponse
-1
+6
-/* ns:subResponse */
-struct ns__subResponse