Index: trunk/Nebulous/nebclient/nebulous.wsdl =================================================================== --- trunk/Nebulous/nebclient/nebulous.wsdl (revision 24916) +++ trunk/Nebulous/nebclient/nebulous.wsdl (revision 24923) @@ -149,4 +149,12 @@ + + + + + + + + @@ -256,4 +264,11 @@ --> + + + + + @@ -417,4 +432,15 @@ + + + + + + + + + soap, server->endpoint, + NULL, (char *)key, &response) != SOAP_OK) { + nebSetServerErr(server); + return -1; + } + + return response; +} + + char *nebErr(nebServer *server) { Index: trunk/Nebulous/nebclient/src/nebclient.h =================================================================== --- trunk/Nebulous/nebclient/src/nebclient.h (revision 24916) +++ trunk/Nebulous/nebclient/src/nebclient.h (revision 24923) @@ -313,4 +313,14 @@ ); +/** Removes all of the inaccessible instances from an object + * + * @return the number of inaccessible instances removed + */ + +int nebPrune( + nebServer *server, ///< nebServer object + const char *key /// storage object key (name) +); + /** Returns the error message from the last nebclient function that failed. * Index: trunk/Nebulous/nebclient/src/nebulous.h =================================================================== --- trunk/Nebulous/nebclient/src/nebulous.h (revision 24916) +++ trunk/Nebulous/nebclient/src/nebulous.h (revision 24923) @@ -1,5 +1,5 @@ /* src/nebulous.h Generated by wsdl2h 1.2.12 from nebulous.wsdl and typemap.dat - 2009-06-01 23:55:50 GMT + 2009-07-25 01:30:29 GMT Copyright (C) 2001-2008 Robert van Engelen, Genivia Inc. All Rights Reserved. This part of the software is released under one of the following licenses: @@ -120,4 +120,5 @@ - @ref ns1__stat_USCOREobject - @ref ns1__chmod_USCOREobject + - @ref ns1__prune_USCOREobject @section SOAP_ports Endpoints of Binding "SOAP" @@ -947,3 +948,53 @@ ); +/******************************************************************************\ + * * + * ns1__prune_USCOREobject * + * * +\******************************************************************************/ + + +/// Operation "ns1__prune_USCOREobject" of service binding "SOAP" + +/** + +Operation details: + + - SOAP RPC encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" + - SOAP action="urn:Nebulous/Server/SOAP#prune_object" + +C stub function (defined in soapClient.c[pp] generated by soapcpp2): +@code + int soap_call_ns1__prune_USCOREobject( + struct soap *soap, + NULL, // char *endpoint = NULL selects default endpoint for this operation + NULL, // char *action = NULL selects default action for this operation + // request parameters: + char* key, + // response parameters: + int *result + ); +@endcode + +C server function (called from the service dispatcher defined in soapServer.c[pp]): +@code + int ns1__prune_USCOREobject( + struct soap *soap, + // request parameters: + char* key, + // response parameters: + int *result + ); +@endcode + +*/ + +//gsoap ns1 service method-style: prune_USCOREobject rpc +//gsoap ns1 service method-encoding: prune_USCOREobject http://schemas.xmlsoap.org/soap/encoding/ +//gsoap ns1 service method-action: prune_USCOREobject urn:Nebulous/Server/SOAP#prune_object +int ns1__prune_USCOREobject( + char* key, ///< Request parameter + int *result ///< Response parameter +); + /* End of src/nebulous.h */ Index: trunk/Nebulous/nebclient/src/soapC.c =================================================================== --- trunk/Nebulous/nebclient/src/soapC.c (revision 24916) +++ trunk/Nebulous/nebclient/src/soapC.c (revision 24923) @@ -12,5 +12,5 @@ #endif -SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.12 2009-06-01 23:55:50 GMT") +SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.12 2009-07-25 01:30:29 GMT") @@ -161,4 +161,8 @@ case SOAP_TYPE_int: return soap_in_int(soap, NULL, NULL, "xsd:int"); + case SOAP_TYPE_ns1__prune_USCOREobject: + return soap_in_ns1__prune_USCOREobject(soap, NULL, NULL, "ns1:prune_object"); + case SOAP_TYPE_ns1__prune_USCOREobjectResponse: + return soap_in_ns1__prune_USCOREobjectResponse(soap, NULL, NULL, "ns1:prune_objectResponse"); case SOAP_TYPE_ns1__chmod_USCOREobject: return soap_in_ns1__chmod_USCOREobject(soap, NULL, NULL, "ns1:chmod_object"); @@ -254,4 +258,12 @@ return soap_in_int(soap, NULL, NULL, NULL); } + if (!soap_match_tag(soap, t, "ns1:prune_object")) + { *type = SOAP_TYPE_ns1__prune_USCOREobject; + return soap_in_ns1__prune_USCOREobject(soap, NULL, NULL, NULL); + } + if (!soap_match_tag(soap, t, "ns1:prune_objectResponse")) + { *type = SOAP_TYPE_ns1__prune_USCOREobjectResponse; + return soap_in_ns1__prune_USCOREobjectResponse(soap, NULL, NULL, NULL); + } if (!soap_match_tag(soap, t, "ns1:chmod_object")) { *type = SOAP_TYPE_ns1__chmod_USCOREobject; @@ -452,4 +464,8 @@ case SOAP_TYPE_int: return soap_out_int(soap, tag, id, (const int *)ptr, "xsd:int"); + case SOAP_TYPE_ns1__prune_USCOREobject: + return soap_out_ns1__prune_USCOREobject(soap, tag, id, (const struct ns1__prune_USCOREobject *)ptr, "ns1:prune_object"); + case SOAP_TYPE_ns1__prune_USCOREobjectResponse: + return soap_out_ns1__prune_USCOREobjectResponse(soap, tag, id, (const struct ns1__prune_USCOREobjectResponse *)ptr, "ns1:prune_objectResponse"); case SOAP_TYPE_ns1__chmod_USCOREobject: return soap_out_ns1__chmod_USCOREobject(soap, tag, id, (const struct ns1__chmod_USCOREobject *)ptr, "ns1:chmod_object"); @@ -543,4 +559,10 @@ switch (type) { + case SOAP_TYPE_ns1__prune_USCOREobject: + soap_serialize_ns1__prune_USCOREobject(soap, (const struct ns1__prune_USCOREobject *)ptr); + break; + case SOAP_TYPE_ns1__prune_USCOREobjectResponse: + soap_serialize_ns1__prune_USCOREobjectResponse(soap, (const struct ns1__prune_USCOREobjectResponse *)ptr); + break; case SOAP_TYPE_ns1__chmod_USCOREobject: soap_serialize_ns1__chmod_USCOREobject(soap, (const struct ns1__chmod_USCOREobject *)ptr); @@ -1217,4 +1239,150 @@ #endif +SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__prune_USCOREobject(struct soap *soap, struct ns1__prune_USCOREobject *a) +{ + (void)soap; (void)a; /* appease -Wall -Werror */ + soap_default_string(soap, &a->key); +} + +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__prune_USCOREobject(struct soap *soap, const struct ns1__prune_USCOREobject *a) +{ + (void)soap; (void)a; /* appease -Wall -Werror */ + soap_serialize_string(soap, &a->key); +} + +SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__prune_USCOREobject(struct soap *soap, const struct ns1__prune_USCOREobject *a, const char *tag, const char *type) +{ + register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns1__prune_USCOREobject); + if (soap_out_ns1__prune_USCOREobject(soap, tag, id, a, type)) + return soap->error; + return soap_putindependent(soap); +} + +SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__prune_USCOREobject(struct soap *soap, const char *tag, int id, const struct ns1__prune_USCOREobject *a, const char *type) +{ + if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__prune_USCOREobject), type)) + return soap->error; + if (soap_out_string(soap, "key", -1, &a->key, "")) + return soap->error; + return soap_element_end_out(soap, tag); +} + +SOAP_FMAC3 struct ns1__prune_USCOREobject * SOAP_FMAC4 soap_get_ns1__prune_USCOREobject(struct soap *soap, struct ns1__prune_USCOREobject *p, const char *tag, const char *type) +{ + if ((p = soap_in_ns1__prune_USCOREobject(soap, tag, p, type))) + if (soap_getindependent(soap)) + return NULL; + return p; +} + +SOAP_FMAC3 struct ns1__prune_USCOREobject * SOAP_FMAC4 soap_in_ns1__prune_USCOREobject(struct soap *soap, const char *tag, struct ns1__prune_USCOREobject *a, const char *type) +{ + size_t soap_flag_key = 1; + if (soap_element_begin_in(soap, tag, 0, type)) + return NULL; + a = (struct ns1__prune_USCOREobject *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns1__prune_USCOREobject, sizeof(struct ns1__prune_USCOREobject), 0, NULL, NULL, NULL); + if (!a) + return NULL; + soap_default_ns1__prune_USCOREobject(soap, a); + if (soap->body && !*soap->href) + { + for (;;) + { soap->error = SOAP_TAG_MISMATCH; + if (soap_flag_key && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) + if (soap_in_string(soap, "key", &a->key, "xsd:string")) + { soap_flag_key--; + 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 ns1__prune_USCOREobject *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns1__prune_USCOREobject, 0, sizeof(struct ns1__prune_USCOREobject), 0, NULL); + if (soap->body && soap_element_end_in(soap, tag)) + return NULL; + } + return a; +} + +SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__prune_USCOREobjectResponse(struct soap *soap, struct ns1__prune_USCOREobjectResponse *a) +{ + (void)soap; (void)a; /* appease -Wall -Werror */ + a->result = NULL; +} + +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__prune_USCOREobjectResponse(struct soap *soap, const struct ns1__prune_USCOREobjectResponse *a) +{ + (void)soap; (void)a; /* appease -Wall -Werror */ + soap_serialize_PointerToint(soap, &a->result); +} + +SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__prune_USCOREobjectResponse(struct soap *soap, const struct ns1__prune_USCOREobjectResponse *a, const char *tag, const char *type) +{ + register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns1__prune_USCOREobjectResponse); + if (soap_out_ns1__prune_USCOREobjectResponse(soap, tag, id, a, type)) + return soap->error; + return soap_putindependent(soap); +} + +SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__prune_USCOREobjectResponse(struct soap *soap, const char *tag, int id, const struct ns1__prune_USCOREobjectResponse *a, const char *type) +{ + if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__prune_USCOREobjectResponse), type)) + return soap->error; + if (soap_out_PointerToint(soap, "result", -1, &a->result, "")) + return soap->error; + return soap_element_end_out(soap, tag); +} + +SOAP_FMAC3 struct ns1__prune_USCOREobjectResponse * SOAP_FMAC4 soap_get_ns1__prune_USCOREobjectResponse(struct soap *soap, struct ns1__prune_USCOREobjectResponse *p, const char *tag, const char *type) +{ + if ((p = soap_in_ns1__prune_USCOREobjectResponse(soap, tag, p, type))) + if (soap_getindependent(soap)) + return NULL; + return p; +} + +SOAP_FMAC3 struct ns1__prune_USCOREobjectResponse * SOAP_FMAC4 soap_in_ns1__prune_USCOREobjectResponse(struct soap *soap, const char *tag, struct ns1__prune_USCOREobjectResponse *a, const char *type) +{ + size_t soap_flag_result = 1; + if (soap_element_begin_in(soap, tag, 0, type)) + return NULL; + a = (struct ns1__prune_USCOREobjectResponse *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns1__prune_USCOREobjectResponse, sizeof(struct ns1__prune_USCOREobjectResponse), 0, NULL, NULL, NULL); + if (!a) + return NULL; + soap_default_ns1__prune_USCOREobjectResponse(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_PointerToint(soap, "result", &a->result, "xsd:int")) + { 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 ns1__prune_USCOREobjectResponse *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns1__prune_USCOREobjectResponse, 0, sizeof(struct ns1__prune_USCOREobjectResponse), 0, NULL); + if (soap->body && soap_element_end_in(soap, tag)) + return NULL; + } + return a; +} + SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__chmod_USCOREobject(struct soap *soap, struct ns1__chmod_USCOREobject *a) { Index: trunk/Nebulous/nebclient/src/soapClient.c =================================================================== --- trunk/Nebulous/nebclient/src/soapClient.c (revision 24916) +++ trunk/Nebulous/nebclient/src/soapClient.c (revision 24923) @@ -10,5 +10,5 @@ #endif -SOAP_SOURCE_STAMP("@(#) soapClient.c ver 2.7.12 2009-06-01 23:55:50 GMT") +SOAP_SOURCE_STAMP("@(#) soapClient.c ver 2.7.12 2009-07-25 01:30:29 GMT") @@ -870,4 +870,61 @@ } +SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__prune_USCOREobject(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, int *result) +{ struct ns1__prune_USCOREobject soap_tmp_ns1__prune_USCOREobject; + struct ns1__prune_USCOREobjectResponse *soap_tmp_ns1__prune_USCOREobjectResponse; + if (!soap_endpoint) + soap_endpoint = "http://localhost:80/nebulous"; + if (!soap_action) + soap_action = "urn:Nebulous/Server/SOAP#prune_object"; + soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/"; + soap_tmp_ns1__prune_USCOREobject.key = key; + soap_begin(soap); + soap_serializeheader(soap); + soap_serialize_ns1__prune_USCOREobject(soap, &soap_tmp_ns1__prune_USCOREobject); + 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_ns1__prune_USCOREobject(soap, &soap_tmp_ns1__prune_USCOREobject, "ns1:prune_object", "") + || soap_body_end_out(soap) + || soap_envelope_end_out(soap)) + return soap->error; + } + if (soap_end_count(soap)) + return soap->error; + if (soap_connect(soap, soap_endpoint, soap_action) + || soap_envelope_begin_out(soap) + || soap_putheader(soap) + || soap_body_begin_out(soap) + || soap_put_ns1__prune_USCOREobject(soap, &soap_tmp_ns1__prune_USCOREobject, "ns1:prune_object", "") + || soap_body_end_out(soap) + || soap_envelope_end_out(soap) + || soap_end_send(soap)) + return soap_closesock(soap); + if (!result) + return soap_closesock(soap); + soap_default_int(soap, result); + if (soap_begin_recv(soap) + || soap_envelope_begin_in(soap) + || soap_recv_header(soap) + || soap_body_begin_in(soap)) + return soap_closesock(soap); + soap_tmp_ns1__prune_USCOREobjectResponse = soap_get_ns1__prune_USCOREobjectResponse(soap, NULL, "ns1:prune_objectResponse", ""); + if (soap->error) + { if (soap->error == SOAP_TAG_MISMATCH && soap->level == 2) + return soap_recv_fault(soap); + return soap_closesock(soap); + } + if (soap_body_end_in(soap) + || soap_envelope_end_in(soap) + || soap_end_recv(soap)) + return soap_closesock(soap); + if (result && soap_tmp_ns1__prune_USCOREobjectResponse->result) + *result = *soap_tmp_ns1__prune_USCOREobjectResponse->result; + return soap_closesock(soap); +} + #ifdef __cplusplus } Index: trunk/Nebulous/nebclient/src/soapH.h =================================================================== --- trunk/Nebulous/nebclient/src/soapH.h (revision 24916) +++ trunk/Nebulous/nebclient/src/soapH.h (revision 24923) @@ -42,5 +42,5 @@ #ifndef SOAP_TYPE_SOAP_ENV__Fault -#define SOAP_TYPE_SOAP_ENV__Fault (67) +#define SOAP_TYPE_SOAP_ENV__Fault (70) #endif SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Fault(struct soap*, struct SOAP_ENV__Fault *); @@ -56,5 +56,5 @@ #ifndef SOAP_TYPE_SOAP_ENV__Reason -#define SOAP_TYPE_SOAP_ENV__Reason (66) +#define SOAP_TYPE_SOAP_ENV__Reason (69) #endif SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Reason(struct soap*, struct SOAP_ENV__Reason *); @@ -70,5 +70,5 @@ #ifndef SOAP_TYPE_SOAP_ENV__Detail -#define SOAP_TYPE_SOAP_ENV__Detail (63) +#define SOAP_TYPE_SOAP_ENV__Detail (66) #endif SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Detail(struct soap*, struct SOAP_ENV__Detail *); @@ -84,5 +84,5 @@ #ifndef SOAP_TYPE_SOAP_ENV__Code -#define SOAP_TYPE_SOAP_ENV__Code (61) +#define SOAP_TYPE_SOAP_ENV__Code (64) #endif SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Code(struct soap*, struct SOAP_ENV__Code *); @@ -98,5 +98,5 @@ #ifndef SOAP_TYPE_SOAP_ENV__Header -#define SOAP_TYPE_SOAP_ENV__Header (60) +#define SOAP_TYPE_SOAP_ENV__Header (63) #endif SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Header(struct soap*, struct SOAP_ENV__Header *); @@ -109,4 +109,24 @@ #endif +#ifndef SOAP_TYPE_ns1__prune_USCOREobject +#define SOAP_TYPE_ns1__prune_USCOREobject (62) +#endif +SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__prune_USCOREobject(struct soap*, struct ns1__prune_USCOREobject *); +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__prune_USCOREobject(struct soap*, const struct ns1__prune_USCOREobject *); +SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__prune_USCOREobject(struct soap*, const struct ns1__prune_USCOREobject *, const char*, const char*); +SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__prune_USCOREobject(struct soap*, const char*, int, const struct ns1__prune_USCOREobject *, const char*); +SOAP_FMAC3 struct ns1__prune_USCOREobject * SOAP_FMAC4 soap_get_ns1__prune_USCOREobject(struct soap*, struct ns1__prune_USCOREobject *, const char*, const char*); +SOAP_FMAC3 struct ns1__prune_USCOREobject * SOAP_FMAC4 soap_in_ns1__prune_USCOREobject(struct soap*, const char*, struct ns1__prune_USCOREobject *, const char*); + +#ifndef SOAP_TYPE_ns1__prune_USCOREobjectResponse +#define SOAP_TYPE_ns1__prune_USCOREobjectResponse (61) +#endif +SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__prune_USCOREobjectResponse(struct soap*, struct ns1__prune_USCOREobjectResponse *); +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__prune_USCOREobjectResponse(struct soap*, const struct ns1__prune_USCOREobjectResponse *); +SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__prune_USCOREobjectResponse(struct soap*, const struct ns1__prune_USCOREobjectResponse *, const char*, const char*); +SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__prune_USCOREobjectResponse(struct soap*, const char*, int, const struct ns1__prune_USCOREobjectResponse *, const char*); +SOAP_FMAC3 struct ns1__prune_USCOREobjectResponse * SOAP_FMAC4 soap_get_ns1__prune_USCOREobjectResponse(struct soap*, struct ns1__prune_USCOREobjectResponse *, const char*, const char*); +SOAP_FMAC3 struct ns1__prune_USCOREobjectResponse * SOAP_FMAC4 soap_in_ns1__prune_USCOREobjectResponse(struct soap*, const char*, struct ns1__prune_USCOREobjectResponse *, const char*); + #ifndef SOAP_TYPE_ns1__chmod_USCOREobject #define SOAP_TYPE_ns1__chmod_USCOREobject (59) @@ -422,5 +442,5 @@ #ifndef SOAP_TYPE_PointerToSOAP_ENV__Reason -#define SOAP_TYPE_PointerToSOAP_ENV__Reason (69) +#define SOAP_TYPE_PointerToSOAP_ENV__Reason (72) #endif SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Reason(struct soap*, struct SOAP_ENV__Reason *const*); @@ -435,5 +455,5 @@ #ifndef SOAP_TYPE_PointerToSOAP_ENV__Detail -#define SOAP_TYPE_PointerToSOAP_ENV__Detail (68) +#define SOAP_TYPE_PointerToSOAP_ENV__Detail (71) #endif SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Detail(struct soap*, struct SOAP_ENV__Detail *const*); @@ -448,5 +468,5 @@ #ifndef SOAP_TYPE_PointerToSOAP_ENV__Code -#define SOAP_TYPE_PointerToSOAP_ENV__Code (62) +#define SOAP_TYPE_PointerToSOAP_ENV__Code (65) #endif SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Code(struct soap*, struct SOAP_ENV__Code *const*); Index: trunk/Nebulous/nebclient/src/soapServer.c =================================================================== --- trunk/Nebulous/nebclient/src/soapServer.c (revision 24916) +++ trunk/Nebulous/nebclient/src/soapServer.c (revision 24923) @@ -10,5 +10,5 @@ #endif -SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.12 2009-06-01 23:55:50 GMT") +SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.12 2009-07-25 01:30:29 GMT") @@ -107,4 +107,6 @@ if (!soap_match_tag(soap, soap->tag, "ns1:chmod_object")) return soap_serve_ns1__chmod_USCOREobject(soap); + if (!soap_match_tag(soap, soap->tag, "ns1:prune_object")) + return soap_serve_ns1__prune_USCOREobject(soap); return soap->error = SOAP_NO_METHOD; } @@ -759,4 +761,48 @@ } +SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__prune_USCOREobject(struct soap *soap) +{ struct ns1__prune_USCOREobject soap_tmp_ns1__prune_USCOREobject; + struct ns1__prune_USCOREobjectResponse soap_tmp_ns1__prune_USCOREobjectResponse; + int soap_tmp_int; + soap_default_ns1__prune_USCOREobjectResponse(soap, &soap_tmp_ns1__prune_USCOREobjectResponse); + soap_default_int(soap, &soap_tmp_int); + soap_tmp_ns1__prune_USCOREobjectResponse.result = &soap_tmp_int; + soap_default_ns1__prune_USCOREobject(soap, &soap_tmp_ns1__prune_USCOREobject); + soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/"; + if (!soap_get_ns1__prune_USCOREobject(soap, &soap_tmp_ns1__prune_USCOREobject, "ns1:prune_object", NULL)) + return soap->error; + if (soap_body_end_in(soap) + || soap_envelope_end_in(soap) + || soap_end_recv(soap)) + return soap->error; + soap->error = ns1__prune_USCOREobject(soap, soap_tmp_ns1__prune_USCOREobject.key, &soap_tmp_int); + if (soap->error) + return soap->error; + soap_serializeheader(soap); + soap_serialize_ns1__prune_USCOREobjectResponse(soap, &soap_tmp_ns1__prune_USCOREobjectResponse); + 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_ns1__prune_USCOREobjectResponse(soap, &soap_tmp_ns1__prune_USCOREobjectResponse, "ns1:prune_objectResponse", "") + || 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_ns1__prune_USCOREobjectResponse(soap, &soap_tmp_ns1__prune_USCOREobjectResponse, "ns1:prune_objectResponse", "") + || soap_body_end_out(soap) + || soap_envelope_end_out(soap) + || soap_end_send(soap)) + return soap->error; + return soap_closesock(soap); +} + #ifdef __cplusplus } Index: trunk/Nebulous/nebclient/src/soapStub.h =================================================================== --- trunk/Nebulous/nebclient/src/soapStub.h (revision 24916) +++ trunk/Nebulous/nebclient/src/soapStub.h (revision 24923) @@ -325,6 +325,24 @@ #endif +#ifndef SOAP_TYPE_ns1__prune_USCOREobjectResponse +#define SOAP_TYPE_ns1__prune_USCOREobjectResponse (61) +/* ns1:prune_objectResponse */ +struct ns1__prune_USCOREobjectResponse +{ + int *result; /* SOAP 1.2 RPC return element (when namespace qualified) */ /* optional element of type xsd:int */ +}; +#endif + +#ifndef SOAP_TYPE_ns1__prune_USCOREobject +#define SOAP_TYPE_ns1__prune_USCOREobject (62) +/* ns1:prune_object */ +struct ns1__prune_USCOREobject +{ + char *key; /* optional element of type xsd:string */ +}; +#endif + #ifndef SOAP_TYPE_SOAP_ENV__Header -#define SOAP_TYPE_SOAP_ENV__Header (60) +#define SOAP_TYPE_SOAP_ENV__Header (63) /* SOAP Header: */ struct SOAP_ENV__Header @@ -337,5 +355,5 @@ #ifndef SOAP_TYPE_SOAP_ENV__Code -#define SOAP_TYPE_SOAP_ENV__Code (61) +#define SOAP_TYPE_SOAP_ENV__Code (64) /* SOAP Fault Code: */ struct SOAP_ENV__Code @@ -347,5 +365,5 @@ #ifndef SOAP_TYPE_SOAP_ENV__Detail -#define SOAP_TYPE_SOAP_ENV__Detail (63) +#define SOAP_TYPE_SOAP_ENV__Detail (66) /* SOAP-ENV:Detail */ struct SOAP_ENV__Detail @@ -358,5 +376,5 @@ #ifndef SOAP_TYPE_SOAP_ENV__Reason -#define SOAP_TYPE_SOAP_ENV__Reason (66) +#define SOAP_TYPE_SOAP_ENV__Reason (69) /* SOAP-ENV:Reason */ struct SOAP_ENV__Reason @@ -367,5 +385,5 @@ #ifndef SOAP_TYPE_SOAP_ENV__Fault -#define SOAP_TYPE_SOAP_ENV__Fault (67) +#define SOAP_TYPE_SOAP_ENV__Fault (70) /* SOAP Fault: */ struct SOAP_ENV__Fault @@ -458,4 +476,6 @@ SOAP_FMAC5 int SOAP_FMAC6 ns1__chmod_USCOREobject(struct soap*, char *key, int mode, int *result); +SOAP_FMAC5 int SOAP_FMAC6 ns1__prune_USCOREobject(struct soap*, char *key, int *result); + /******************************************************************************\ * * @@ -495,4 +515,6 @@ SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__chmod_USCOREobject(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, int mode, int *result); +SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__prune_USCOREobject(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, int *result); + /******************************************************************************\ * * @@ -534,4 +556,6 @@ SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__chmod_USCOREobject(struct soap*); + +SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__prune_USCOREobject(struct soap*); #ifdef __cplusplus Index: trunk/Nebulous/nebclient/tests/tests.c =================================================================== --- trunk/Nebulous/nebclient/tests/tests.c (revision 24916) +++ trunk/Nebulous/nebclient/tests/tests.c (revision 24923) @@ -20,5 +20,5 @@ char *key = "foobarbaz"; - plan_tests(29); + plan_tests(30); if (getenv("NEB_SERVER")) { @@ -138,4 +138,7 @@ neb_ok(server, nebChmod(server, "movedfile", 0440) == 0, "chmod object"); + // no dead instances to remove + neb_ok(server, nebPrune(server, "movedfile") == 0, "prune object"); + if (!nebDelete(server, "movedfile")) { diag( "cleanup failed %s\n", nebErr(server));