Changeset 1769

Timestamp:

08/27/08 13:44:49 (3 months ago)

Author:

xkovah

Message:

Got the serialization of an array of nsregEvent structs to work. Now just need to add in arrays of the other events, and support sending only the maxEventsReturned number of elements back

Files:

• capture-mod/trunk/CaptureSoapServer.cpp (modified) (3 diffs)
• capture-mod/trunk/capture.wsdl (modified) (6 diffs)
• capture-mod/trunk/captureGSOAP.h (modified) (5 diffs)
• capture-mod/trunk/install/CaptureBAT.exe (modified) (previous)
• capture-mod/trunk/soapC.cpp (modified) (29 diffs)
• capture-mod/trunk/soapClient.cpp (modified) (3 diffs)
• capture-mod/trunk/soapH.h (modified) (17 diffs)
• capture-mod/trunk/soapServer.cpp (modified) (3 diffs)
• capture-mod/trunk/soapStub.h (modified) (17 diffs)

capture-mod/trunk/CaptureSoapServer.cpp

@@ -14 +14 @@
-struct soap soap;
-
-   std::queue<struct ns__regEvent> regQ
-   std::queue<struct ns__fileEvent> fileQ
-   std::queue<struct ns__procEvent> procQ
+std::vector<struct ns__regEvent> regVec
+std::list<struct ns__fileEvent> fileList
+std::list<struct ns__procEvent> procList
-
-
@@ -116 +116 @@
-    sprintf(r.valueData, "%ls", extra.at(3).c_str());
-
-Q.push
-Q. Now there are %d elements in the queue\n", regQ
+Vec.push_back
+Vec. Now there are %d elements in the list\n", regVec
-}
-
@@ -333 +333 @@
-//If maxEventsReturned == -1, then then send as many as possible.
-//If there are no events to send back, it will send back <eventType>No Events</eventType>
-
-
-
+
+
+
+
+
+
-        printf("No events to send back\n");
-
-
-
-
-
-
-
+
-    }
-    else{
-
-
-
+
+
+
+
+
+
+
+
-    }
-

capture-mod/trunk/capture.wsdl

@@ -26 +26 @@
-  attributeFormDefault="unqualified">
-  <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-  <complexType name="procEvent-t">
-   <complexContent>
-    <restriction base="ns:procEvent">
-    </restriction>
-   </complexContent>
-  </complexType>
-  <complexType name="receiveFileStruct">
-   <complexContent>
@@ -38 +32 @@
-   </complexContent>
-  </complexType>
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-  </complexType>
-  <complexType name="fileEvent">
@@ -63 +63 @@
-   </sequence>
-  </complexType>
+  <complexType name="dynRegArray">
+   <sequence>
+    <element name="item" type="ns:regEvent" minOccurs="0" maxOccurs="unbounded" nillable="true"/>
+   </sequence>
+  </complexType>
-  <complexType name="s1">
-   <sequence>
@@ -68 +73 @@
-     <element name="encodedLength" type="xsd:unsignedInt" minOccurs="1" maxOccurs="1"/>
-     <element name="decodedLength" type="xsd:unsignedInt" minOccurs="1" maxOccurs="1"/>
-   </sequence>
-  </complexType>
-  <complexType name="s2">
-   <sequence>
-     <element name="data" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-     <element name="interEventDelimiter" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-     <element name="intraEventDelimiter" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-     <element name="numEvents" type="xsd:unsignedInt" minOccurs="1" maxOccurs="1"/>
-     <element name="moreEvents" type="xsd:byte" minOccurs="1" maxOccurs="1"/>
-   </sequence>
-  </complexType>
@@ -137 +133 @@
-</message>
-
-
+Request
- <part name="maxEventsReturned" type="xsd:int"/>
-</message>
-
-
-
-
-
-
-
-
-
-
+
+
-</message>
-
@@ -185 +174 @@
- <operation name="receiveEventsBase64">
-  <documentation>Service definition of function ns__receiveEventsBase64</documentation>
-
-gEvent
+Request
+ceiveEventsBase64Response
- </operation>
-</portType>

capture-mod/trunk/captureGSOAP.h

