Index: branches/neb_distrib_20081210/Nebulous/nebclient/nebulous.wsdl =================================================================== --- branches/neb_distrib_20081210/Nebulous/nebclient/nebulous.wsdl (revision 20900) +++ branches/neb_distrib_20081210/Nebulous/nebclient/nebulous.wsdl (revision 20986) @@ -125,4 +125,5 @@ + Index: branches/neb_distrib_20081210/Nebulous/nebclient/src/nebclient.c =================================================================== --- branches/neb_distrib_20081210/Nebulous/nebclient/src/nebclient.c (revision 20900) +++ branches/neb_distrib_20081210/Nebulous/nebclient/src/nebclient.c (revision 20986) @@ -4,5 +4,5 @@ * Copyright (C) 2005 Joshua Hoblitt * - * $Id: nebclient.c,v 1.54 2008-10-23 22:30:44 bills Exp $ + * $Id: nebclient.c,v 1.54.6.1 2008-12-14 22:03:08 eugene Exp $ */ @@ -253,5 +253,5 @@ } - if (!nebDeleteInstance(server, locations->URI[0])) { + if (!nebDeleteInstance(server, key, locations->URI[0])) { nebObjectInstancesFree(locations); @@ -539,5 +539,5 @@ for (int i = 0; i < locations->n; i++) { - if (!nebDeleteInstance(server, locations->URI[i])) { + if (!nebDeleteInstance(server, key, locations->URI[i])) { nebSetErr(server, "can not delete instance"); nebObjectInstancesFree(locations); @@ -655,5 +655,5 @@ } -bool nebDeleteInstance(nebServer *server, const char *URI) +bool nebDeleteInstance(nebServer *server, const char *key, const char *URI) { int response; @@ -676,5 +676,5 @@ if (soap_call_ns1__delete_USCOREinstance(server->soap, server->endpoint, - NULL, (char *)URI, &response) != SOAP_OK) { + NULL, (char *)key, (char *)URI, &response) != SOAP_OK) { nebFree(filename); Index: branches/neb_distrib_20081210/Nebulous/nebclient/src/nebclient.h =================================================================== --- branches/neb_distrib_20081210/Nebulous/nebclient/src/nebclient.h (revision 20900) +++ branches/neb_distrib_20081210/Nebulous/nebclient/src/nebclient.h (revision 20986) @@ -4,5 +4,5 @@ * Copyright (C) 2005 Joshua Hoblitt * - * $Id: nebclient.h,v 1.36 2008-10-23 22:30:44 bills Exp $ + * $Id: nebclient.h,v 1.36.6.1 2008-12-14 22:03:08 eugene Exp $ */ @@ -248,4 +248,5 @@ bool nebDeleteInstance( nebServer *server, ///< nebServer object + const char *key, ///< storage object key (name) const char *URI ///< URL of instance to remove ); Index: branches/neb_distrib_20081210/Nebulous/nebclient/src/nebulous.h =================================================================== --- branches/neb_distrib_20081210/Nebulous/nebclient/src/nebulous.h (revision 20900) +++ branches/neb_distrib_20081210/Nebulous/nebclient/src/nebulous.h (revision 20986) @@ -1,5 +1,5 @@ /* src/nebulous.h Generated by wsdl2h 1.2.11 from nebulous.wsdl and typemap.dat - 2008-10-16 23:26:37 GMT + 2008-12-11 21:42:13 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: @@ -808,4 +808,5 @@ NULL, // char *action = NULL selects default action for this operation // request parameters: + char* key, char* uri, // response parameters: @@ -819,4 +820,5 @@ struct soap *soap, // request parameters: + char* key, char* uri, // response parameters: @@ -831,4 +833,5 @@ //gsoap ns1 service method-action: delete_USCOREinstance urn:Nebulous/Server/SOAP#delete_instance int ns1__delete_USCOREinstance( + char* key, ///< Request parameter char* uri, ///< Request parameter int *result ///< Response parameter Index: branches/neb_distrib_20081210/Nebulous/nebclient/src/soapC.c =================================================================== --- branches/neb_distrib_20081210/Nebulous/nebclient/src/soapC.c (revision 20900) +++ branches/neb_distrib_20081210/Nebulous/nebclient/src/soapC.c (revision 20986) @@ -12,5 +12,5 @@ #endif -SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.11 2008-10-16 23:26:39 GMT") +SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.11 2008-12-11 21:42:14 GMT") @@ -1342,4 +1342,5 @@ { (void)soap; (void)a; /* appease -Wall -Werror */ + soap_default_string(soap, &a->key); soap_default_string(soap, &a->uri); } @@ -1348,4 +1349,5 @@ { (void)soap; (void)a; /* appease -Wall -Werror */ + soap_serialize_string(soap, &a->key); soap_serialize_string(soap, &a->uri); } @@ -1363,4 +1365,6 @@ if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__delete_USCOREinstance), type)) return soap->error; + if (soap_out_string(soap, "key", -1, &a->key, "")) + return soap->error; if (soap_out_string(soap, "uri", -1, &a->uri, "")) return soap->error; @@ -1378,4 +1382,5 @@ SOAP_FMAC3 struct ns1__delete_USCOREinstance * SOAP_FMAC4 soap_in_ns1__delete_USCOREinstance(struct soap *soap, const char *tag, struct ns1__delete_USCOREinstance *a, const char *type) { + size_t soap_flag_key = 1; size_t soap_flag_uri = 1; if (soap_element_begin_in(soap, tag, 0, type)) @@ -1389,4 +1394,9 @@ 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_flag_uri && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) if (soap_in_string(soap, "uri", &a->uri, "xsd:string")) Index: branches/neb_distrib_20081210/Nebulous/nebclient/src/soapClient.c =================================================================== --- branches/neb_distrib_20081210/Nebulous/nebclient/src/soapClient.c (revision 20900) +++ branches/neb_distrib_20081210/Nebulous/nebclient/src/soapClient.c (revision 20986) @@ -10,5 +10,5 @@ #endif -SOAP_SOURCE_STAMP("@(#) soapClient.c ver 2.7.11 2008-10-16 23:26:38 GMT") +SOAP_SOURCE_STAMP("@(#) soapClient.c ver 2.7.11 2008-12-11 21:42:13 GMT") @@ -700,5 +700,5 @@ } -SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__delete_USCOREinstance(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *uri, int *result) +SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__delete_USCOREinstance(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, char *uri, int *result) { struct ns1__delete_USCOREinstance soap_tmp_ns1__delete_USCOREinstance; struct ns1__delete_USCOREinstanceResponse *soap_tmp_ns1__delete_USCOREinstanceResponse; @@ -708,4 +708,5 @@ soap_action = "urn:Nebulous/Server/SOAP#delete_instance"; soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/"; + soap_tmp_ns1__delete_USCOREinstance.key = key; soap_tmp_ns1__delete_USCOREinstance.uri = uri; soap_begin(soap); Index: branches/neb_distrib_20081210/Nebulous/nebclient/src/soapServer.c =================================================================== --- branches/neb_distrib_20081210/Nebulous/nebclient/src/soapServer.c (revision 20900) +++ branches/neb_distrib_20081210/Nebulous/nebclient/src/soapServer.c (revision 20986) @@ -10,5 +10,5 @@ #endif -SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.11 2008-10-16 23:26:38 GMT") +SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.11 2008-12-11 21:42:13 GMT") @@ -643,5 +643,5 @@ || soap_end_recv(soap)) return soap->error; - soap->error = ns1__delete_USCOREinstance(soap, soap_tmp_ns1__delete_USCOREinstance.uri, &soap_tmp_int); + soap->error = ns1__delete_USCOREinstance(soap, soap_tmp_ns1__delete_USCOREinstance.key, soap_tmp_ns1__delete_USCOREinstance.uri, &soap_tmp_int); if (soap->error) return soap->error; Index: branches/neb_distrib_20081210/Nebulous/nebclient/src/soapStub.h =================================================================== --- branches/neb_distrib_20081210/Nebulous/nebclient/src/soapStub.h (revision 20900) +++ branches/neb_distrib_20081210/Nebulous/nebclient/src/soapStub.h (revision 20986) @@ -283,4 +283,5 @@ struct ns1__delete_USCOREinstance { + char *key; /* optional element of type xsd:string */ char *uri; /* optional element of type xsd:string */ }; @@ -432,5 +433,5 @@ SOAP_FMAC5 int SOAP_FMAC6 ns1__find_USCOREinstances(struct soap*, char *key, char *volume, struct ns1__find_USCOREinstancesResponse *_param_3); -SOAP_FMAC5 int SOAP_FMAC6 ns1__delete_USCOREinstance(struct soap*, char *uri, int *result); +SOAP_FMAC5 int SOAP_FMAC6 ns1__delete_USCOREinstance(struct soap*, char *key, char *uri, int *result); SOAP_FMAC5 int SOAP_FMAC6 ns1__stat_USCOREobject(struct soap*, char *key, struct ns1__stat_USCOREobjectResponse *_param_4); @@ -467,5 +468,5 @@ SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__find_USCOREinstances(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, char *volume, struct ns1__find_USCOREinstancesResponse *_param_3); -SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__delete_USCOREinstance(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *uri, int *result); +SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__delete_USCOREinstance(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, char *uri, int *result); SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__stat_USCOREobject(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, struct ns1__stat_USCOREobjectResponse *_param_4);