Changeset 1770

Timestamp:

08/27/08 18:02:08 (3 months ago)

Author:

xkovah

Message:

end of the day. I had it working when the data was stored in a vector, but the problem with vectors is that there's not a good way to remove elements from the front. So i switched to a list, and also made a new structure to pass back a dynamic array for each of the 3 event types. But it's not working yet.

Files:

• capture-mod/trunk/CaptureSoapServer.cpp (modified) (3 diffs)
• capture-mod/trunk/capture.wsdl (modified) (6 diffs)
• capture-mod/trunk/captureGSOAP.h (modified) (2 diffs)
• capture-mod/trunk/install/CaptureBAT.exe (modified) (previous)
• capture-mod/trunk/soapC.cpp (modified) (32 diffs)
• capture-mod/trunk/soapClient.cpp (modified) (3 diffs)
• capture-mod/trunk/soapH.h (modified) (23 diffs)
• capture-mod/trunk/soapServer.cpp (modified) (4 diffs)
• capture-mod/trunk/soapStub.h (modified) (19 diffs)

capture-mod/trunk/CaptureSoapServer.cpp

@@ -14 +14 @@
-struct soap soap;
-
-vector<struct ns__regEvent> regVec
+list<struct ns__regEvent> regList
-std::list<struct ns__fileEvent> fileList;
-std::list<struct ns__procEvent> procList;
@@ -116 +116 @@
-    sprintf(r.valueData, "%ls", extra.at(3).c_str());
-
-Vec
-Vec. Now there are %d elements in the list\n", regVec
+List
+List. Now there are %d elements in the list\n", regList
-}
-
@@ -332 +332 @@
-
-//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>
-ceiveEventsBase64(struct soap *soap, int maxEventsReturned, struct ns__dynRegArray
-dynRegArray dynArray
-dynArray.__ptr
-dynArray.__size = 0
-
-
-   printf("No events to send back\n");
-result = dynArray
+TODO: Make SOAP::Lite understand unsigned int type, so that this (and other) ints can be set as such
+turnEvents(struct soap *soap, int maxEventsToReturn, struct ns__allEvents
+allEvents all
+all.fileEvents
+all.procEvents = NULL
+
+
+if(regList.empty() || maxEventsToReturn == 0){
+printf("No registry events to send back\n")
-    }
-    else{
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-//Thus far, SOAP::Lite hasn't been sending the data correctly, so we never get into this function.

capture-mod/trunk/capture.wsdl

@@ -68 +68 @@
-   </sequence>
-  </complexType>
+  <complexType name="dynFileArray">
+   <sequence>
+    <element name="item" type="ns:fileEvent" minOccurs="0" maxOccurs="unbounded" nillable="true"/>
+   </sequence>
+  </complexType>
+  <complexType name="dynProcArray">
+   <sequence>
+    <element name="item" type="ns:procEvent" minOccurs="0" maxOccurs="unbounded" nillable="true"/>
+   </sequence>
+  </complexType>
-  <complexType name="s1">
-   <sequence>
@@ -116 +126 @@
-</message>
-
-<message name="sendMIMERequest">
- <part name="magicNumber" type="xsd:int"/>
-</message>
-
-<message name="sendMIMEResponse">
- <part name="result" type="xsd:int"/>
-</message>
-
-<message name="openDocumentRequest">
- <part name="fileName" type="xsd:string"/>
@@ -133 +135 @@
-</message>
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</message>
-
@@ -162 +174 @@
-  <output message="tns:s1"/>
- </operation>
+ <operation name="openDocument">
+  <documentation>Service definition of function ns__openDocument</documentation>
+  <input message="tns:openDocumentRequest"/>
+  <output message="tns:openDocumentResponse"/>
+ </operation>
+ <operation name="returnEvents">
+  <documentation>Service definition of function ns__returnEvents</documentation>
+  <input message="tns:returnEvents"/>
+  <output message="tns:allEvents"/>
+ </operation>
- <operation name="sendMIME">
-  <documentation>Service definition of function ns__sendMIME</documentation>
@@ -167 +189 @@
-  <output message="tns:sendMIMEResponse"/>
- </operation>
- <operation name="openDocument">
-  <documentation>Service definition of function ns__openDocument</documentation>
-  <input message="tns:openDocumentRequest"/>
-  <output message="tns:openDocumentResponse"/>
- </operation>
- <operation name="receiveEventsBase64">
-  <documentation>Service definition of function ns__receiveEventsBase64</documentation>
-  <input message="tns:receiveEventsBase64Request"/>
-  <output message="tns:receiveEventsBase64Response"/>
- </operation>
-</portType>
-
@@ -217 +229 @@
-  </output>
- </operation>
+ <operation name="openDocument">
+  <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="returnEvents">
+  <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="sendMIME">
-  <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="openDocument">
-  <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="receiveEventsBase64">
-  <SOAP:operation style="rpc" soapAction=""/>
-  <input>

capture-mod/trunk/captureGSOAP.h

@@ -45 +45 @@
-struct ns__dynRegArray{
-    struct ns__regEvent * __ptr;
-
+, not total size
-};
-
+struct ns__dynFileArray{
+    struct ns__fileEvent * __ptr;
+    int __size; //number of elements, not total size
+};
+
+struct ns__dynProcArray{
+    struct ns__procEvent * __ptr;
+    int __size; //number of elements, not total size
+};
+
+struct ns__allEvents{
+    struct ns__dynRegArray * regEvents;
+    struct ns__dynFileArray * fileEvents;
+    struct ns__dynProcArray * procEvents;
+};
+
+//A poor substitute for MIME, but it works
-typedef struct s1{
-    char * data;
@@ -55 +72 @@
-
-
-/*
-//TODO: restructure this
-typedef struct s2{
-    char * data;
-    char * interEventDelimiter; //potentially multi-byte delimeter used to concatenate events
-    char * intraEventDelimiter; //potentially multi-byte delimeter used to concatenate fields of events
-    unsigned int numEvents; //For sanity checking
-    char moreEvents;    //1 if there is more data which can be sent to the Manager after this, 0 otherwise
-                        //It is the Manager's responsibility to request the additional data.
-} ns__receiveEventsStruct;
-*/
-
-
-int ns__ping(char * a, char ** result);
-int ns__visitURL(char * a, char ** result);
-int ns__sendFileBase64(char * fileName, char * data, unsigned int encodedLength, unsigned int decodedLength, int &result);
-int ns__receiveFileBase64(char * fileName, ns__receiveFileStruct &result);
+int ns__openDocument(char * fileName, int waitTimeMillisec, int &result);
+int ns__returnEvents(int maxEventsToReturn, struct ns__allEvents &result);
+
+//Not working
-int ns__sendMIME(int magicNumber, int &result);
-int ns__openDocument(char * fileName, int waitTimeMillisec, int &result);
-//int ns__receiveEventsBase64(int maxEventsReturned, ns__receiveEventsStruct &result);
-int ns__receiveEventsBase64(int maxEventsReturned, struct ns__dynRegArray &result);
-

capture-mod/trunk/soapC.cpp

@@ -8 +8 @@
-#include "soapH.h"
-
-2:17:09
+9:23:06
-
-
@@ -162 +162 @@
-    case SOAP_TYPE_unsignedInt:
-        return soap_in_unsignedInt(soap, NULL, NULL, "xsd:unsignedInt");
-
-
-
-
+
+
+
+
+
+
-    case SOAP_TYPE_ns__openDocument:
-        return soap_in_ns__openDocument(soap, NULL, NULL, "ns:openDocument");
-    case SOAP_TYPE_ns__openDocumentResponse:
-        return soap_in_ns__openDocumentResponse(soap, NULL, NULL, "ns:openDocumentResponse");
-    case SOAP_TYPE_ns__sendMIME:
-        return soap_in_ns__sendMIME(soap, NULL, NULL, "ns:sendMIME");
-    case SOAP_TYPE_ns__sendMIMEResponse:
-        return soap_in_ns__sendMIMEResponse(soap, NULL, NULL, "ns:sendMIMEResponse");
-    case SOAP_TYPE_ns__receiveFileBase64:
-        return soap_in_ns__receiveFileBase64(soap, NULL, NULL, "ns:receiveFileBase64");
@@ -192 +190 @@
-    case SOAP_TYPE_s1:
-        return soap_in_s1(soap, NULL, NULL, "s1");
+    case SOAP_TYPE_ns__allEvents:
+        return soap_in_ns__allEvents(soap, NULL, NULL, "ns:allEvents");
+    case SOAP_TYPE_ns__dynProcArray:
+        return soap_in_ns__dynProcArray(soap, NULL, NULL, "ns:dynProcArray");
+    case SOAP_TYPE_ns__dynFileArray:
+        return soap_in_ns__dynFileArray(soap, NULL, NULL, "ns:dynFileArray");
-    case SOAP_TYPE_ns__dynRegArray:
-        return soap_in_ns__dynRegArray(soap, NULL, NULL, "ns:dynRegArray");
@@ -202 +206 @@
-    case SOAP_TYPE_PointerTostring:
-        return soap_in_PointerTostring(soap, NULL, NULL, "xsd:string");
+    case SOAP_TYPE_PointerTons__dynProcArray:
+        return soap_in_PointerTons__dynProcArray(soap, NULL, NULL, "ns:dynProcArray");
+    case SOAP_TYPE_PointerTons__dynFileArray:
+        return soap_in_PointerTons__dynFileArray(soap, NULL, NULL, "ns:dynFileArray");
+    case SOAP_TYPE_PointerTons__dynRegArray:
+        return soap_in_PointerTons__dynRegArray(soap, NULL, NULL, "ns:dynRegArray");
+    case SOAP_TYPE_PointerTons__procEvent:
+        return soap_in_PointerTons__procEvent(soap, NULL, NULL, "ns:procEvent");
+    case SOAP_TYPE_PointerTons__fileEvent:
+        return soap_in_PointerTons__fileEvent(soap, NULL, NULL, "ns:fileEvent");
-    case SOAP_TYPE_PointerTons__regEvent:
-        return soap_in_PointerTons__regEvent(soap, NULL, NULL, "ns:regEvent");
@@ -225 +239 @@
-            return soap_in_unsignedInt(soap, NULL, NULL, NULL);
-        }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        }
-        if (!soap_match_tag(soap, t, "ns:openDocument"))
@@ -241 +259 @@
-            return soap_in_ns__openDocumentResponse(soap, NULL, NULL, NULL);
-        }
-        if (!soap_match_tag(soap, t, "ns:sendMIME"))
-        {   *type = SOAP_TYPE_ns__sendMIME;
-            return soap_in_ns__sendMIME(soap, NULL, NULL, NULL);
-        }
-        if (!soap_match_tag(soap, t, "ns:sendMIMEResponse"))
-        {   *type = SOAP_TYPE_ns__sendMIMEResponse;
-            return soap_in_ns__sendMIMEResponse(soap, NULL, NULL, NULL);
-        }
-        if (!soap_match_tag(soap, t, "ns:receiveFileBase64"))
-        {   *type = SOAP_TYPE_ns__receiveFileBase64;
@@ -284 +294 @@
-        {   *type = SOAP_TYPE_s1;
-            return soap_in_s1(soap, NULL, NULL, NULL);
+        }
+        if (!soap_match_tag(soap, t, "ns:allEvents"))
+        {   *type = SOAP_TYPE_ns__allEvents;
+            return soap_in_ns__allEvents(soap, NULL, NULL, NULL);
+        }
+        if (!soap_match_tag(soap, t, "ns:dynProcArray"))
+        {   *type = SOAP_TYPE_ns__dynProcArray;
+            return soap_in_ns__dynProcArray(soap, NULL, NULL, NULL);
+        }
+        if (!soap_match_tag(soap, t, "ns:dynFileArray"))
+        {   *type = SOAP_TYPE_ns__dynFileArray;
+            return soap_in_ns__dynFileArray(soap, NULL, NULL, NULL);
-        }
-        if (!soap_match_tag(soap, t, "ns:dynRegArray"))
@@ -385 +407 @@
-    case SOAP_TYPE_unsignedInt:
-        return soap_out_unsignedInt(soap, tag, id, (const unsigned int *)ptr, "xsd:unsignedInt");
-
-
-
-
+
+
+
+
+
+
-    case SOAP_TYPE_ns__openDocument:
-        return soap_out_ns__openDocument(soap, tag, id, (const struct ns__openDocument *)ptr, "ns:openDocument");
-    case SOAP_TYPE_ns__openDocumentResponse:
-        return soap_out_ns__openDocumentResponse(soap, tag, id, (const struct ns__openDocumentResponse *)ptr, "ns:openDocumentResponse");
-    case SOAP_TYPE_ns__sendMIME:
-        return soap_out_ns__sendMIME(soap, tag, id, (const struct ns__sendMIME *)ptr, "ns:sendMIME");
-    case SOAP_TYPE_ns__sendMIMEResponse:
-        return soap_out_ns__sendMIMEResponse(soap, tag, id, (const struct ns__sendMIMEResponse *)ptr, "ns:sendMIMEResponse");
-    case SOAP_TYPE_ns__receiveFileBase64:
-        return soap_out_ns__receiveFileBase64(soap, tag, id, (const struct ns__receiveFileBase64 *)ptr, "ns:receiveFileBase64");
@@ -415 +435 @@
-    case SOAP_TYPE_s1:
-        return soap_out_s1(soap, tag, id, (const struct s1 *)ptr, "s1");
+    case SOAP_TYPE_ns__allEvents:
+        return soap_out_ns__allEvents(soap, tag, id, (const struct ns__allEvents *)ptr, "ns:allEvents");
+    case SOAP_TYPE_ns__dynProcArray:
+        return soap_out_ns__dynProcArray(soap, tag, id, (const struct ns__dynProcArray *)ptr, "ns:dynProcArray");
+    case SOAP_TYPE_ns__dynFileArray:
+        return soap_out_ns__dynFileArray(soap, tag, id, (const struct ns__dynFileArray *)ptr, "ns:dynFileArray");
-    case SOAP_TYPE_ns__dynRegArray:
-        return soap_out_ns__dynRegArray(soap, tag, id, (const struct ns__dynRegArray *)ptr, "ns:dynRegArray");
@@ -425 +451 @@
-    case SOAP_TYPE_PointerTostring:
-        return soap_out_PointerTostring(soap, tag, id, (char **const*)ptr, "xsd:string");
+    case SOAP_TYPE_PointerTons__dynProcArray:
+        return soap_out_PointerTons__dynProcArray(soap, tag, id, (struct ns__dynProcArray *const*)ptr, "ns:dynProcArray");
+    case SOAP_TYPE_PointerTons__dynFileArray:
+        return soap_out_PointerTons__dynFileArray(soap, tag, id, (struct ns__dynFileArray *const*)ptr, "ns:dynFileArray");
+    case SOAP_TYPE_PointerTons__dynRegArray:
+        return soap_out_PointerTons__dynRegArray(soap, tag, id, (struct ns__dynRegArray *const*)ptr, "ns:dynRegArray");
+    case SOAP_TYPE_PointerTons__procEvent:
+        return soap_out_PointerTons__procEvent(soap, tag, id, (struct ns__procEvent *const*)ptr, "ns:procEvent");
+    case SOAP_TYPE_PointerTons__fileEvent:
+        return soap_out_PointerTons__fileEvent(soap, tag, id, (struct ns__fileEvent *const*)ptr, "ns:fileEvent");
-    case SOAP_TYPE_PointerTons__regEvent:
-        return soap_out_PointerTons__regEvent(soap, tag, id, (struct ns__regEvent *const*)ptr, "ns:regEvent");
@@ -450 +486 @@
-    switch (type)
-    {
-
-
-
-
-
+
+
+
+
+
+
+
+
-        break;
-    case SOAP_TYPE_ns__openDocument:
@@ -462 +501 @@
-        soap_serialize_ns__openDocumentResponse(soap, (const struct ns__openDocumentResponse *)ptr);
-        break;
-    case SOAP_TYPE_ns__sendMIME:
-        soap_serialize_ns__sendMIME(soap, (const struct ns__sendMIME *)ptr);
-        break;
-    case SOAP_TYPE_ns__sendMIMEResponse:
-        soap_serialize_ns__sendMIMEResponse(soap, (const struct ns__sendMIMEResponse *)ptr);
-        break;
-    case SOAP_TYPE_ns__receiveFileBase64:
-        soap_serialize_ns__receiveFileBase64(soap, (const struct ns__receiveFileBase64 *)ptr);
@@ -495 +528 @@
-        soap_serialize_s1(soap, (const struct s1 *)ptr);
-        break;
+    case SOAP_TYPE_ns__allEvents:
+        soap_serialize_ns__allEvents(soap, (const struct ns__allEvents *)ptr);
+        break;
+    case SOAP_TYPE_ns__dynProcArray:
+        soap_serialize_ns__dynProcArray(soap, (const struct ns__dynProcArray *)ptr);
+        break;
+    case SOAP_TYPE_ns__dynFileArray:
+        soap_serialize_ns__dynFileArray(soap, (const struct ns__dynFileArray *)ptr);
+        break;
-    case SOAP_TYPE_ns__dynRegArray:
-        soap_serialize_ns__dynRegArray(soap, (const struct ns__dynRegArray *)ptr);
@@ -509 +551 @@
-    case SOAP_TYPE_PointerTostring:
-        soap_serialize_PointerTostring(soap, (char **const*)ptr);
+        break;
+    case SOAP_TYPE_PointerTons__dynProcArray:
+        soap_serialize_PointerTons__dynProcArray(soap, (struct ns__dynProcArray *const*)ptr);
+        break;
+    case SOAP_TYPE_PointerTons__dynFileArray:
+        soap_serialize_PointerTons__dynFileArray(soap, (struct ns__dynFileArray *const*)ptr);
+        break;
+    case SOAP_TYPE_PointerTons__dynRegArray:
+        soap_serialize_PointerTons__dynRegArray(soap, (struct ns__dynRegArray *const*)ptr);
+        break;
+    case SOAP_TYPE_PointerTons__procEvent:
+        soap_serialize_PointerTons__procEvent(soap, (struct ns__procEvent *const*)ptr);
+        break;
+    case SOAP_TYPE_PointerTons__fileEvent:
+        soap_serialize_PointerTons__fileEvent(soap, (struct ns__fileEvent *const*)ptr);
-        break;
-    case SOAP_TYPE_PointerTons__regEvent:
@@ -539 +596 @@
-    case SOAP_TYPE_ns__dynRegArray:
-        return (void*)soap_instantiate_ns__dynRegArray(soap, -1, type, arrayType, n);
+    case SOAP_TYPE_ns__dynFileArray:
+        return (void*)soap_instantiate_ns__dynFileArray(soap, -1, type, arrayType, n);
+    case SOAP_TYPE_ns__dynProcArray:
+        return (void*)soap_instantiate_ns__dynProcArray(soap, -1, type, arrayType, n);
+    case SOAP_TYPE_ns__allEvents:
+        return (void*)soap_instantiate_ns__allEvents(soap, -1, type, arrayType, n);
-    case SOAP_TYPE_s1:
-        return (void*)soap_instantiate_s1(soap, -1, type, arrayType, n);
@@ -555 +618 @@
-    case SOAP_TYPE_ns__receiveFileBase64:
-        return (void*)soap_instantiate_ns__receiveFileBase64(soap, -1, type, arrayType, n);
+    case SOAP_TYPE_ns__openDocumentResponse:
+        return (void*)soap_instantiate_ns__openDocumentResponse(soap, -1, type, arrayType, n);
+    case SOAP_TYPE_ns__openDocument:
+        return (void*)soap_instantiate_ns__openDocument(soap, -1, type, arrayType, n);
+    case SOAP_TYPE_ns__returnEvents:
+        return (void*)soap_instantiate_ns__returnEvents(soap, -1, type, arrayType, n);
-    case SOAP_TYPE_ns__sendMIMEResponse:
-        return (void*)soap_instantiate_ns__sendMIMEResponse(soap, -1, type, arrayType, n);
-    case SOAP_TYPE_ns__sendMIME:
-        return (void*)soap_instantiate_ns__sendMIME(soap, -1, type, arrayType, n);
-    case SOAP_TYPE_ns__openDocumentResponse:
-        return (void*)soap_instantiate_ns__openDocumentResponse(soap, -1, type, arrayType, n);
-    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);
-#ifndef WITH_NOGLOBAL
-    case SOAP_TYPE_SOAP_ENV__Header:
@@ -620 +681 @@
-            delete[] (struct ns__dynRegArray*)p->ptr;
-        break;
+    case SOAP_TYPE_ns__dynFileArray:
+        if (p->size < 0)
+            delete (struct ns__dynFileArray*)p->ptr;
+        else
+            delete[] (struct ns__dynFileArray*)p->ptr;
+        break;
+    case SOAP_TYPE_ns__dynProcArray:
+        if (p->size < 0)
+            delete (struct ns__dynProcArray*)p->ptr;
+        else
+            delete[] (struct ns__dynProcArray*)p->ptr;
+        break;
+    case SOAP_TYPE_ns__allEvents:
+        if (p->size < 0)
+            delete (struct ns__allEvents*)p->ptr;
+        else
+            delete[] (struct ns__allEvents*)p->ptr;
+        break;
-    case SOAP_TYPE_s1:
-        if (p->size < 0)
@@ -668 +747 @@
-            delete[] (struct ns__receiveFileBase64*)p->ptr;
-        break;
+    case SOAP_TYPE_ns__openDocumentResponse:
+        if (p->size < 0)
+            delete (struct ns__openDocumentResponse*)p->ptr;
+        else
+            delete[] (struct ns__openDocumentResponse*)p->ptr;
+        break;
+    case SOAP_TYPE_ns__openDocument:
+        if (p->size < 0)
+            delete (struct ns__openDocument*)p->ptr;
+        else
+            delete[] (struct ns__openDocument*)p->ptr;
+        break;
+    case SOAP_TYPE_ns__returnEvents:
+        if (p->size < 0)
+            delete (struct ns__returnEvents*)p->ptr;
+        else
+            delete[] (struct ns__returnEvents*)p->ptr;
+        break;
-    case SOAP_TYPE_ns__sendMIMEResponse:
-        if (p->size < 0)
@@ -679 +776 @@
-        else
-            delete[] (struct ns__sendMIME*)p->ptr;
-        break;
-    case SOAP_TYPE_ns__openDocumentResponse:
-        if (p->size < 0)
-            delete (struct ns__openDocumentResponse*)p->ptr;
-        else
-            delete[] (struct ns__openDocumentResponse*)p->ptr;
-        break;
-    case SOAP_TYPE_ns__openDocument:
-        if (p->size < 0)
-            delete (struct ns__openDocument*)p->ptr;
-        else
-            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)
-            delete (struct ns__receiveEventsBase64*)p->ptr;
-        else
-            delete[] (struct ns__receiveEventsBase64*)p->ptr;
-        break;
-    case SOAP_TYPE_SOAP_ENV__Header:
@@ -1505 +1578 @@
-#endif
-
-receiveEventsBase64(struct soap *soap, struct ns__receiveEventsBase64
+sendMIME(struct soap *soap, struct ns__sendMIME
-{
-    (void)soap; (void)a; /* appease -Wall -Werror */
-xEventsReturned
-
-
-receiveEventsBase64(struct soap *soap, const struct ns__receiveEventsBase64
+gicNumber
+
+
+sendMIME(struct soap *soap, const struct ns__sendMIME
-{
-    (void)soap; (void)a; /* appease -Wall -Werror */
-}
-
-receiveEventsBase64(struct soap *soap, const struct ns__receiveEventsBase64
-
-receiveEventsBase64
-receiveEventsBase64
+sendMIME(struct soap *soap, const struct ns__sendMIME
+
+sendMIME
+sendMIME
-        return soap->error;
-    return soap_putindependent(soap);
-}
-
-receiveEventsBase64(struct soap *soap, const char *tag, int id, const struct ns__receiveEventsBase64
-
-receiveEventsBase64
-
-xEventsReturned", -1, &a->maxEventsReturned
+sendMIME(struct soap *soap, const char *tag, int id, const struct ns__sendMIME
+
+sendMIME
+
+gicNumber", -1, &a->magicNumber
-        return soap->error;
-    return soap_element_end_out(soap, tag);
-}
-
-receiveEventsBase64 * SOAP_FMAC4 soap_get_ns__receiveEventsBase64(struct soap *soap, struct ns__receiveEventsBase64
-
-receiveEventsBase64
+sendMIME * SOAP_FMAC4 soap_get_ns__sendMIME(struct soap *soap, struct ns__sendMIME
+
+sendMIME
-        if (soap_getindependent(soap))
-            return NULL;
@@ -1541 +1614 @@
-}
-
-receiveEventsBase64 * SOAP_FMAC4 soap_in_ns__receiveEventsBase64(struct soap *soap, const char *tag, struct ns__receiveEventsBase64
-
-xEventsReturned
+sendMIME * SOAP_FMAC4 soap_in_ns__sendMIME(struct soap *soap, const char *tag, struct ns__sendMIME
+
+gicNumber
-    if (soap_element_begin_in(soap, tag, 0, type))
-        return NULL;
-receiveEventsBase64 *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns__receiveEventsBase64, sizeof(struct ns__receiveEventsBase64
+sendMIME *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns__sendMIME, sizeof(struct ns__sendMIME
-    if (!a)
-        return NULL;
-receiveEventsBase64
+sendMIME
-    if (soap->body && !*soap->href)
-    {
-        for (;;)
-        {   soap->error = SOAP_TAG_MISMATCH;
-xEventsReturned
-xEventsReturned", &a->maxEventsReturned
-xEventsReturned
+gicNumber
+gicNumber", &a->magicNumber
+gicNumber
-                    continue;
-                }
@@ -1570 +1643 @@
-    }
-    else
-receiveEventsBase64 *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns__receiveEventsBase64, 0, sizeof(struct ns__receiveEventsBase64
+sendMIME *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns__sendMIME, 0, sizeof(struct ns__sendMIME
-        if (soap->body && soap_element_end_in(soap, tag))
-            return NULL;
-    }
-xEventsReturned
+gicNumber
-    {   soap->error = SOAP_OCCURS;
-        return NULL;
@@ -1581 +1654 @@
-}
-
-receiveEventsBase64 * SOAP_FMAC6 soap_new_ns__receiveEventsBase64
-receiveEventsBase64
-
-
-receiveEventsBase64(struct soap *soap, struct ns__receiveEventsBase64
+sendMIME * SOAP_FMAC6 soap_new_ns__sendMIME
+sendMIME
+
+
+sendMIME(struct soap *soap, struct ns__sendMIME
-{   soap_delete(soap, p);
-}
-
-receiveEventsBase64 * SOAP_FMAC4 soap_instantiate_ns__receiveEventsBase64
-
-receiveEventsBase64
-receiveEventsBase64
+sendMIME * SOAP_FMAC4 soap_instantiate_ns__sendMIME
+
+sendMIME
+sendMIME
-    if (!cp)
-        return NULL;
-    if (n < 0)
-receiveEventsBase64
-
-receiveEventsBase64
-
-
-receiveEventsBase64
+sendMIME
+
+sendMIME
+
+
+sendMIME
-        if (!cp->ptr)
-        {   soap->error = SOAP_EOM;
@@ -1607 +1680 @@
-        }
-        if (size)
-receiveEventsBase64
+sendMIME
-    }
-        DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-receiveEventsBase64
-
-receiveEventsBase64
-
-receiveEventsBase64
-receiveEventsBase64*)p = *(struct ns__receiveEventsBase64
-
-
-receiveEventsBase64Response(struct soap *soap, struct ns__receiveEventsBase64
+sendMIME
+
+sendMIME
+
+sendMIME
+sendMIME*)p = *(struct ns__sendMIME
+
+
+sendMIMEResponse(struct soap *soap, struct ns__sendMIME
-{
-    (void)soap; (void)a; /* appease -Wall -Werror */
-ns__dynRegArray
-
-
-receiveEventsBase64Response(struct soap *soap, const struct ns__receiveEventsBase64
+int
+
+
+sendMIMEResponse(struct soap *soap, const struct ns__sendMIME
-{
-    (void)soap; (void)a; /* appease -Wall -Werror */
-
-
-
-
-
-
-
+
+
+
+
+
+
-        return soap->error;
-    return soap_putindependent(soap);
-}
-
-receiveEventsBase64Response(struct soap *soap, const char *tag, int id, const struct ns__receiveEventsBase64
-
-receiveEventsBase64
-
-ns__dynRegArray
+sendMIMEResponse(struct soap *soap, const char *tag, int id, const struct ns__sendMIME
+
+sendMIME
+
+int
-        return soap->error;
-    return soap_element_end_out(soap, tag);
-}
-
-receiveEventsBase64Response * SOAP_FMAC4 soap_get_ns__receiveEventsBase64Response(struct soap *soap, struct ns__receiveEventsBase64
-
-receiveEventsBase64
+sendMIMEResponse * SOAP_FMAC4 soap_get_ns__sendMIMEResponse(struct soap *soap, struct ns__sendMIME
+
+sendMIME
-        if (soap_getindependent(soap))
-            return NULL;
@@ -1655 +1727 @@
-}
-
-receiveEventsBase64Response * SOAP_FMAC4 soap_in_ns__receiveEventsBase64Response(struct soap *soap, const char *tag, struct ns__receiveEventsBase64
+sendMIMEResponse * SOAP_FMAC4 soap_in_ns__sendMIMEResponse(struct soap *soap, const char *tag, struct ns__sendMIME
-{
-    short soap_flag_result = 1;
-    if (soap_element_begin_in(soap, tag, 0, type))
-        return NULL;
-receiveEventsBase64Response *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns__receiveEventsBase64Response, sizeof(struct ns__receiveEventsBase64
+sendMIMEResponse *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns__sendMIMEResponse, sizeof(struct ns__sendMIME
-    if (!a)
-        return NULL;
-receiveEventsBase64
+sendMIME
-    if (soap->body && !*soap->href)
-    {
@@ -1669 +1741 @@
-        {   soap->error = SOAP_TAG_MISMATCH;
-            if (soap_flag_result && soap->error == SOAP_TAG_MISMATCH)
-ns__dynRegArray(soap, "result", &a->result, "ns:dynRegArray
+int(soap, "result", &