@@ -33 +33 @@
-};
-
-typedef 
+
-    char *  time;
-    char *  eventType;
@@ -40 +40 @@
-    int     procPID;
-    char *  procName;
-ns__procEvent_t
+
-
+
+struct ns__dynRegArray{
+    struct ns__regEvent * __ptr;
+    int __size; //number of elements
+};
-
-typedef struct s1{
@@ -50 +55 @@
-
-
+/*
-//TODO: restructure this
-typedef struct s2{
@@ -59 +65 @@
-                        //It is the Manager's responsibility to request the additional data.
-} ns__receiveEventsStruct;
+*/
-
-
@@ -68 +75 @@
-int ns__openDocument(char * fileName, int waitTimeMillisec, int &result);
-//int ns__receiveEventsBase64(int maxEventsReturned, ns__receiveEventsStruct &result);
-regEvent
+dynRegArray
-

capture-mod/trunk/soapC.cpp

@@ -8 +8 @@
-#include "soapH.h"
-
-6 03:24:2
+7 02:17:0
-
-
@@ -164 +164 @@
-    case SOAP_TYPE_ns__receiveEventsBase64:
-        return soap_in_ns__receiveEventsBase64(soap, NULL, NULL, "ns:receiveEventsBase64");
+    case SOAP_TYPE_ns__receiveEventsBase64Response:
+        return soap_in_ns__receiveEventsBase64Response(soap, NULL, NULL, "ns:receiveEventsBase64Response");
-    case SOAP_TYPE_ns__openDocument:
-        return soap_in_ns__openDocument(soap, NULL, NULL, "ns:openDocument");
@@ -186 +188 @@
-    case SOAP_TYPE_ns__pingResponse:
-        return soap_in_ns__pingResponse(soap, NULL, NULL, "ns:pingResponse");
-    case SOAP_TYPE_ns__receiveEventsStruct:
-        return soap_in_ns__receiveEventsStruct(soap, NULL, NULL, "ns:receiveEventsStruct");
-    case SOAP_TYPE_s2:
-        return soap_in_s2(soap, NULL, NULL, "s2");
-    case SOAP_TYPE_ns__receiveFileStruct:
-        return soap_in_ns__receiveFileStruct(soap, NULL, NULL, "ns:receiveFileStruct");
-    case SOAP_TYPE_s1:
-        return soap_in_s1(soap, NULL, NULL, "s1");
-procEvent_t
-procEvent_t(soap, NULL, NULL, "ns:procEvent-t
+dynRegArray
+dynRegArray(soap, NULL, NULL, "ns:dynRegArray
-    case SOAP_TYPE_ns__procEvent:
-        return soap_in_ns__procEvent(soap, NULL, NULL, "ns:procEvent");
@@ -204 +202 @@
-    case SOAP_TYPE_PointerTostring:
-        return soap_in_PointerTostring(soap, NULL, NULL, "xsd:string");
+    case SOAP_TYPE_PointerTons__regEvent:
+        return soap_in_PointerTons__regEvent(soap, NULL, NULL, "ns:regEvent");
-    case SOAP_TYPE_string:
-    {   char **s;
@@ -229 +229 @@
-            return soap_in_ns__receiveEventsBase64(soap, NULL, NULL, NULL);
-        }
+        if (!soap_match_tag(soap, t, "ns:receiveEventsBase64Response"))
+        {   *type = SOAP_TYPE_ns__receiveEventsBase64Response;
+            return soap_in_ns__receiveEventsBase64Response(soap, NULL, NULL, NULL);
+        }
-        if (!soap_match_tag(soap, t, "ns:openDocument"))
-        {   *type = SOAP_TYPE_ns__openDocument;
@@ -273 +277 @@
-            return soap_in_ns__pingResponse(soap, NULL, NULL, NULL);
-        }
-        if (!soap_match_tag(soap, t, "ns:receiveEventsStruct"))
-        {   *type = SOAP_TYPE_ns__receiveEventsStruct;
-            return soap_in_ns__receiveEventsStruct(soap, NULL, NULL, NULL);
-        }
-        if (!soap_match_tag(soap, t, "s2"))
-        {   *type = SOAP_TYPE_s2;
-            return soap_in_s2(soap, NULL, NULL, NULL);
-        }
-        if (!soap_match_tag(soap, t, "ns:receiveFileStruct"))
-        {   *type = SOAP_TYPE_ns__receiveFileStruct;
@@ -289 +285 @@
-            return soap_in_s1(soap, NULL, NULL, NULL);
-        }
-procEvent-t
-procEvent_t
-procEvent_t
+dynRegArray
+dynRegArray
+dynRegArray
-        }
-        if (!soap_match_tag(soap, t, "ns:procEvent"))
@@ -391 +387 @@
-    case SOAP_TYPE_ns__receiveEventsBase64:
-        return soap_out_ns__receiveEventsBase64(soap, tag, id, (const struct ns__receiveEventsBase64 *)ptr, "ns:receiveEventsBase64");
+    case SOAP_TYPE_ns__receiveEventsBase64Response:
+        return soap_out_ns__receiveEventsBase64Response(soap, tag, id, (const struct ns__receiveEventsBase64Response *)ptr, "ns:receiveEventsBase64Response");
-    case SOAP_TYPE_ns__openDocument:
-        return soap_out_ns__openDocument(soap, tag, id, (const struct ns__openDocument *)ptr, "ns:openDocument");
@@ -413 +411 @@
-    case SOAP_TYPE_ns__pingResponse:
-        return soap_out_ns__pingResponse(soap, tag, id, (const struct ns__pingResponse *)ptr, "ns:pingResponse");
-    case SOAP_TYPE_ns__receiveEventsStruct:
-        return soap_out_ns__receiveEventsStruct(soap, tag, id, (const struct s2 *)ptr, "ns:receiveEventsStruct");
-    case SOAP_TYPE_s2:
-        return soap_out_s2(soap, tag, id, (const struct s2 *)ptr, "s2");
-    case SOAP_TYPE_ns__receiveFileStruct:
-        return soap_out_ns__receiveFileStruct(soap, tag, id, (const struct s1 *)ptr, "ns:receiveFileStruct");
-    case SOAP_TYPE_s1:
-        return soap_out_s1(soap, tag, id, (const struct s1 *)ptr, "s1");
-procEvent_t
-procEvent_t(soap, tag, id, (const struct ns__procEvent *)ptr, "ns:procEvent-t
+dynRegArray
+dynRegArray(soap, tag, id, (const struct ns__dynRegArray *)ptr, "ns:dynRegArray
-    case SOAP_TYPE_ns__procEvent:
-        return soap_out_ns__procEvent(soap, tag, id, (const struct ns__procEvent *)ptr, "ns:procEvent");
@@ -431 +425 @@
-    case SOAP_TYPE_PointerTostring:
-        return soap_out_PointerTostring(soap, tag, id, (char **const*)ptr, "xsd:string");
+    case SOAP_TYPE_PointerTons__regEvent:
+        return soap_out_PointerTons__regEvent(soap, tag, id, (struct ns__regEvent *const*)ptr, "ns:regEvent");
-    case SOAP_TYPE__QName:
-        return soap_out_string(soap, "xsd:QName", id, (char*const*)&ptr, NULL);
@@ -457 +453 @@
-        soap_serialize_ns__receiveEventsBase64(soap, (const struct ns__receiveEventsBase64 *)ptr);
-        break;
+    case SOAP_TYPE_ns__receiveEventsBase64Response:
+        soap_serialize_ns__receiveEventsBase64Response(soap, (const struct ns__receiveEventsBase64Response *)ptr);
+        break;
-    case SOAP_TYPE_ns__openDocument:
-        soap_serialize_ns__openDocument(soap, (const struct ns__openDocument *)ptr);
@@ -490 +489 @@
-        soap_serialize_ns__pingResponse(soap, (const struct ns__pingResponse *)ptr);
-        break;
-    case SOAP_TYPE_ns__receiveEventsStruct:
-        soap_serialize_ns__receiveEventsStruct(soap, (const struct s2 *)ptr);
-        break;
-    case SOAP_TYPE_s2:
-        soap_serialize_s2(soap, (const struct s2 *)ptr);
-        break;
-    case SOAP_TYPE_ns__receiveFileStruct:
-        soap_serialize_ns__receiveFileStruct(soap, (const struct s1 *)ptr);
@@ -502 +495 @@
-        soap_serialize_s1(soap, (const struct s1 *)ptr);
-        break;
-procEvent_t
-procEvent_t(soap, (const struct ns__procEvent
+dynRegArray
+dynRegArray(soap, (const struct ns__dynRegArray
-        break;
-    case SOAP_TYPE_ns__procEvent:
@@ -516 +509 @@
-    case SOAP_TYPE_PointerTostring:
-        soap_serialize_PointerTostring(soap, (char **const*)ptr);
+        break;
+    case SOAP_TYPE_PointerTons__regEvent:
+        soap_serialize_PointerTons__regEvent(soap, (struct ns__regEvent *const*)ptr);
-        break;
-    case SOAP_TYPE__QName:
@@ -541 +537 @@
-    case SOAP_TYPE_ns__procEvent:
-        return (void*)soap_instantiate_ns__procEvent(soap, -1, type, arrayType, n);
+    case SOAP_TYPE_ns__dynRegArray:
+        return (void*)soap_instantiate_ns__dynRegArray(soap, -1, type, arrayType, n);
-    case SOAP_TYPE_s1:
-        return (void*)soap_instantiate_s1(soap, -1, type, arrayType, n);
-    case SOAP_TYPE_s2:
-        return (void*)soap_instantiate_s2(soap, -1, type, arrayType, n);
-    case SOAP_TYPE_ns__pingResponse:
-        return (void*)soap_instantiate_ns__pingResponse(soap, -1, type, arrayType, n);
@@ -567 +563 @@
-    case SOAP_TYPE_ns__openDocument:
-        return (void*)soap_instantiate_ns__openDocument(soap, -1, type, arrayType, n);
+    case SOAP_TYPE_ns__receiveEventsBase64Response:
+        return (void*)soap_instantiate_ns__receiveEventsBase64Response(soap, -1, type, arrayType, n);
-    case SOAP_TYPE_ns__receiveEventsBase64:
-        return (void*)soap_instantiate_ns__receiveEventsBase64(soap, -1, type, arrayType, n);
@@ -589 +587 @@
-        return (void*)soap_instantiate_SOAP_ENV__Fault(soap, -1, type, arrayType, n);
-#endif
-    case SOAP_TYPE_ns__procEvent_t:
-        return (void*)soap_instantiate_ns__procEvent_t(soap, -1, type, arrayType, n);
-    case SOAP_TYPE_ns__receiveFileStruct:
-        return (void*)soap_instantiate_ns__receiveFileStruct(soap, -1, type, arrayType, n);
-    case SOAP_TYPE_ns__receiveEventsStruct:
-        return (void*)soap_instantiate_ns__receiveEventsStruct(soap, -1, type, arrayType, n);
-    }
-    return NULL;
@@ -620 +614 @@
-            delete[] (struct ns__procEvent*)p->ptr;
-        break;
+    case SOAP_TYPE_ns__dynRegArray:
+        if (p->size < 0)
+            delete (struct ns__dynRegArray*)p->ptr;
+        else
+            delete[] (struct ns__dynRegArray*)p->ptr;
+        break;
-    case SOAP_TYPE_s1:
-        if (p->size < 0)
@@ -626 +626 @@
-            delete[] (struct s1*)p->ptr;
-        break;
-    case SOAP_TYPE_s2:
-        if (p->size < 0)
-            delete (struct s2*)p->ptr;
-        else
-            delete[] (struct s2*)p->ptr;
-        break;
-    case SOAP_TYPE_ns__pingResponse:
-        if (p->size < 0)
@@ -698 +692 @@
-            delete[] (struct ns__openDocument*)p->ptr;
-        break;
+    case SOAP_TYPE_ns__receiveEventsBase64Response:
+        if (p->size < 0)
+            delete (struct ns__receiveEventsBase64Response*)p->ptr;
+        else
+            delete[] (struct ns__receiveEventsBase64Response*)p->ptr;
+        break;
-    case SOAP_TYPE_ns__receiveEventsBase64:
-        if (p->size < 0)
@@ -734 +734 @@
-            delete[] (struct SOAP_ENV__Fault*)p->ptr;
-        break;
-    case SOAP_TYPE_ns__procEvent_t:
-        if (p->size < 0)
-            delete (struct ns__procEvent*)p->ptr;
-        else
-            delete[] (struct ns__procEvent*)p->ptr;
-        break;
-    case SOAP_TYPE_ns__receiveFileStruct:
-        if (p->size < 0)
@@ -745 +739 @@
-        else
-            delete[] (struct s1*)p->ptr;
-        break;
-    case SOAP_TYPE_ns__receiveEventsStruct:
-        if (p->size < 0)
-            delete (struct s2*)p->ptr;
-        else
-            delete[] (struct s2*)p->ptr;
-        break;
-    default:    return SOAP_ERR;
@@ -1630 +1618 @@
-}
-
+SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__receiveEventsBase64Response(struct soap *soap, struct ns__receiveEventsBase64Response *a)
+{
+    (void)soap; (void)a; /* appease -Wall -Werror */
+    soap_default_ns__dynRegArray(soap, &a->result);
+}
+
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns__receiveEventsBase64Response(struct soap *soap, const struct ns__receiveEventsBase64Response *a)
+{
+    (void)soap; (void)a; /* appease -Wall -Werror */
+    soap_serialize_ns__dynRegArray(soap, &a->result);
+}
+
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns__receiveEventsBase64Response(struct soap *soap, const struct ns__receiveEventsBase64Response *a, const char *tag, const char *type)
+{
+    register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns__receiveEventsBase64Response);
+    if (soap_out_ns__receiveEventsBase64Response(soap, tag, id, a, type))
+        return soap->error;
+    return soap_putindependent(soap);
+}
+
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns__receiveEventsBase64Response(struct soap *soap, const char *tag, int id, const struct ns__receiveEventsBase64Response *a, const char *type)
+{
+    if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns__receiveEventsBase64Response), type))
+        return soap->error;
+    if (soap_out_ns__dynRegArray(soap, "result", -1, &a->result, ""))
+        return soap->error;
+    return soap_element_end_out(soap, tag);
+}
+
+SOAP_FMAC3 struct ns__receiveEventsBase64Response * SOAP_FMAC4 soap_get_ns__receiveEventsBase64Response(struct soap *soap, struct ns__receiveEventsBase64Response *p, const char *tag, const char *type)
+{
+    if ((p = soap_in_ns__receiveEventsBase64Response(soap, tag, p, type)))
+        if (soap_getindependent(soap))
+            return NULL;
+    return p;
+}
+
+SOAP_FMAC3 struct ns__receiveEventsBase64Response * SOAP_FMAC4 soap_in_ns__receiveEventsBase64Response(struct soap *soap, const char *tag, struct ns__receiveEventsBase64Response *a, const char *type)
+{
+    short soap_flag_result = 1;
+    if (soap_element_begin_in(soap, tag, 0, type))
+        return NULL;
+    a = (struct ns__receiveEventsBase64Response *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns__receiveEventsBase64Response, sizeof(struct ns__receiveEventsBase64Response), 0, NULL, NULL, NULL);
+    if (!a)
+        return NULL;
+    soap_default_ns__receiveEventsBase64Response(soap, a);
+    if (soap->body && !*soap->href)
+    {
+        for (;;)
+        {   soap->error = SOAP_TAG_MISMATCH;
+            if (soap_flag_result && soap->error == SOAP_TAG_MISMATCH)
+                if (soap_in_ns__dynRegArray(soap, "result", &a->result, "ns:dynRegArray"))
+                {   soap_flag_result--;
+                    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__receiveEventsBase64Response *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns__receiveEventsBase64Response, 0, sizeof(struct ns__receiveEventsBase64Response), 0, NULL);
+        if (soap->body && soap_element_end_in(soap, tag))
+            return NULL;
+    }
+    if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_result > 0))
+    {   soap->error = SOAP_OCCURS;
+        return NULL;
+    }
+    return a;
+}
+
+SOAP_FMAC5 struct ns__receiveEventsBase64Response * SOAP_FMAC6 soap_new_ns__receiveEventsBase64Response(struct soap *soap, int n)
+{   return soap_instantiate_ns__receiveEventsBase64Response(soap, n, NULL, NULL, NULL);
+}
+
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ns__receiveEventsBase64Response(struct soap *soap, struct ns__receiveEventsBase64Response *p)
+{   soap_delete(soap, p);
+}
+
+SOAP_FMAC3 struct ns__receiveEventsBase64Response * SOAP_FMAC4 soap_instantiate_ns__receiveEventsBase64Response(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+{
+    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns__receiveEventsBase64Response(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+    struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ns__receiveEventsBase64Response, n, soap_fdelete);
+    if (!cp)
+        return NULL;
+    if (n < 0)
+    {   cp->ptr = (void*)new struct ns__receiveEventsBase64Response;
+        if (size)
+            *size = sizeof(struct ns__receiveEventsBase64Response);
+    }
+    else
+    {   cp->ptr = (void*)new struct ns__receiveEventsBase64Response[n];
+        if (!cp->ptr)
+        {   soap->error = SOAP_EOM;
+            return NULL;
+        }
+        if (size)
+            *size = n * sizeof(struct ns__receiveEventsBase64Response);
+    }
+        DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
+    return (struct ns__receiveEventsBase64Response*)cp->ptr;
+}
+SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns__receiveEventsBase64Response(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__receiveEventsBase64Response %p -> %p\n", q, p));
+    *(struct ns__receiveEventsBase64Response*)p = *(struct ns__receiveEventsBase64Response*)q;
+}
+
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__openDocument(struct soap *soap, struct ns__openDocument *a)
-{
@@ -2893 +2995 @@
-}
-
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__receiveEventsStruct(struct soap *soap, struct s2 *a)
-{   soap_default_s2(soap, a);
-}
-
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns__receiveEventsStruct(struct soap *soap, struct s2 const*a)
-{   soap_serialize_s2(soap, a);
-}
-
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns__receiveEventsStruct(struct soap *soap, const struct s2 *a, const char *tag, const char *type)
-{
-    register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns__receiveEventsStruct);
-    if (soap_out_ns__receiveEventsStruct(soap, tag, id, a, type))
-        return soap->error;
-    return soap_putindependent(soap);
-}
-
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns__receiveEventsStruct(struct soap *soap, const char *tag, int id, const struct s2 *a, const char *type)
-{
-    if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns__receiveEventsStruct), type))
-        return soap->error;
-    if (soap_out_string(soap, "data", -1, &a->data, ""))
-        return soap->error;
-    if (soap_out_string(soap, "interEventDelimiter", -1, &a->interEventDelimiter, ""))
-        return soap->error;
-    if (soap_out_string(soap, "intraEventDelimiter", -1, &a->intraEventDelimiter, ""))
-        return soap->error;
-    if (soap_out_unsignedInt(soap, "numEvents", -1, &a->numEvents, ""))
-        return soap->error;
-    if (soap_out_byte(soap, "moreEvents", -1, &a->moreEvents, ""))
-        return soap->error;
-    return soap_element_end_out(soap, tag);
-}
-
-SOAP_FMAC3 struct s2 * SOAP_FMAC4 soap_get_ns__receiveEventsStruct(struct soap *soap, struct s2 *p, const char *tag, const char *type)
-{
-    if ((p = soap_in_ns__receiveEventsStruct(soap, tag, p, type)))
-        if (soap_getindependent(soap))
-            return NULL;
-    return p;
-}
-
-SOAP_FMAC3 struct s2 * SOAP_FMAC4 soap_in_ns__receiveEventsStruct(struct soap *soap, const char *tag, struct s2 *a, const char *type)
-{
-    short soap_flag_data = 1, soap_flag_interEventDelimiter = 1, soap_flag_intraEventDelimiter = 1, soap_flag_numEvents = 1, soap_flag_moreEvents = 1;
-    if (soap_element_begin_in(soap, tag, 0, type))
-        return NULL;
-    a = (struct s2 *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns__receiveEventsStruct, sizeof(struct s2), 0, NULL, NULL, NULL);
-    if (!a)
-        return NULL;
-    soap_default_ns__receiveEventsStruct(soap, a);
-    if (soap->body && !*soap->href)
-    {
-        for (;;)
-        {   soap->error = SOAP_TAG_MISMATCH;
-            if (soap_flag_data && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-                if (soap_in_string(soap, "data", &a->data, "xsd:string"))
-                {   soap_flag_data--;
-                    continue;
-                }
-            if (soap_flag_interEventDelimiter && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-                if (soap_in_string(soap, "interEventDelimiter", &a->interEventDelimiter, "xsd:string"))
-                {   soap_flag_interEventDelimiter--;
-                    continue;
-                }
-            if (soap_flag_intraEventDelimiter && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-                if (soap_in_string(soap, "intraEventDelimiter", &a->intraEventDelimiter, "xsd:string"))
-                {   soap_flag_intraEventDelimiter--;
-                    continue;
-                }
-            if (soap_flag_numEvents && soap->error == SOAP_TAG_MISMATCH)
-                if (soap_in_unsignedInt(soap, "numEvents", &a->numEvents, "xsd:unsignedInt"))
-                {   soap_flag_numEvents--;
-                    continue;
-                }
-            if (soap_flag_moreEvents && soap->error == SOAP_TAG_MISMATCH)
-                if (soap_in_byte(soap, "moreEvents", &a->moreEvents, "xsd:byte"))
-                {   soap_flag_moreEvents--;
-                    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 s2 *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns__receiveEventsStruct, 0, sizeof(struct s2), 0, NULL);
-        if (soap->body && soap_element_end_in(soap, tag))
-            return NULL;
-    }
-    if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_numEvents > 0 || soap_flag_moreEvents > 0))
-    {   soap->error = SOAP_OCCURS;
-        return NULL;
-    }
-    return a;
-}
-
-SOAP_FMAC5 struct s2 * SOAP_FMAC6 soap_new_ns__receiveEventsStruct(struct soap *soap, int n)
-{   return soap_instantiate_ns__receiveEventsStruct(soap, n, NULL, NULL, NULL);
-}
-
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ns__receiveEventsStruct(struct soap *soap, struct s2 *p)
-{   soap_delete(soap, p);
-}
-
-SOAP_FMAC3 struct s2 * SOAP_FMAC4 soap_instantiate_ns__receiveEventsStruct(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
-{
-    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns__receiveEventsStruct(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-    struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ns__receiveEventsStruct, n, soap_fdelete);
-    if (!cp)
-        return NULL;
-    if (n < 0)
-    {   cp->ptr = (void*)new struct s2;
-        if (size)
-            *size = sizeof(struct s2);
-    }
-    else
-    {   cp->ptr = (void*)new struct s2[n];
-        if (!cp->ptr)
-        {   soap->error = SOAP_EOM;
-            return NULL;
-        }
-        if (size)
-            *size = n * sizeof(struct s2);
-    }
-        DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-    return (struct s2*)cp->ptr;
-}
-SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns__receiveEventsStruct(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 s2 %p -> %p\n", q, p));
-    *(struct s2*)p = *(struct s2*)q;
-}
-
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_s2(struct soap *soap, struct s2 *a)
-{
-    (void)soap; (void)a; /* appease -Wall -Werror */
-    soap_default_string(soap, &a->data);
-    soap_default_string(soap, &a->interEventDelimiter);
-    soap_default_string(soap, &a->intraEventDelimiter);
-    soap_default_unsignedInt(soap, &a->numEvents);
-    soap_default_byte(soap, &a->moreEvents);
-}
-
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_s2(struct soap *soap, const struct s2 *a)
-{
-    (void)soap; (void)a; /* appease -Wall -Werror */
-    soap_serialize_string(soap, &a->data);
-    soap_serialize_string(soap, &a->interEventDelimiter);
-    soap_serialize_string(soap, &a->intraEventDelimiter);
-    soap_embedded(soap, &a->moreEvents, SOAP_TYPE_byte);
-}
-
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_s2(struct soap *soap, const struct s2 *a, const char *tag, const char *type)
-{
-    register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_s2);
-    if (soap_out_s2(soap, tag, id, a, type))
-        return soap->error;
-    return soap_putindependent(soap);
-}
-
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_s2(struct soap *soap, const char *tag, int id, const struct s2 *a, const char *type)
-{
-    if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_s2), type))
-        return soap->error;
-    if (soap_out_string(soap, "data", -1, &a->data, ""))
-        return soap->error;
-    if (soap_out_string(soap, "interEventDelimiter", -1, &a->interEventDelimiter, ""))
-        return soap->error;
-    if (soap_out_string(soap, "intraEventDelimiter", -1, &a->intraEventDelimiter, ""))
-        return soap->error;
-    if (soap_out_unsignedInt(soap, "numEvents", -1, &a->numEvents, ""))
-        return soap->error;
-    if (soap_out_byte(soap, "moreEvents", -1, &a->moreEvents, ""))
-        return soap->error;
-    return soap_element_end_out(soap, tag);
-}
-
-SOAP_FMAC3 struct s2 * SOAP_FMAC4 soap_get_s2(struct soap *soap, struct s2 *p, const char *tag, const char *type)
-{
-    if ((p = soap_in_s2(soap, tag, p, type)))
-        if (soap_getindependent(soap))
-            return NULL;
-    return p;
-}
-
-SOAP_FMAC3 struct s2 * SOAP_FMAC4 soap_in_s2(struct soap *soap, const char *tag, struct s2 *a, const char *type)
-{
-    short soap_flag_data = 1, soap_flag_interEventDelimiter = 1, soap_flag_intraEventDelimiter = 1, soap_flag_numEvents = 1, soap_flag_moreEvents = 1;
-    if (soap_element_begin_in(soap, tag, 0, type))
-        return NULL;
-    a = (struct s2 *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_s2, sizeof(struct s2), 0, NULL, NULL, NULL);
-    if (!a)
-        return NULL;
-    soap_default_s2(soap, a);
-    if (soap->body && !*soap->href)
-    {
-        for (;;)
-        {   soap->error = SOAP_TAG_MISMATCH;
-            if (soap_flag_data && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-                if (soap_in_string(soap, "data", &a->data, "xsd:string"))
-                {   soap_flag_data--;
-                    continue;
-                }
-            if (soap_flag_interEventDelimiter && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-                if (soap_in_string(soap, "interEventDelimiter", &a->interEventDelimiter, "xsd:string"))
-                {   soap_flag_interEventDelimiter--;
-                    continue;
-                }
-            if (soap_flag_intraEventDelimiter && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-                if (soap_in_string(soap, "intraEventDelimiter", &a->intraEventDelimiter, "xsd:string"))
-                {   soap_flag_intraEventDelimiter--;
-                    continue;
-                }
-            if (soap_flag_numEvents && soap->error == SOAP_TAG_MISMATCH)
-                if (soap_in_unsignedInt(soap, "numEvents", &a->numEvents, "xsd:unsignedInt"))
-                {   soap_flag_numEvents--;
-                    continue;
-                }
-            if (soap_flag_moreEvents && soap->error == SOAP_TAG_MISMATCH)
-                if (soap_in_byte(soap, "moreEvents", &a->moreEvents, "xsd:byte"))
-                {   soap_flag_moreEvents--;
-                    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 s2 *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_s2, 0, sizeof(struct s2), 0, NULL);
-        if (soap->body && soap_element_end_in(soap, tag))
-            return NULL;
-    }
-    if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_numEvents > 0 || soap_flag_moreEvents > 0))
-    {   soap->error = SOAP_OCCURS;
-        return NULL;
-    }
-    return a;
-}
-
-SOAP_FMAC5 struct s2 * SOAP_FMAC6 soap_new_s2(struct soap *soap, int n)
-{   return soap_instantiate_s2(soap, n, NULL, NULL, NULL);
-}
-
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_s2(struct soap *soap, struct s2 *p)
-{   soap_delete(soap, p);
-}
-
-SOAP_FMAC3 struct s2 * SOAP_FMAC4 soap_instantiate_s2(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
-{
-    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_s2(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-    struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_s2, n, soap_fdelete);
-    if (!cp)
-        return NULL;
-    if (n < 0)
-    {   cp->ptr = (void*)new struct s2;
-        if (size)
-            *size = sizeof(struct s2);
-    }
-    else
-    {   cp->ptr = (void*)new struct s2[n];
-        if (!cp->ptr)
-        {   soap->error = SOAP_EOM;
-            return NULL;
-        }
-        if (size)
-            *size = n * sizeof(struct s2);
-    }
-        DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-    return (struct s2*)cp->ptr;
-}
-SOAP_FMAC3 void SOAP_FMAC4 soap_copy_s2(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 s2 %p -> %p\n", q, p));
-    *(struct s2*)p = *(struct s2*)q;
-}
-
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns__receiveFileStruct(struct soap *soap, struct s1 *a)
-{   soap_default_s1(soap, a);
@@ -3434 +3249 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return soap->error;
-    return soap_putindependent(soap);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    return soap_element_end_out(soap, tag);
-}
-
-procEvent * SOAP_FMAC4 soap_get_ns__procEvent_t(struct soap *soap, struct ns__procEvent
-
-procEvent_t
+dynRegArray * SOAP_FMAC4 soap_get_ns__dynRegArray(struct soap *soap, struct ns__dynRegArray
+
+dynRegArray
-        if (soap_getindependent(soap))
-            return NULL;
@@ -3477 +3296 @@
-}
-
-
-
-
-
-
-
+
+
+