Changeset 20110
- Timestamp:
- Oct 13, 2008, 12:11:09 PM (18 years ago)
- Location:
- trunk/Nebulous/nebclient
- Files:
-
- 10 edited
-
configure.ac (modified) (1 diff)
-
nebulous.wsdl (modified) (3 diffs)
-
src/nebclient.c (modified) (2 diffs)
-
src/nebclient.h (modified) (2 diffs)
-
src/nebulous.h (modified) (8 diffs)
-
src/soapC.c (modified) (19 diffs)
-
src/soapClient.c (modified) (6 diffs)
-
src/soapH.h (modified) (5 diffs)
-
src/soapServer.c (modified) (3 diffs)
-
src/soapStub.h (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Nebulous/nebclient/configure.ac
r19555 r20110 1 1 dnl Copyright (C) 2005 Joshua Hoblitt 2 2 dnl 3 dnl $Id: configure.ac,v 1. 19 2008-09-15 21:26:28jhoblitt Exp $3 dnl $Id: configure.ac,v 1.20 2008-10-13 22:11:09 jhoblitt Exp $ 4 4 5 5 AC_PREREQ(2.61) 6 6 7 AC_INIT([nebclient], [0.0 6], [jhoblitt@cpan.org])7 AC_INIT([nebclient], [0.07], [jhoblitt@cpan.org]) 8 8 AC_CONFIG_SRCDIR([nebulous.wsdl]) 9 9 -
trunk/Nebulous/nebclient/nebulous.wsdl
r13096 r20110 35 35 36 36 <message name="rename_objectRequest"> 37 <part name="key " type="xsd:string" />38 <part name=" newkey" type="xsd:string" />37 <part name="key1" type="xsd:string" /> 38 <part name="key2" type="xsd:string" /> 39 39 </message> 40 40 <message name="rename_objectResponse"> 41 <part name="result" type="xsd:int" /> 42 </message> 43 44 <message name="swap_objectsRequest"> 45 <part name="key1" type="xsd:string" /> 46 <part name="key2" type="xsd:string" /> 47 </message> 48 <message name="swap_objectsResponse"> 41 49 <part name="result" type="xsd:string" /> 42 50 </message> … … 114 122 --> 115 123 </operation> 124 <operation name="swap_objects"> 125 <input message="tns:swap_objectsRequest" /> 126 <output message="tns:swap_objectsResponse" /> 127 <!-- 128 <fault name="" message="" /> 129 --> 130 </operation> 116 131 <operation name="replicate_object"> 117 132 <input message="tns:replicate_objectRequest" /> … … 180 195 </operation> 181 196 <operation name="rename_object"> 182 <soap:operation soapAction="urn:Nebulous/Server/SOAP#create_object" />183 <input>184 <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP"185 encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />186 </input>187 <output>188 <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP"189 encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />190 </output>191 </operation>192 <operation name="rename_object">193 197 <soap:operation soapAction="urn:Nebulous/Server/SOAP#rename_object" /> 198 <input> 199 <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP" 200 encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" /> 201 </input> 202 <output> 203 <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP" 204 encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" /> 205 </output> 206 </operation> 207 <operation name="swap_objects"> 208 <soap:operation soapAction="urn:Nebulous/Server/SOAP#swap_objects" /> 194 209 <input> 195 210 <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP" -
trunk/Nebulous/nebclient/src/nebclient.c
r19552 r20110 4 4 * Copyright (C) 2005 Joshua Hoblitt 5 5 * 6 * $Id: nebclient.c,v 1.5 0 2008-09-15 21:23:36jhoblitt Exp $6 * $Id: nebclient.c,v 1.51 2008-10-13 22:11:09 jhoblitt Exp $ 7 7 */ 8 8 … … 592 592 } 593 593 594 bool nebSwap(nebServer *server, const char *key1, const char *key2) 595 { 596 struct ns1__create_USCOREobjectResponse response; 597 598 REQUIRE_SERVER; 599 600 if (!key1) { 601 nebSetErr(server, "parameter 'key' may not be NULL"); 602 603 return false; 604 } 605 606 if (!key2) { 607 nebSetErr(server, "parameter 'newKey' may not be NULL"); 608 609 return false; 610 } 611 612 if (soap_call_ns1__swap_USCOREobjects(server->soap, server->endpoint, 613 NULL, (char *)key1, (char *)key2, (char **)&response) != SOAP_OK) { 614 return false; 615 } 616 617 return true; 618 } 619 594 620 bool nebDeleteInstance(nebServer *server, const char *URI) 595 621 { -
trunk/Nebulous/nebclient/src/nebclient.h
r13200 r20110 4 4 * Copyright (C) 2005 Joshua Hoblitt 5 5 * 6 * $Id: nebclient.h,v 1.3 2 2007-05-03 21:26:55jhoblitt Exp $6 * $Id: nebclient.h,v 1.33 2008-10-13 22:11:09 jhoblitt Exp $ 7 7 */ 8 8 … … 215 215 ); 216 216 217 /** Atomically swap two storage objects 218 * 219 * @return true on success 220 */ 221 bool nebSwap( 222 nebServer *server, ///< nebServer object 223 const char *key1, ///< storage object key (name) 224 const char *key2 ///< storage object key (name) 225 ); 226 217 227 /** Remove a storage object instance 218 228 * -
trunk/Nebulous/nebclient/src/nebulous.h
r19542 r20110 1 1 /* src/nebulous.h 2 2 Generated by wsdl2h 1.2.11 from nebulous.wsdl and typemap.dat 3 2008- 09-13 01:14:23GMT3 2008-10-13 22:06:54 GMT 4 4 Copyright (C) 2001-2008 Robert van Engelen, Genivia Inc. All Rights Reserved. 5 5 This part of the software is released under one of the following licenses: … … 107 107 - @ref ns1__create_USCOREobject 108 108 - @ref ns1__rename_USCOREobject 109 - @ref ns1__ rename_USCOREobject_109 - @ref ns1__swap_USCOREobjects 110 110 - @ref ns1__replicate_USCOREobject 111 111 - @ref ns1__lock_USCOREobject … … 197 197 198 198 - SOAP RPC encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 199 - SOAP action="urn:Nebulous/Server/SOAP# create_object"199 - SOAP action="urn:Nebulous/Server/SOAP#rename_object" 200 200 201 201 C stub function (defined in soapClient.c[pp] generated by soapcpp2): … … 206 206 NULL, // char *action = NULL selects default action for this operation 207 207 // request parameters: 208 char* key ,209 char* newkey,210 // response parameters: 211 char**result208 char* key1, 209 char* key2, 210 // response parameters: 211 int *result 212 212 ); 213 213 @endcode … … 218 218 struct soap *soap, 219 219 // request parameters: 220 char* key ,221 char* newkey,222 // response parameters: 223 char**result220 char* key1, 221 char* key2, 222 // response parameters: 223 int *result 224 224 ); 225 225 @endcode … … 229 229 //gsoap ns1 service method-style: rename_USCOREobject rpc 230 230 //gsoap ns1 service method-encoding: rename_USCOREobject http://schemas.xmlsoap.org/soap/encoding/ 231 //gsoap ns1 service method-action: rename_USCOREobject urn:Nebulous/Server/SOAP# create_object231 //gsoap ns1 service method-action: rename_USCOREobject urn:Nebulous/Server/SOAP#rename_object 232 232 int ns1__rename_USCOREobject( 233 char* key , ///< Request parameter234 char* newkey, ///< Request parameter235 char**result ///< Response parameter236 ); 237 238 /******************************************************************************\ 239 * * 240 * ns1__ rename_USCOREobject_*241 * * 242 \******************************************************************************/ 243 244 245 /// Operation "ns1__ rename_USCOREobject_" of service binding "SOAP"246 247 /** 248 249 Operation details: 250 251 - SOAP RPC encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 252 - SOAP action="urn:Nebulous/Server/SOAP# rename_object"253 254 C stub function (defined in soapClient.c[pp] generated by soapcpp2): 255 @code 256 int soap_call_ns1__ rename_USCOREobject_(257 struct soap *soap, 258 NULL, // char *endpoint = NULL selects default endpoint for this operation 259 NULL, // char *action = NULL selects default action for this operation 260 // request parameters: 261 char* key ,262 char* newkey,233 char* key1, ///< Request parameter 234 char* key2, ///< Request parameter 235 int *result ///< Response parameter 236 ); 237 238 /******************************************************************************\ 239 * * 240 * ns1__swap_USCOREobjects * 241 * * 242 \******************************************************************************/ 243 244 245 /// Operation "ns1__swap_USCOREobjects" of service binding "SOAP" 246 247 /** 248 249 Operation details: 250 251 - SOAP RPC encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 252 - SOAP action="urn:Nebulous/Server/SOAP#swap_objects" 253 254 C stub function (defined in soapClient.c[pp] generated by soapcpp2): 255 @code 256 int soap_call_ns1__swap_USCOREobjects( 257 struct soap *soap, 258 NULL, // char *endpoint = NULL selects default endpoint for this operation 259 NULL, // char *action = NULL selects default action for this operation 260 // request parameters: 261 char* key1, 262 char* key2, 263 263 // response parameters: 264 264 char* *result … … 268 268 C server function (called from the service dispatcher defined in soapServer.c[pp]): 269 269 @code 270 int ns1__ rename_USCOREobject_(271 struct soap *soap, 272 // request parameters: 273 char* key ,274 char* newkey,270 int ns1__swap_USCOREobjects( 271 struct soap *soap, 272 // request parameters: 273 char* key1, 274 char* key2, 275 275 // response parameters: 276 276 char* *result … … 280 280 */ 281 281 282 //gsoap ns1 service method-style: rename_USCOREobject_rpc283 //gsoap ns1 service method-encoding: rename_USCOREobject_http://schemas.xmlsoap.org/soap/encoding/284 //gsoap ns1 service method-action: rename_USCOREobject_ urn:Nebulous/Server/SOAP#rename_object285 int ns1__ rename_USCOREobject_(286 char* key , ///< Request parameter287 char* newkey, ///< Request parameter282 //gsoap ns1 service method-style: swap_USCOREobjects rpc 283 //gsoap ns1 service method-encoding: swap_USCOREobjects http://schemas.xmlsoap.org/soap/encoding/ 284 //gsoap ns1 service method-action: swap_USCOREobjects urn:Nebulous/Server/SOAP#swap_objects 285 int ns1__swap_USCOREobjects( 286 char* key1, ///< Request parameter 287 char* key2, ///< Request parameter 288 288 char* *result ///< Response parameter 289 289 ); -
trunk/Nebulous/nebclient/src/soapC.c
r19542 r20110 12 12 #endif 13 13 14 SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.11 2008- 09-13 01:14:40GMT")14 SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.11 2008-10-13 22:06:55 GMT") 15 15 16 16 … … 189 189 case SOAP_TYPE_ns1__replicate_USCOREobjectResponse: 190 190 return soap_in_ns1__replicate_USCOREobjectResponse(soap, NULL, NULL, "ns1:replicate_objectResponse"); 191 case SOAP_TYPE_ns1__ rename_USCOREobject_:192 return soap_in_ns1__ rename_USCOREobject_(soap, NULL, NULL, "ns1:rename_object");193 case SOAP_TYPE_ns1__ rename_USCOREobject_Response:194 return soap_in_ns1__ rename_USCOREobject_Response(soap, NULL, NULL, "ns1:rename_object-Response");191 case SOAP_TYPE_ns1__swap_USCOREobjects: 192 return soap_in_ns1__swap_USCOREobjects(soap, NULL, NULL, "ns1:swap_objects"); 193 case SOAP_TYPE_ns1__swap_USCOREobjectsResponse: 194 return soap_in_ns1__swap_USCOREobjectsResponse(soap, NULL, NULL, "ns1:swap_objectsResponse"); 195 195 case SOAP_TYPE_ns1__rename_USCOREobject: 196 196 return soap_in_ns1__rename_USCOREobject(soap, NULL, NULL, "ns1:rename_object"); … … 288 288 return soap_in_ns1__replicate_USCOREobjectResponse(soap, NULL, NULL, NULL); 289 289 } 290 if (!soap_match_tag(soap, t, "ns1: rename_object"))291 { *type = SOAP_TYPE_ns1__ rename_USCOREobject_;292 return soap_in_ns1__ rename_USCOREobject_(soap, NULL, NULL, NULL);293 } 294 if (!soap_match_tag(soap, t, "ns1: rename_object-Response"))295 { *type = SOAP_TYPE_ns1__ rename_USCOREobject_Response;296 return soap_in_ns1__ rename_USCOREobject_Response(soap, NULL, NULL, NULL);290 if (!soap_match_tag(soap, t, "ns1:swap_objects")) 291 { *type = SOAP_TYPE_ns1__swap_USCOREobjects; 292 return soap_in_ns1__swap_USCOREobjects(soap, NULL, NULL, NULL); 293 } 294 if (!soap_match_tag(soap, t, "ns1:swap_objectsResponse")) 295 { *type = SOAP_TYPE_ns1__swap_USCOREobjectsResponse; 296 return soap_in_ns1__swap_USCOREobjectsResponse(soap, NULL, NULL, NULL); 297 297 } 298 298 if (!soap_match_tag(soap, t, "ns1:rename_object")) … … 418 418 case SOAP_TYPE_ns1__replicate_USCOREobjectResponse: 419 419 return soap_out_ns1__replicate_USCOREobjectResponse(soap, tag, id, (const struct ns1__replicate_USCOREobjectResponse *)ptr, "ns1:replicate_objectResponse"); 420 case SOAP_TYPE_ns1__ rename_USCOREobject_:421 return soap_out_ns1__ rename_USCOREobject_(soap, tag, id, (const struct ns1__rename_USCOREobject_ *)ptr, "ns1:rename_object");422 case SOAP_TYPE_ns1__ rename_USCOREobject_Response:423 return soap_out_ns1__ rename_USCOREobject_Response(soap, tag, id, (const struct ns1__rename_USCOREobject_Response *)ptr, "ns1:rename_object-Response");420 case SOAP_TYPE_ns1__swap_USCOREobjects: 421 return soap_out_ns1__swap_USCOREobjects(soap, tag, id, (const struct ns1__swap_USCOREobjects *)ptr, "ns1:swap_objects"); 422 case SOAP_TYPE_ns1__swap_USCOREobjectsResponse: 423 return soap_out_ns1__swap_USCOREobjectsResponse(soap, tag, id, (const struct ns1__swap_USCOREobjectsResponse *)ptr, "ns1:swap_objectsResponse"); 424 424 case SOAP_TYPE_ns1__rename_USCOREobject: 425 425 return soap_out_ns1__rename_USCOREobject(soap, tag, id, (const struct ns1__rename_USCOREobject *)ptr, "ns1:rename_object"); … … 501 501 soap_serialize_ns1__replicate_USCOREobjectResponse(soap, (const struct ns1__replicate_USCOREobjectResponse *)ptr); 502 502 break; 503 case SOAP_TYPE_ns1__ rename_USCOREobject_:504 soap_serialize_ns1__ rename_USCOREobject_(soap, (const struct ns1__rename_USCOREobject_*)ptr);503 case SOAP_TYPE_ns1__swap_USCOREobjects: 504 soap_serialize_ns1__swap_USCOREobjects(soap, (const struct ns1__swap_USCOREobjects *)ptr); 505 505 break; 506 case SOAP_TYPE_ns1__ rename_USCOREobject_Response:507 soap_serialize_ns1__ rename_USCOREobject_Response(soap, (const struct ns1__rename_USCOREobject_Response *)ptr);506 case SOAP_TYPE_ns1__swap_USCOREobjectsResponse: 507 soap_serialize_ns1__swap_USCOREobjectsResponse(soap, (const struct ns1__swap_USCOREobjectsResponse *)ptr); 508 508 break; 509 509 case SOAP_TYPE_ns1__rename_USCOREobject: … … 2160 2160 } 2161 2161 2162 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__ rename_USCOREobject_(struct soap *soap, struct ns1__rename_USCOREobject_*a)2163 { 2164 (void)soap; (void)a; /* appease -Wall -Werror */ 2165 soap_default_string(soap, &a->key );2166 soap_default_string(soap, &a-> newkey);2167 } 2168 2169 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__ rename_USCOREobject_(struct soap *soap, const struct ns1__rename_USCOREobject_*a)2170 { 2171 (void)soap; (void)a; /* appease -Wall -Werror */ 2172 soap_serialize_string(soap, &a->key );2173 soap_serialize_string(soap, &a-> newkey);2174 } 2175 2176 SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__ rename_USCOREobject_(struct soap *soap, const struct ns1__rename_USCOREobject_*a, const char *tag, const char *type)2177 { 2178 register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns1__ rename_USCOREobject_);2179 if (soap_out_ns1__ rename_USCOREobject_(soap, tag, id, a, type))2180 return soap->error; 2181 return soap_putindependent(soap); 2182 } 2183 2184 SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__ rename_USCOREobject_(struct soap *soap, const char *tag, int id, const struct ns1__rename_USCOREobject_*a, const char *type)2185 { 2186 if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__ rename_USCOREobject_), type))2187 return soap->error; 2188 if (soap_out_string(soap, "key ", -1, &a->key, ""))2189 return soap->error; 2190 if (soap_out_string(soap, " newkey", -1, &a->newkey, ""))2162 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__swap_USCOREobjects(struct soap *soap, struct ns1__swap_USCOREobjects *a) 2163 { 2164 (void)soap; (void)a; /* appease -Wall -Werror */ 2165 soap_default_string(soap, &a->key1); 2166 soap_default_string(soap, &a->key2); 2167 } 2168 2169 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__swap_USCOREobjects(struct soap *soap, const struct ns1__swap_USCOREobjects *a) 2170 { 2171 (void)soap; (void)a; /* appease -Wall -Werror */ 2172 soap_serialize_string(soap, &a->key1); 2173 soap_serialize_string(soap, &a->key2); 2174 } 2175 2176 SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__swap_USCOREobjects(struct soap *soap, const struct ns1__swap_USCOREobjects *a, const char *tag, const char *type) 2177 { 2178 register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns1__swap_USCOREobjects); 2179 if (soap_out_ns1__swap_USCOREobjects(soap, tag, id, a, type)) 2180 return soap->error; 2181 return soap_putindependent(soap); 2182 } 2183 2184 SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__swap_USCOREobjects(struct soap *soap, const char *tag, int id, const struct ns1__swap_USCOREobjects *a, const char *type) 2185 { 2186 if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__swap_USCOREobjects), type)) 2187 return soap->error; 2188 if (soap_out_string(soap, "key1", -1, &a->key1, "")) 2189 return soap->error; 2190 if (soap_out_string(soap, "key2", -1, &a->key2, "")) 2191 2191 return soap->error; 2192 2192 return soap_element_end_out(soap, tag); 2193 2193 } 2194 2194 2195 SOAP_FMAC3 struct ns1__ rename_USCOREobject_ * SOAP_FMAC4 soap_get_ns1__rename_USCOREobject_(struct soap *soap, struct ns1__rename_USCOREobject_*p, const char *tag, const char *type)2196 { 2197 if ((p = soap_in_ns1__ rename_USCOREobject_(soap, tag, p, type)))2198 if (soap_getindependent(soap)) 2199 return NULL; 2200 return p; 2201 } 2202 2203 SOAP_FMAC3 struct ns1__ rename_USCOREobject_ * SOAP_FMAC4 soap_in_ns1__rename_USCOREobject_(struct soap *soap, const char *tag, struct ns1__rename_USCOREobject_*a, const char *type)2204 { 2205 size_t soap_flag_key = 1;2206 size_t soap_flag_ newkey= 1;2195 SOAP_FMAC3 struct ns1__swap_USCOREobjects * SOAP_FMAC4 soap_get_ns1__swap_USCOREobjects(struct soap *soap, struct ns1__swap_USCOREobjects *p, const char *tag, const char *type) 2196 { 2197 if ((p = soap_in_ns1__swap_USCOREobjects(soap, tag, p, type))) 2198 if (soap_getindependent(soap)) 2199 return NULL; 2200 return p; 2201 } 2202 2203 SOAP_FMAC3 struct ns1__swap_USCOREobjects * SOAP_FMAC4 soap_in_ns1__swap_USCOREobjects(struct soap *soap, const char *tag, struct ns1__swap_USCOREobjects *a, const char *type) 2204 { 2205 size_t soap_flag_key1 = 1; 2206 size_t soap_flag_key2 = 1; 2207 2207 if (soap_element_begin_in(soap, tag, 0, type)) 2208 2208 return NULL; 2209 a = (struct ns1__ rename_USCOREobject_ *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns1__rename_USCOREobject_, sizeof(struct ns1__rename_USCOREobject_), 0, NULL, NULL, NULL);2210 if (!a) 2211 return NULL; 2212 soap_default_ns1__ rename_USCOREobject_(soap, a);2209 a = (struct ns1__swap_USCOREobjects *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns1__swap_USCOREobjects, sizeof(struct ns1__swap_USCOREobjects), 0, NULL, NULL, NULL); 2210 if (!a) 2211 return NULL; 2212 soap_default_ns1__swap_USCOREobjects(soap, a); 2213 2213 if (soap->body && !*soap->href) 2214 2214 { 2215 2215 for (;;) 2216 2216 { soap->error = SOAP_TAG_MISMATCH; 2217 if (soap_flag_key && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))2218 if (soap_in_string(soap, "key ", &a->key, "xsd:string"))2219 { soap_flag_key --;2220 continue; 2221 } 2222 if (soap_flag_ newkey&& (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))2223 if (soap_in_string(soap, " newkey", &a->newkey, "xsd:string"))2224 { soap_flag_ newkey--;2217 if (soap_flag_key1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) 2218 if (soap_in_string(soap, "key1", &a->key1, "xsd:string")) 2219 { soap_flag_key1--; 2220 continue; 2221 } 2222 if (soap_flag_key2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) 2223 if (soap_in_string(soap, "key2", &a->key2, "xsd:string")) 2224 { soap_flag_key2--; 2225 2225 continue; 2226 2226 } … … 2236 2236 } 2237 2237 else 2238 { a = (struct ns1__ rename_USCOREobject_ *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns1__rename_USCOREobject_, 0, sizeof(struct ns1__rename_USCOREobject_), 0, NULL);2239 if (soap->body && soap_element_end_in(soap, tag)) 2240 return NULL; 2241 } 2242 return a; 2243 } 2244 2245 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__ rename_USCOREobject_Response(struct soap *soap, struct ns1__rename_USCOREobject_Response *a)2238 { a = (struct ns1__swap_USCOREobjects *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns1__swap_USCOREobjects, 0, sizeof(struct ns1__swap_USCOREobjects), 0, NULL); 2239 if (soap->body && soap_element_end_in(soap, tag)) 2240 return NULL; 2241 } 2242 return a; 2243 } 2244 2245 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__swap_USCOREobjectsResponse(struct soap *soap, struct ns1__swap_USCOREobjectsResponse *a) 2246 2246 { 2247 2247 (void)soap; (void)a; /* appease -Wall -Werror */ … … 2249 2249 } 2250 2250 2251 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__ rename_USCOREobject_Response(struct soap *soap, const struct ns1__rename_USCOREobject_Response *a)2251 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__swap_USCOREobjectsResponse(struct soap *soap, const struct ns1__swap_USCOREobjectsResponse *a) 2252 2252 { 2253 2253 (void)soap; (void)a; /* appease -Wall -Werror */ … … 2255 2255 } 2256 2256 2257 SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__ rename_USCOREobject_Response(struct soap *soap, const struct ns1__rename_USCOREobject_Response *a, const char *tag, const char *type)2258 { 2259 register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns1__ rename_USCOREobject_Response);2260 if (soap_out_ns1__ rename_USCOREobject_Response(soap, tag, id, a, type))2261 return soap->error; 2262 return soap_putindependent(soap); 2263 } 2264 2265 SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__ rename_USCOREobject_Response(struct soap *soap, const char *tag, int id, const struct ns1__rename_USCOREobject_Response *a, const char *type)2266 { 2267 if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__ rename_USCOREobject_Response), type))2257 SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__swap_USCOREobjectsResponse(struct soap *soap, const struct ns1__swap_USCOREobjectsResponse *a, const char *tag, const char *type) 2258 { 2259 register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns1__swap_USCOREobjectsResponse); 2260 if (soap_out_ns1__swap_USCOREobjectsResponse(soap, tag, id, a, type)) 2261 return soap->error; 2262 return soap_putindependent(soap); 2263 } 2264 2265 SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__swap_USCOREobjectsResponse(struct soap *soap, const char *tag, int id, const struct ns1__swap_USCOREobjectsResponse *a, const char *type) 2266 { 2267 if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__swap_USCOREobjectsResponse), type)) 2268 2268 return soap->error; 2269 2269 if (soap_out_PointerTostring(soap, "result", -1, &a->result, "")) … … 2272 2272 } 2273 2273 2274 SOAP_FMAC3 struct ns1__ rename_USCOREobject_Response * SOAP_FMAC4 soap_get_ns1__rename_USCOREobject_Response(struct soap *soap, struct ns1__rename_USCOREobject_Response *p, const char *tag, const char *type)2275 { 2276 if ((p = soap_in_ns1__ rename_USCOREobject_Response(soap, tag, p, type)))2277 if (soap_getindependent(soap)) 2278 return NULL; 2279 return p; 2280 } 2281 2282 SOAP_FMAC3 struct ns1__ rename_USCOREobject_Response * SOAP_FMAC4 soap_in_ns1__rename_USCOREobject_Response(struct soap *soap, const char *tag, struct ns1__rename_USCOREobject_Response *a, const char *type)2274 SOAP_FMAC3 struct ns1__swap_USCOREobjectsResponse * SOAP_FMAC4 soap_get_ns1__swap_USCOREobjectsResponse(struct soap *soap, struct ns1__swap_USCOREobjectsResponse *p, const char *tag, const char *type) 2275 { 2276 if ((p = soap_in_ns1__swap_USCOREobjectsResponse(soap, tag, p, type))) 2277 if (soap_getindependent(soap)) 2278 return NULL; 2279 return p; 2280 } 2281 2282 SOAP_FMAC3 struct ns1__swap_USCOREobjectsResponse * SOAP_FMAC4 soap_in_ns1__swap_USCOREobjectsResponse(struct soap *soap, const char *tag, struct ns1__swap_USCOREobjectsResponse *a, const char *type) 2283 2283 { 2284 2284 size_t soap_flag_result = 1; 2285 2285 if (soap_element_begin_in(soap, tag, 0, type)) 2286 2286 return NULL; 2287 a = (struct ns1__ rename_USCOREobject_Response *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns1__rename_USCOREobject_Response, sizeof(struct ns1__rename_USCOREobject_Response), 0, NULL, NULL, NULL);2288 if (!a) 2289 return NULL; 2290 soap_default_ns1__ rename_USCOREobject_Response(soap, a);2287 a = (struct ns1__swap_USCOREobjectsResponse *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns1__swap_USCOREobjectsResponse, sizeof(struct ns1__swap_USCOREobjectsResponse), 0, NULL, NULL, NULL); 2288 if (!a) 2289 return NULL; 2290 soap_default_ns1__swap_USCOREobjectsResponse(soap, a); 2291 2291 if (soap->body && !*soap->href) 2292 2292 { … … 2309 2309 } 2310 2310 else 2311 { a = (struct ns1__ rename_USCOREobject_Response *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns1__rename_USCOREobject_Response, 0, sizeof(struct ns1__rename_USCOREobject_Response), 0, NULL);2311 { a = (struct ns1__swap_USCOREobjectsResponse *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns1__swap_USCOREobjectsResponse, 0, sizeof(struct ns1__swap_USCOREobjectsResponse), 0, NULL); 2312 2312 if (soap->body && soap_element_end_in(soap, tag)) 2313 2313 return NULL; … … 2319 2319 { 2320 2320 (void)soap; (void)a; /* appease -Wall -Werror */ 2321 soap_default_string(soap, &a->key );2322 soap_default_string(soap, &a-> newkey);2321 soap_default_string(soap, &a->key1); 2322 soap_default_string(soap, &a->key2); 2323 2323 } 2324 2324 … … 2326 2326 { 2327 2327 (void)soap; (void)a; /* appease -Wall -Werror */ 2328 soap_serialize_string(soap, &a->key );2329 soap_serialize_string(soap, &a-> newkey);2328 soap_serialize_string(soap, &a->key1); 2329 soap_serialize_string(soap, &a->key2); 2330 2330 } 2331 2331 … … 2342 2342 if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__rename_USCOREobject), type)) 2343 2343 return soap->error; 2344 if (soap_out_string(soap, "key ", -1, &a->key, ""))2345 return soap->error; 2346 if (soap_out_string(soap, " newkey", -1, &a->newkey, ""))2344 if (soap_out_string(soap, "key1", -1, &a->key1, "")) 2345 return soap->error; 2346 if (soap_out_string(soap, "key2", -1, &a->key2, "")) 2347 2347 return soap->error; 2348 2348 return soap_element_end_out(soap, tag); … … 2359 2359 SOAP_FMAC3 struct ns1__rename_USCOREobject * SOAP_FMAC4 soap_in_ns1__rename_USCOREobject(struct soap *soap, const char *tag, struct ns1__rename_USCOREobject *a, const char *type) 2360 2360 { 2361 size_t soap_flag_key = 1;2362 size_t soap_flag_ newkey= 1;2361 size_t soap_flag_key1 = 1; 2362 size_t soap_flag_key2 = 1; 2363 2363 if (soap_element_begin_in(soap, tag, 0, type)) 2364 2364 return NULL; … … 2371 2371 for (;;) 2372 2372 { soap->error = SOAP_TAG_MISMATCH; 2373 if (soap_flag_key && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))2374 if (soap_in_string(soap, "key ", &a->key, "xsd:string"))2375 { soap_flag_key --;2376 continue; 2377 } 2378 if (soap_flag_ newkey&& (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))2379 if (soap_in_string(soap, " newkey", &a->newkey, "xsd:string"))2380 { soap_flag_ newkey--;2373 if (soap_flag_key1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) 2374 if (soap_in_string(soap, "key1", &a->key1, "xsd:string")) 2375 { soap_flag_key1--; 2376 continue; 2377 } 2378 if (soap_flag_key2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) 2379 if (soap_in_string(soap, "key2", &a->key2, "xsd:string")) 2380 { soap_flag_key2--; 2381 2381 continue; 2382 2382 } … … 2408 2408 { 2409 2409 (void)soap; (void)a; /* appease -Wall -Werror */ 2410 soap_serialize_PointerTo string(soap, &a->result);2410 soap_serialize_PointerToint(soap, &a->result); 2411 2411 } 2412 2412 … … 2423 2423 if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__rename_USCOREobjectResponse), type)) 2424 2424 return soap->error; 2425 if (soap_out_PointerTo string(soap, "result", -1, &a->result, ""))2425 if (soap_out_PointerToint(soap, "result", -1, &a->result, "")) 2426 2426 return soap->error; 2427 2427 return soap_element_end_out(soap, tag); … … 2450 2450 { soap->error = SOAP_TAG_MISMATCH; 2451 2451 if (soap_flag_result && soap->error == SOAP_TAG_MISMATCH) 2452 if (soap_in_PointerTo string(soap, "result", &a->result, "xsd:string"))2452 if (soap_in_PointerToint(soap, "result", &a->result, "xsd:int")) 2453 2453 { soap_flag_result--; 2454 2454 continue; -
trunk/Nebulous/nebclient/src/soapClient.c
r19542 r20110 10 10 #endif 11 11 12 SOAP_SOURCE_STAMP("@(#) soapClient.c ver 2.7.11 2008- 09-13 01:14:39GMT")12 SOAP_SOURCE_STAMP("@(#) soapClient.c ver 2.7.11 2008-10-13 22:06:55 GMT") 13 13 14 14 … … 71 71 } 72 72 73 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__rename_USCOREobject(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key , char *newkey, char **result)73 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__rename_USCOREobject(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key1, char *key2, int *result) 74 74 { struct ns1__rename_USCOREobject soap_tmp_ns1__rename_USCOREobject; 75 75 struct ns1__rename_USCOREobjectResponse *soap_tmp_ns1__rename_USCOREobjectResponse; … … 77 77 soap_endpoint = "http://localhost:80/nebulous"; 78 78 if (!soap_action) 79 soap_action = "urn:Nebulous/Server/SOAP# create_object";80 soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/"; 81 soap_tmp_ns1__rename_USCOREobject.key = key;82 soap_tmp_ns1__rename_USCOREobject. newkey = newkey;79 soap_action = "urn:Nebulous/Server/SOAP#rename_object"; 80 soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/"; 81 soap_tmp_ns1__rename_USCOREobject.key1 = key1; 82 soap_tmp_ns1__rename_USCOREobject.key2 = key2; 83 83 soap_begin(soap); 84 84 soap_serializeheader(soap); … … 108 108 if (!result) 109 109 return soap_closesock(soap); 110 *result = NULL;110 soap_default_int(soap, result); 111 111 if (soap_begin_recv(soap) 112 112 || soap_envelope_begin_in(soap) … … 129 129 } 130 130 131 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__ rename_USCOREobject_(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, char *newkey, char **result)132 { struct ns1__ rename_USCOREobject_ soap_tmp_ns1__rename_USCOREobject_;133 struct ns1__ rename_USCOREobject_Response *soap_tmp_ns1__rename_USCOREobject_Response;134 if (!soap_endpoint) 135 soap_endpoint = "http://localhost:80/nebulous"; 136 if (!soap_action) 137 soap_action = "urn:Nebulous/Server/SOAP# create_object";138 soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/"; 139 soap_tmp_ns1__ rename_USCOREobject_.key = key;140 soap_tmp_ns1__ rename_USCOREobject_.newkey = newkey;141 soap_begin(soap); 142 soap_serializeheader(soap); 143 soap_serialize_ns1__ rename_USCOREobject_(soap, &soap_tmp_ns1__rename_USCOREobject_);144 if (soap_begin_count(soap)) 145 return soap->error; 146 if (soap->mode & SOAP_IO_LENGTH) 147 { if (soap_envelope_begin_out(soap) 148 || soap_putheader(soap) 149 || soap_body_begin_out(soap) 150 || soap_put_ns1__ rename_USCOREobject_(soap, &soap_tmp_ns1__rename_USCOREobject_, "ns1:rename_object", "")151 || soap_body_end_out(soap) 152 || soap_envelope_end_out(soap)) 153 return soap->error; 154 } 155 if (soap_end_count(soap)) 156 return soap->error; 157 if (soap_connect(soap, soap_endpoint, soap_action) 158 || soap_envelope_begin_out(soap) 159 || soap_putheader(soap) 160 || soap_body_begin_out(soap) 161 || soap_put_ns1__ rename_USCOREobject_(soap, &soap_tmp_ns1__rename_USCOREobject_, "ns1:rename_object", "")131 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__swap_USCOREobjects(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key1, char *key2, char **result) 132 { struct ns1__swap_USCOREobjects soap_tmp_ns1__swap_USCOREobjects; 133 struct ns1__swap_USCOREobjectsResponse *soap_tmp_ns1__swap_USCOREobjectsResponse; 134 if (!soap_endpoint) 135 soap_endpoint = "http://localhost:80/nebulous"; 136 if (!soap_action) 137 soap_action = "urn:Nebulous/Server/SOAP#swap_objects"; 138 soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/"; 139 soap_tmp_ns1__swap_USCOREobjects.key1 = key1; 140 soap_tmp_ns1__swap_USCOREobjects.key2 = key2; 141 soap_begin(soap); 142 soap_serializeheader(soap); 143 soap_serialize_ns1__swap_USCOREobjects(soap, &soap_tmp_ns1__swap_USCOREobjects); 144 if (soap_begin_count(soap)) 145 return soap->error; 146 if (soap->mode & SOAP_IO_LENGTH) 147 { if (soap_envelope_begin_out(soap) 148 || soap_putheader(soap) 149 || soap_body_begin_out(soap) 150 || soap_put_ns1__swap_USCOREobjects(soap, &soap_tmp_ns1__swap_USCOREobjects, "ns1:swap_objects", "") 151 || soap_body_end_out(soap) 152 || soap_envelope_end_out(soap)) 153 return soap->error; 154 } 155 if (soap_end_count(soap)) 156 return soap->error; 157 if (soap_connect(soap, soap_endpoint, soap_action) 158 || soap_envelope_begin_out(soap) 159 || soap_putheader(soap) 160 || soap_body_begin_out(soap) 161 || soap_put_ns1__swap_USCOREobjects(soap, &soap_tmp_ns1__swap_USCOREobjects, "ns1:swap_objects", "") 162 162 || soap_body_end_out(soap) 163 163 || soap_envelope_end_out(soap) … … 172 172 || soap_body_begin_in(soap)) 173 173 return soap_closesock(soap); 174 soap_tmp_ns1__ rename_USCOREobject_Response = soap_get_ns1__rename_USCOREobject_Response(soap, NULL, "ns1:rename_object-Response", "");175 if (soap->error) 176 { if (soap->error == SOAP_TAG_MISMATCH && soap->level == 2) 177 return soap_recv_fault(soap); 178 return soap_closesock(soap); 179 } 180 if (soap_body_end_in(soap) 181 || soap_envelope_end_in(soap) 182 || soap_end_recv(soap)) 183 return soap_closesock(soap); 184 if (result && soap_tmp_ns1__ rename_USCOREobject_Response->result)185 *result = *soap_tmp_ns1__ rename_USCOREobject_Response->result;174 soap_tmp_ns1__swap_USCOREobjectsResponse = soap_get_ns1__swap_USCOREobjectsResponse(soap, NULL, "ns1:swap_objectsResponse", ""); 175 if (soap->error) 176 { if (soap->error == SOAP_TAG_MISMATCH && soap->level == 2) 177 return soap_recv_fault(soap); 178 return soap_closesock(soap); 179 } 180 if (soap_body_end_in(soap) 181 || soap_envelope_end_in(soap) 182 || soap_end_recv(soap)) 183 return soap_closesock(soap); 184 if (result && soap_tmp_ns1__swap_USCOREobjectsResponse->result) 185 *result = *soap_tmp_ns1__swap_USCOREobjectsResponse->result; 186 186 return soap_closesock(soap); 187 187 } -
trunk/Nebulous/nebclient/src/soapH.h
r19542 r20110 230 230 231 231 #ifndef SOAP_TYPE_ns1__replicate_USCOREobject 232 #define SOAP_TYPE_ns1__replicate_USCOREobject (2 0)232 #define SOAP_TYPE_ns1__replicate_USCOREobject (21) 233 233 #endif 234 234 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__replicate_USCOREobject(struct soap*, struct ns1__replicate_USCOREobject *); … … 240 240 241 241 #ifndef SOAP_TYPE_ns1__replicate_USCOREobjectResponse 242 #define SOAP_TYPE_ns1__replicate_USCOREobjectResponse ( 19)242 #define SOAP_TYPE_ns1__replicate_USCOREobjectResponse (20) 243 243 #endif 244 244 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__replicate_USCOREobjectResponse(struct soap*, struct ns1__replicate_USCOREobjectResponse *); … … 249 249 SOAP_FMAC3 struct ns1__replicate_USCOREobjectResponse * SOAP_FMAC4 soap_in_ns1__replicate_USCOREobjectResponse(struct soap*, const char*, struct ns1__replicate_USCOREobjectResponse *, const char*); 250 250 251 #ifndef SOAP_TYPE_ns1__ rename_USCOREobject_252 #define SOAP_TYPE_ns1__ rename_USCOREobject_ (17)253 #endif 254 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__ rename_USCOREobject_(struct soap*, struct ns1__rename_USCOREobject_*);255 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__ rename_USCOREobject_(struct soap*, const struct ns1__rename_USCOREobject_*);256 SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__ rename_USCOREobject_(struct soap*, const struct ns1__rename_USCOREobject_*, const char*, const char*);257 SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__ rename_USCOREobject_(struct soap*, const char*, int, const struct ns1__rename_USCOREobject_*, const char*);258 SOAP_FMAC3 struct ns1__ rename_USCOREobject_ * SOAP_FMAC4 soap_get_ns1__rename_USCOREobject_(struct soap*, struct ns1__rename_USCOREobject_*, const char*, const char*);259 SOAP_FMAC3 struct ns1__ rename_USCOREobject_ * SOAP_FMAC4 soap_in_ns1__rename_USCOREobject_(struct soap*, const char*, struct ns1__rename_USCOREobject_*, const char*);260 261 #ifndef SOAP_TYPE_ns1__ rename_USCOREobject_Response262 #define SOAP_TYPE_ns1__ rename_USCOREobject_Response (16)263 #endif 264 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__ rename_USCOREobject_Response(struct soap*, struct ns1__rename_USCOREobject_Response *);265 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__ rename_USCOREobject_Response(struct soap*, const struct ns1__rename_USCOREobject_Response *);266 SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__ rename_USCOREobject_Response(struct soap*, const struct ns1__rename_USCOREobject_Response *, const char*, const char*);267 SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__ rename_USCOREobject_Response(struct soap*, const char*, int, const struct ns1__rename_USCOREobject_Response *, const char*);268 SOAP_FMAC3 struct ns1__ rename_USCOREobject_Response * SOAP_FMAC4 soap_get_ns1__rename_USCOREobject_Response(struct soap*, struct ns1__rename_USCOREobject_Response *, const char*, const char*);269 SOAP_FMAC3 struct ns1__ rename_USCOREobject_Response * SOAP_FMAC4 soap_in_ns1__rename_USCOREobject_Response(struct soap*, const char*, struct ns1__rename_USCOREobject_Response *, const char*);251 #ifndef SOAP_TYPE_ns1__swap_USCOREobjects 252 #define SOAP_TYPE_ns1__swap_USCOREobjects (18) 253 #endif 254 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__swap_USCOREobjects(struct soap*, struct ns1__swap_USCOREobjects *); 255 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__swap_USCOREobjects(struct soap*, const struct ns1__swap_USCOREobjects *); 256 SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__swap_USCOREobjects(struct soap*, const struct ns1__swap_USCOREobjects *, const char*, const char*); 257 SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__swap_USCOREobjects(struct soap*, const char*, int, const struct ns1__swap_USCOREobjects *, const char*); 258 SOAP_FMAC3 struct ns1__swap_USCOREobjects * SOAP_FMAC4 soap_get_ns1__swap_USCOREobjects(struct soap*, struct ns1__swap_USCOREobjects *, const char*, const char*); 259 SOAP_FMAC3 struct ns1__swap_USCOREobjects * SOAP_FMAC4 soap_in_ns1__swap_USCOREobjects(struct soap*, const char*, struct ns1__swap_USCOREobjects *, const char*); 260 261 #ifndef SOAP_TYPE_ns1__swap_USCOREobjectsResponse 262 #define SOAP_TYPE_ns1__swap_USCOREobjectsResponse (17) 263 #endif 264 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__swap_USCOREobjectsResponse(struct soap*, struct ns1__swap_USCOREobjectsResponse *); 265 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__swap_USCOREobjectsResponse(struct soap*, const struct ns1__swap_USCOREobjectsResponse *); 266 SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__swap_USCOREobjectsResponse(struct soap*, const struct ns1__swap_USCOREobjectsResponse *, const char*, const char*); 267 SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__swap_USCOREobjectsResponse(struct soap*, const char*, int, const struct ns1__swap_USCOREobjectsResponse *, const char*); 268 SOAP_FMAC3 struct ns1__swap_USCOREobjectsResponse * SOAP_FMAC4 soap_get_ns1__swap_USCOREobjectsResponse(struct soap*, struct ns1__swap_USCOREobjectsResponse *, const char*, const char*); 269 SOAP_FMAC3 struct ns1__swap_USCOREobjectsResponse * SOAP_FMAC4 soap_in_ns1__swap_USCOREobjectsResponse(struct soap*, const char*, struct ns1__swap_USCOREobjectsResponse *, const char*); 270 270 271 271 #ifndef SOAP_TYPE_ns1__rename_USCOREobject 272 #define SOAP_TYPE_ns1__rename_USCOREobject (1 4)272 #define SOAP_TYPE_ns1__rename_USCOREobject (15) 273 273 #endif 274 274 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__rename_USCOREobject(struct soap*, struct ns1__rename_USCOREobject *); … … 280 280 281 281 #ifndef SOAP_TYPE_ns1__rename_USCOREobjectResponse 282 #define SOAP_TYPE_ns1__rename_USCOREobjectResponse (1 3)282 #define SOAP_TYPE_ns1__rename_USCOREobjectResponse (14) 283 283 #endif 284 284 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__rename_USCOREobjectResponse(struct soap*, struct ns1__rename_USCOREobjectResponse *); … … 395 395 396 396 #ifndef SOAP_TYPE_PointerToint 397 #define SOAP_TYPE_PointerToint ( 21)397 #define SOAP_TYPE_PointerToint (12) 398 398 #endif 399 399 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToint(struct soap*, int *const*); -
trunk/Nebulous/nebclient/src/soapServer.c
r19542 r20110 10 10 #endif 11 11 12 SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.11 2008- 09-13 01:14:39GMT")12 SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.11 2008-10-13 22:06:55 GMT") 13 13 14 14 … … 81 81 if (!soap_match_tag(soap, soap->tag, "ns1:rename_object")) 82 82 return soap_serve_ns1__rename_USCOREobject(soap); 83 if (!soap_match_tag(soap, soap->tag, "ns1: rename_object"))84 return soap_serve_ns1__ rename_USCOREobject_(soap);83 if (!soap_match_tag(soap, soap->tag, "ns1:swap_objects")) 84 return soap_serve_ns1__swap_USCOREobjects(soap); 85 85 if (!soap_match_tag(soap, soap->tag, "ns1:replicate_object")) 86 86 return soap_serve_ns1__replicate_USCOREobject(soap); … … 148 148 { struct ns1__rename_USCOREobject soap_tmp_ns1__rename_USCOREobject; 149 149 struct ns1__rename_USCOREobjectResponse soap_tmp_ns1__rename_USCOREobjectResponse; 150 int soap_tmp_int; 151 soap_default_ns1__rename_USCOREobjectResponse(soap, &soap_tmp_ns1__rename_USCOREobjectResponse); 152 soap_default_int(soap, &soap_tmp_int); 153 soap_tmp_ns1__rename_USCOREobjectResponse.result = &soap_tmp_int; 154 soap_default_ns1__rename_USCOREobject(soap, &soap_tmp_ns1__rename_USCOREobject); 155 soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/"; 156 if (!soap_get_ns1__rename_USCOREobject(soap, &soap_tmp_ns1__rename_USCOREobject, "ns1:rename_object", NULL)) 157 return soap->error; 158 if (soap_body_end_in(soap) 159 || soap_envelope_end_in(soap) 160 || soap_end_recv(soap)) 161 return soap->error; 162 soap->error = ns1__rename_USCOREobject(soap, soap_tmp_ns1__rename_USCOREobject.key1, soap_tmp_ns1__rename_USCOREobject.key2, &soap_tmp_int); 163 if (soap->error) 164 return soap->error; 165 soap_serializeheader(soap); 166 soap_serialize_ns1__rename_USCOREobjectResponse(soap, &soap_tmp_ns1__rename_USCOREobjectResponse); 167 if (soap_begin_count(soap)) 168 return soap->error; 169 if (soap->mode & SOAP_IO_LENGTH) 170 { if (soap_envelope_begin_out(soap) 171 || soap_putheader(soap) 172 || soap_body_begin_out(soap) 173 || soap_put_ns1__rename_USCOREobjectResponse(soap, &soap_tmp_ns1__rename_USCOREobjectResponse, "ns1:rename_objectResponse", "") 174 || soap_body_end_out(soap) 175 || soap_envelope_end_out(soap)) 176 return soap->error; 177 }; 178 if (soap_end_count(soap) 179 || soap_response(soap, SOAP_OK) 180 || soap_envelope_begin_out(soap) 181 || soap_putheader(soap) 182 || soap_body_begin_out(soap) 183 || soap_put_ns1__rename_USCOREobjectResponse(soap, &soap_tmp_ns1__rename_USCOREobjectResponse, "ns1:rename_objectResponse", "") 184 || soap_body_end_out(soap) 185 || soap_envelope_end_out(soap) 186 || soap_end_send(soap)) 187 return soap->error; 188 return soap_closesock(soap); 189 } 190 191 SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__swap_USCOREobjects(struct soap *soap) 192 { struct ns1__swap_USCOREobjects soap_tmp_ns1__swap_USCOREobjects; 193 struct ns1__swap_USCOREobjectsResponse soap_tmp_ns1__swap_USCOREobjectsResponse; 150 194 char * soap_tmp_string; 151 soap_default_ns1__ rename_USCOREobjectResponse(soap, &soap_tmp_ns1__rename_USCOREobjectResponse);195 soap_default_ns1__swap_USCOREobjectsResponse(soap, &soap_tmp_ns1__swap_USCOREobjectsResponse); 152 196 soap_tmp_string = NULL; 153 soap_tmp_ns1__rename_USCOREobjectResponse.result = &soap_tmp_string; 154 soap_default_ns1__rename_USCOREobject(soap, &soap_tmp_ns1__rename_USCOREobject); 155 soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/"; 156 if (!soap_get_ns1__rename_USCOREobject(soap, &soap_tmp_ns1__rename_USCOREobject, "ns1:rename_object", NULL)) 157 return soap->error; 158 if (soap_body_end_in(soap) 159 || soap_envelope_end_in(soap) 160 || soap_end_recv(soap)) 161 return soap->error; 162 soap->error = ns1__rename_USCOREobject(soap, soap_tmp_ns1__rename_USCOREobject.key, soap_tmp_ns1__rename_USCOREobject.newkey, &soap_tmp_string); 163 if (soap->error) 164 return soap->error; 165 soap_serializeheader(soap); 166 soap_serialize_ns1__rename_USCOREobjectResponse(soap, &soap_tmp_ns1__rename_USCOREobjectResponse); 167 if (soap_begin_count(soap)) 168 return soap->error; 169 if (soap->mode & SOAP_IO_LENGTH) 170 { if (soap_envelope_begin_out(soap) 171 || soap_putheader(soap) 172 || soap_body_begin_out(soap) 173 || soap_put_ns1__rename_USCOREobjectResponse(soap, &soap_tmp_ns1__rename_USCOREobjectResponse, "ns1:rename_objectResponse", "") 174 || soap_body_end_out(soap) 175 || soap_envelope_end_out(soap)) 176 return soap->error; 177 }; 178 if (soap_end_count(soap) 179 || soap_response(soap, SOAP_OK) 180 || soap_envelope_begin_out(soap) 181 || soap_putheader(soap) 182 || soap_body_begin_out(soap) 183 || soap_put_ns1__rename_USCOREobjectResponse(soap, &soap_tmp_ns1__rename_USCOREobjectResponse, "ns1:rename_objectResponse", "") 184 || soap_body_end_out(soap) 185 || soap_envelope_end_out(soap) 186 || soap_end_send(soap)) 187 return soap->error; 188 return soap_closesock(soap); 189 } 190 191 SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__rename_USCOREobject_(struct soap *soap) 192 { struct ns1__rename_USCOREobject_ soap_tmp_ns1__rename_USCOREobject_; 193 struct ns1__rename_USCOREobject_Response soap_tmp_ns1__rename_USCOREobject_Response; 194 char * soap_tmp_string; 195 soap_default_ns1__rename_USCOREobject_Response(soap, &soap_tmp_ns1__rename_USCOREobject_Response); 196 soap_tmp_string = NULL; 197 soap_tmp_ns1__rename_USCOREobject_Response.result = &soap_tmp_string; 198 soap_default_ns1__rename_USCOREobject_(soap, &soap_tmp_ns1__rename_USCOREobject_); 199 soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/"; 200 if (!soap_get_ns1__rename_USCOREobject_(soap, &soap_tmp_ns1__rename_USCOREobject_, "ns1:rename_object", NULL)) 201 return soap->error; 202 if (soap_body_end_in(soap) 203 || soap_envelope_end_in(soap) 204 || soap_end_recv(soap)) 205 return soap->error; 206 soap->error = ns1__rename_USCOREobject_(soap, soap_tmp_ns1__rename_USCOREobject_.key, soap_tmp_ns1__rename_USCOREobject_.newkey, &soap_tmp_string); 207 if (soap->error) 208 return soap->error; 209 soap_serializeheader(soap); 210 soap_serialize_ns1__rename_USCOREobject_Response(soap, &soap_tmp_ns1__rename_USCOREobject_Response); 211 if (soap_begin_count(soap)) 212 return soap->error; 213 if (soap->mode & SOAP_IO_LENGTH) 214 { if (soap_envelope_begin_out(soap) 215 || soap_putheader(soap) 216 || soap_body_begin_out(soap) 217 || soap_put_ns1__rename_USCOREobject_Response(soap, &soap_tmp_ns1__rename_USCOREobject_Response, "ns1:rename_object-Response", "") 218 || soap_body_end_out(soap) 219 || soap_envelope_end_out(soap)) 220 return soap->error; 221 }; 222 if (soap_end_count(soap) 223 || soap_response(soap, SOAP_OK) 224 || soap_envelope_begin_out(soap) 225 || soap_putheader(soap) 226 || soap_body_begin_out(soap) 227 || soap_put_ns1__rename_USCOREobject_Response(soap, &soap_tmp_ns1__rename_USCOREobject_Response, "ns1:rename_object-Response", "") 197 soap_tmp_ns1__swap_USCOREobjectsResponse.result = &soap_tmp_string; 198 soap_default_ns1__swap_USCOREobjects(soap, &soap_tmp_ns1__swap_USCOREobjects); 199 soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/"; 200 if (!soap_get_ns1__swap_USCOREobjects(soap, &soap_tmp_ns1__swap_USCOREobjects, "ns1:swap_objects", NULL)) 201 return soap->error; 202 if (soap_body_end_in(soap) 203 || soap_envelope_end_in(soap) 204 || soap_end_recv(soap)) 205 return soap->error; 206 soap->error = ns1__swap_USCOREobjects(soap, soap_tmp_ns1__swap_USCOREobjects.key1, soap_tmp_ns1__swap_USCOREobjects.key2, &soap_tmp_string); 207 if (soap->error) 208 return soap->error; 209 soap_serializeheader(soap); 210 soap_serialize_ns1__swap_USCOREobjectsResponse(soap, &soap_tmp_ns1__swap_USCOREobjectsResponse); 211 if (soap_begin_count(soap)) 212 return soap->error; 213 if (soap->mode & SOAP_IO_LENGTH) 214 { if (soap_envelope_begin_out(soap) 215 || soap_putheader(soap) 216 || soap_body_begin_out(soap) 217 || soap_put_ns1__swap_USCOREobjectsResponse(soap, &soap_tmp_ns1__swap_USCOREobjectsResponse, "ns1:swap_objectsResponse", "") 218 || soap_body_end_out(soap) 219 || soap_envelope_end_out(soap)) 220 return soap->error; 221 }; 222 if (soap_end_count(soap) 223 || soap_response(soap, SOAP_OK) 224 || soap_envelope_begin_out(soap) 225 || soap_putheader(soap) 226 || soap_body_begin_out(soap) 227 || soap_put_ns1__swap_USCOREobjectsResponse(soap, &soap_tmp_ns1__swap_USCOREobjectsResponse, "ns1:swap_objectsResponse", "") 228 228 || soap_body_end_out(soap) 229 229 || soap_envelope_end_out(soap) -
trunk/Nebulous/nebclient/src/soapStub.h
r19542 r20110 61 61 62 62 #ifndef SOAP_TYPE_ns1__rename_USCOREobjectResponse 63 #define SOAP_TYPE_ns1__rename_USCOREobjectResponse (1 3)63 #define SOAP_TYPE_ns1__rename_USCOREobjectResponse (14) 64 64 /* ns1:rename_objectResponse */ 65 65 struct ns1__rename_USCOREobjectResponse 66 66 { 67 char **result; /* SOAP 1.2 RPC return element (when namespace qualified) */ /* optional element of type xsd:string*/67 int *result; /* SOAP 1.2 RPC return element (when namespace qualified) */ /* optional element of type xsd:int */ 68 68 }; 69 69 #endif 70 70 71 71 #ifndef SOAP_TYPE_ns1__rename_USCOREobject 72 #define SOAP_TYPE_ns1__rename_USCOREobject (1 4)72 #define SOAP_TYPE_ns1__rename_USCOREobject (15) 73 73 /* ns1:rename_object */ 74 74 struct ns1__rename_USCOREobject 75 75 { 76 char *key ; /* optional element of type xsd:string */77 char * newkey; /* optional element of type xsd:string */78 }; 79 #endif 80 81 #ifndef SOAP_TYPE_ns1__ rename_USCOREobject_Response82 #define SOAP_TYPE_ns1__ rename_USCOREobject_Response (16)83 /* ns1: rename_object-Response */84 struct ns1__ rename_USCOREobject_Response76 char *key1; /* optional element of type xsd:string */ 77 char *key2; /* optional element of type xsd:string */ 78 }; 79 #endif 80 81 #ifndef SOAP_TYPE_ns1__swap_USCOREobjectsResponse 82 #define SOAP_TYPE_ns1__swap_USCOREobjectsResponse (17) 83 /* ns1:swap_objectsResponse */ 84 struct ns1__swap_USCOREobjectsResponse 85 85 { 86 86 char **result; /* SOAP 1.2 RPC return element (when namespace qualified) */ /* optional element of type xsd:string */ … … 88 88 #endif 89 89 90 #ifndef SOAP_TYPE_ns1__ rename_USCOREobject_91 #define SOAP_TYPE_ns1__ rename_USCOREobject_ (17)92 /* ns1: rename_object*/93 struct ns1__ rename_USCOREobject_94 { 95 char *key ; /* optional element of type xsd:string */96 char * newkey; /* optional element of type xsd:string */90 #ifndef SOAP_TYPE_ns1__swap_USCOREobjects 91 #define SOAP_TYPE_ns1__swap_USCOREobjects (18) 92 /* ns1:swap_objects */ 93 struct ns1__swap_USCOREobjects 94 { 95 char *key1; /* optional element of type xsd:string */ 96 char *key2; /* optional element of type xsd:string */ 97 97 }; 98 98 #endif 99 99 100 100 #ifndef SOAP_TYPE_ns1__replicate_USCOREobjectResponse 101 #define SOAP_TYPE_ns1__replicate_USCOREobjectResponse ( 19)101 #define SOAP_TYPE_ns1__replicate_USCOREobjectResponse (20) 102 102 /* ns1:replicate_objectResponse */ 103 103 struct ns1__replicate_USCOREobjectResponse … … 108 108 109 109 #ifndef SOAP_TYPE_ns1__replicate_USCOREobject 110 #define SOAP_TYPE_ns1__replicate_USCOREobject (2 0)110 #define SOAP_TYPE_ns1__replicate_USCOREobject (21) 111 111 /* ns1:replicate_object */ 112 112 struct ns1__replicate_USCOREobject … … 333 333 SOAP_FMAC5 int SOAP_FMAC6 ns1__create_USCOREobject(struct soap*, char *key, char *volume, char **result); 334 334 335 SOAP_FMAC5 int SOAP_FMAC6 ns1__rename_USCOREobject(struct soap*, char *key , char *newkey, char **result);336 337 SOAP_FMAC5 int SOAP_FMAC6 ns1__ rename_USCOREobject_(struct soap*, char *key, char *newkey, char **result);335 SOAP_FMAC5 int SOAP_FMAC6 ns1__rename_USCOREobject(struct soap*, char *key1, char *key2, int *result); 336 337 SOAP_FMAC5 int SOAP_FMAC6 ns1__swap_USCOREobjects(struct soap*, char *key1, char *key2, char **result); 338 338 339 339 SOAP_FMAC5 int SOAP_FMAC6 ns1__replicate_USCOREobject(struct soap*, char *key, char *volume, char **result); … … 360 360 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__create_USCOREobject(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, char *volume, char **result); 361 361 362 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__rename_USCOREobject(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key , char *newkey, char **result);363 364 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__ rename_USCOREobject_(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, char *newkey, char **result);362 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__rename_USCOREobject(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key1, char *key2, int *result); 363 364 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__swap_USCOREobjects(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key1, char *key2, char **result); 365 365 366 366 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__replicate_USCOREobject(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, char *volume, char **result); … … 392 392 SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__rename_USCOREobject(struct soap*); 393 393 394 SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__ rename_USCOREobject_(struct soap*);394 SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__swap_USCOREobjects(struct soap*); 395 395 396 396 SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__replicate_USCOREobject(struct soap*);
Note:
See TracChangeset
for help on using the changeset viewer.
