IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 24923


Ignore:
Timestamp:
Jul 24, 2009, 4:11:30 PM (17 years ago)
Author:
jhoblitt
Message:

add nebPrune()

Location:
trunk/Nebulous/nebclient
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Nebulous/nebclient/nebulous.wsdl

    r24289 r24923  
    149149    </message>
    150150
     151    <message name="prune_objectRequest">
     152        <part name="key" type="xsd:string" />
     153    </message>
     154    <message name="prune_objectResponse">
     155        <!-- fixme -->
     156        <part name="result" type="xsd:int" />
     157    </message>
     158
    151159
    152160    <portType name="Nebulous/Server/SOAPPort">
    … …  
    256264            -->
    257265        </operation>
     266        <operation name="prune_object">
     267            <input  message="tns:prune_objectRequest" />
     268            <output message="tns:prune_objectResponse" />
     269            <!--
     270                <fault name="" message="" />
     271            -->
     272        </operation>
    258273    </portType>
    259274
    … …  
    417432        <operation name="chmod_object">
    418433            <soap:operation soapAction="urn:Nebulous/Server/SOAP#chmod_object" />
     434            <input>
     435                <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP"
     436                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
     437            </input>
     438            <output>
     439                <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP"
     440                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
     441            </output>
     442        </operation>
     443        <operation name="prune_object">
     444            <soap:operation soapAction="urn:Nebulous/Server/SOAP#prune_object" />
    419445            <input>
    420446                <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP"

  • trunk/Nebulous/nebclient/src/nebclient.c

    r24916 r24923  
    859859
    860860
     861int nebPrune(nebServer *server, const char *key)
     862{
     863    int response;
     864
     865    REQUIRE_SERVER;
     866
     867    if (!key) {
     868        nebSetErr(server, "parameter 'key' may not be NULL");
     869
     870        return -1;
     871    }
     872
     873    // FIXME is this leaking memory when response goes out of scope?  the gsoap
     874    // manual seems to 'suggest' that this is temporary data that gets cleaed
     875    // up on the next soap function call
     876    if (soap_call_ns1__prune_USCOREobject(server->soap, server->endpoint,
     877            NULL, (char *)key, &response) != SOAP_OK) {
     878        nebSetServerErr(server);
     879        return -1;
     880    }
     881
     882    return response;
     883}
     884
     885
    861886char *nebErr(nebServer *server)
    862887{

  • trunk/Nebulous/nebclient/src/nebclient.h

    r24916 r24923  
    313313);
    314314
     315/** Removes all of the inaccessible instances from an object
     316 *
     317 * @return the number of inaccessible instances removed
     318 */
     319
     320int nebPrune(
     321    nebServer *server,                  ///< nebServer object
     322    const char *key                     /// storage object key (name)
     323);
     324
    315325/** Returns the error message from the last nebclient function that failed.
    316326 *

  • trunk/Nebulous/nebclient/src/nebulous.h

    r24289 r24923  
    11/* src/nebulous.h
    22   Generated by wsdl2h 1.2.12 from nebulous.wsdl and typemap.dat
    3    2009-06-01 23:55:50 GMT
     3   2009-07-25 01:30:29 GMT
    44   Copyright (C) 2001-2008 Robert van Engelen, Genivia Inc. All Rights Reserved.
    55   This part of the software is released under one of the following licenses:
    … …  
    120120  - @ref ns1__stat_USCOREobject
    121121  - @ref ns1__chmod_USCOREobject
     122  - @ref ns1__prune_USCOREobject
    122123
    123124@section SOAP_ports Endpoints of Binding  "SOAP"
    … …  
    947948);
    948949
     950/******************************************************************************\
     951 *                                                                            *
     952 * ns1__prune_USCOREobject                                                    *
     953 *                                                                            *
     954\******************************************************************************/
     955
     956
     957/// Operation "ns1__prune_USCOREobject" of service binding "SOAP"
     958
     959/**
     960
     961Operation details:
     962
     963  - SOAP RPC encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
     964  - SOAP action="urn:Nebulous/Server/SOAP#prune_object"
     965
     966C stub function (defined in soapClient.c[pp] generated by soapcpp2):
     967@code
     968  int soap_call_ns1__prune_USCOREobject(
     969    struct soap *soap,
     970    NULL, // char *endpoint = NULL selects default endpoint for this operation
     971    NULL, // char *action = NULL selects default action for this operation
     972    // request parameters:
     973    char*                               key,
     974    // response parameters:
     975    int                                *result
     976  );
     977@endcode
     978
     979C server function (called from the service dispatcher defined in soapServer.c[pp]):
     980@code
     981  int ns1__prune_USCOREobject(
     982    struct soap *soap,
     983    // request parameters:
     984    char*                               key,
     985    // response parameters:
     986    int                                *result
     987  );
     988@endcode
     989
     990*/
     991
     992//gsoap ns1  service method-style:      prune_USCOREobject rpc
     993//gsoap ns1  service method-encoding:   prune_USCOREobject http://schemas.xmlsoap.org/soap/encoding/
     994//gsoap ns1  service method-action:     prune_USCOREobject urn:Nebulous/Server/SOAP#prune_object
     995int ns1__prune_USCOREobject(
     996    char*                               key,    ///< Request parameter
     997    int                                *result  ///< Response parameter
     998);
     999
    9491000/* End of src/nebulous.h */

  • trunk/Nebulous/nebclient/src/soapC.c

    r24289 r24923  
    1212#endif
    1313
    14 SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.12 2009-06-01 23:55:50 GMT")
     14SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.12 2009-07-25 01:30:29 GMT")
    1515
    1616
    … …  
    161161        case SOAP_TYPE_int:
    162162                return soap_in_int(soap, NULL, NULL, "xsd:int");
     163        case SOAP_TYPE_ns1__prune_USCOREobject:
     164                return soap_in_ns1__prune_USCOREobject(soap, NULL, NULL, "ns1:prune_object");
     165        case SOAP_TYPE_ns1__prune_USCOREobjectResponse:
     166                return soap_in_ns1__prune_USCOREobjectResponse(soap, NULL, NULL, "ns1:prune_objectResponse");
    163167        case SOAP_TYPE_ns1__chmod_USCOREobject:
    164168                return soap_in_ns1__chmod_USCOREobject(soap, NULL, NULL, "ns1:chmod_object");
    … …  
    254258                        return soap_in_int(soap, NULL, NULL, NULL);
    255259                }
     260                if (!soap_match_tag(soap, t, "ns1:prune_object"))
     261                {       *type = SOAP_TYPE_ns1__prune_USCOREobject;
     262                        return soap_in_ns1__prune_USCOREobject(soap, NULL, NULL, NULL);
     263                }
     264                if (!soap_match_tag(soap, t, "ns1:prune_objectResponse"))
     265                {       *type = SOAP_TYPE_ns1__prune_USCOREobjectResponse;
     266                        return soap_in_ns1__prune_USCOREobjectResponse(soap, NULL, NULL, NULL);
     267                }
    256268                if (!soap_match_tag(soap, t, "ns1:chmod_object"))
    257269                {       *type = SOAP_TYPE_ns1__chmod_USCOREobject;
    … …  
    452464        case SOAP_TYPE_int:
    453465                return soap_out_int(soap, tag, id, (const int *)ptr, "xsd:int");
     466        case SOAP_TYPE_ns1__prune_USCOREobject:
     467                return soap_out_ns1__prune_USCOREobject(soap, tag, id, (const struct ns1__prune_USCOREobject *)ptr, "ns1:prune_object");
     468        case SOAP_TYPE_ns1__prune_USCOREobjectResponse:
     469                return soap_out_ns1__prune_USCOREobjectResponse(soap, tag, id, (const struct ns1__prune_USCOREobjectResponse *)ptr, "ns1:prune_objectResponse");
    454470        case SOAP_TYPE_ns1__chmod_USCOREobject:
    455471                return soap_out_ns1__chmod_USCOREobject(soap, tag, id, (const struct ns1__chmod_USCOREobject *)ptr, "ns1:chmod_object");
    … …  
    543559        switch (type)
    544560        {
     561        case SOAP_TYPE_ns1__prune_USCOREobject:
     562                soap_serialize_ns1__prune_USCOREobject(soap, (const struct ns1__prune_USCOREobject *)ptr);
     563                break;
     564        case SOAP_TYPE_ns1__prune_USCOREobjectResponse:
     565                soap_serialize_ns1__prune_USCOREobjectResponse(soap, (const struct ns1__prune_USCOREobjectResponse *)ptr);
     566                break;
    545567        case SOAP_TYPE_ns1__chmod_USCOREobject:
    546568                soap_serialize_ns1__chmod_USCOREobject(soap, (const struct ns1__chmod_USCOREobject *)ptr);
    … …  
    12171239#endif
    12181240
     1241SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__prune_USCOREobject(struct soap *soap, struct ns1__prune_USCOREobject *a)
     1242{
     1243        (void)soap; (void)a; /* appease -Wall -Werror */
     1244        soap_default_string(soap, &a->key);
     1245}
     1246
     1247SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__prune_USCOREobject(struct soap *soap, const struct ns1__prune_USCOREobject *a)
     1248{
     1249        (void)soap; (void)a; /* appease -Wall -Werror */
     1250        soap_serialize_string(soap, &a->key);
     1251}
     1252
     1253SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__prune_USCOREobject(struct soap *soap, const struct ns1__prune_USCOREobject *a, const char *tag, const char *type)
     1254{
     1255        register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns1__prune_USCOREobject);
     1256        if (soap_out_ns1__prune_USCOREobject(soap, tag, id, a, type))
     1257                return soap->error;
     1258        return soap_putindependent(soap);
     1259}
     1260
     1261SOAP_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)
     1262{
     1263        if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__prune_USCOREobject), type))
     1264                return soap->error;
     1265        if (soap_out_string(soap, "key", -1, &a->key, ""))
     1266                return soap->error;
     1267        return soap_element_end_out(soap, tag);
     1268}
     1269
     1270SOAP_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)
     1271{
     1272        if ((p = soap_in_ns1__prune_USCOREobject(soap, tag, p, type)))
     1273                if (soap_getindependent(soap))
     1274                        return NULL;
     1275        return p;
     1276}
     1277
     1278SOAP_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)
     1279{
     1280        size_t soap_flag_key = 1;
     1281        if (soap_element_begin_in(soap, tag, 0, type))
     1282                return NULL;
     1283        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);
     1284        if (!a)
     1285                return NULL;
     1286        soap_default_ns1__prune_USCOREobject(soap, a);
     1287        if (soap->body && !*soap->href)
     1288        {
     1289                for (;;)
     1290                {       soap->error = SOAP_TAG_MISMATCH;
     1291                        if (soap_flag_key && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
     1292                                if (soap_in_string(soap, "key", &a->key, "xsd:string"))
     1293                                {       soap_flag_key--;
     1294                                        continue;
     1295                                }
     1296                        if (soap->error == SOAP_TAG_MISMATCH)
     1297                                soap->error = soap_ignore_element(soap);
     1298                        if (soap->error == SOAP_NO_TAG)
     1299                                break;
     1300                        if (soap->error)
     1301                                return NULL;
     1302                }
     1303                if (soap_element_end_in(soap, tag))
     1304                        return NULL;
     1305        }
     1306        else
     1307        {       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);
     1308                if (soap->body && soap_element_end_in(soap, tag))
     1309                        return NULL;
     1310        }
     1311        return a;
     1312}
     1313
     1314SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__prune_USCOREobjectResponse(struct soap *soap, struct ns1__prune_USCOREobjectResponse *a)
     1315{
     1316        (void)soap; (void)a; /* appease -Wall -Werror */
     1317        a->result = NULL;
     1318}
     1319
     1320SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__prune_USCOREobjectResponse(struct soap *soap, const struct ns1__prune_USCOREobjectResponse *a)
     1321{
     1322        (void)soap; (void)a; /* appease -Wall -Werror */
     1323        soap_serialize_PointerToint(soap, &a->result);
     1324}
     1325
     1326SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__prune_USCOREobjectResponse(struct soap *soap, const struct ns1__prune_USCOREobjectResponse *a, const char *tag, const char *type)
     1327{
     1328        register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns1__prune_USCOREobjectResponse);
     1329        if (soap_out_ns1__prune_USCOREobjectResponse(soap, tag, id, a, type))
     1330                return soap->error;
     1331        return soap_putindependent(soap);
     1332}
     1333
     1334SOAP_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)
     1335{
     1336        if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__prune_USCOREobjectResponse), type))
     1337                return soap->error;
     1338        if (soap_out_PointerToint(soap, "result", -1, &a->result, ""))
     1339                return soap->error;
     1340        return soap_element_end_out(soap, tag);
     1341}
     1342
     1343SOAP_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)
     1344{
     1345        if ((p = soap_in_ns1__prune_USCOREobjectResponse(soap, tag, p, type)))
     1346                if (soap_getindependent(soap))
     1347                        return NULL;
     1348        return p;
     1349}
     1350
     1351SOAP_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)
     1352{
     1353        size_t soap_flag_result = 1;
     1354        if (soap_element_begin_in(soap, tag, 0, type))
     1355                return NULL;
     1356        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);
     1357        if (!a)
     1358                return NULL;
     1359        soap_default_ns1__prune_USCOREobjectResponse(soap, a);
     1360        if (soap->body && !*soap->href)
     1361        {
     1362                for (;;)
     1363                {       soap->error = SOAP_TAG_MISMATCH;
     1364                        if (soap_flag_result && soap->error == SOAP_TAG_MISMATCH)
     1365                                if (soap_in_PointerToint(soap, "result", &a->result, "xsd:int"))
     1366                                {       soap_flag_result--;
     1367                                        continue;
     1368                                }
     1369                        if (soap->error == SOAP_TAG_MISMATCH)
     1370                                soap->error = soap_ignore_element(soap);
     1371                        if (soap->error == SOAP_NO_TAG)
     1372                                break;
     1373                        if (soap->error)
     1374                                return NULL;
     1375                }
     1376                if (soap_element_end_in(soap, tag))
     1377                        return NULL;
     1378        }
     1379        else
     1380        {       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);
     1381                if (soap->body && soap_element_end_in(soap, tag))
     1382                        return NULL;
     1383        }
     1384        return a;
     1385}
     1386
    12191387SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__chmod_USCOREobject(struct soap *soap, struct ns1__chmod_USCOREobject *a)
    12201388{

  • trunk/Nebulous/nebclient/src/soapClient.c

    r24289 r24923  
    1010#endif
    1111
    12 SOAP_SOURCE_STAMP("@(#) soapClient.c ver 2.7.12 2009-06-01 23:55:50 GMT")
     12SOAP_SOURCE_STAMP("@(#) soapClient.c ver 2.7.12 2009-07-25 01:30:29 GMT")
    1313
    1414
    … …  
    870870}
    871871
     872SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__prune_USCOREobject(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, int *result)
     873{       struct ns1__prune_USCOREobject soap_tmp_ns1__prune_USCOREobject;
     874        struct ns1__prune_USCOREobjectResponse *soap_tmp_ns1__prune_USCOREobjectResponse;
     875        if (!soap_endpoint)
     876                soap_endpoint = "http://localhost:80/nebulous";
     877        if (!soap_action)
     878                soap_action = "urn:Nebulous/Server/SOAP#prune_object";
     879        soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/";
     880        soap_tmp_ns1__prune_USCOREobject.key = key;
     881        soap_begin(soap);
     882        soap_serializeheader(soap);
     883        soap_serialize_ns1__prune_USCOREobject(soap, &soap_tmp_ns1__prune_USCOREobject);
     884        if (soap_begin_count(soap))
     885                return soap->error;
     886        if (soap->mode & SOAP_IO_LENGTH)
     887        {       if (soap_envelope_begin_out(soap)
     888                 || soap_putheader(soap)
     889                 || soap_body_begin_out(soap)
     890                 || soap_put_ns1__prune_USCOREobject(soap, &soap_tmp_ns1__prune_USCOREobject, "ns1:prune_object", "")
     891                 || soap_body_end_out(soap)
     892                 || soap_envelope_end_out(soap))
     893                         return soap->error;
     894        }
     895        if (soap_end_count(soap))
     896                return soap->error;
     897        if (soap_connect(soap, soap_endpoint, soap_action)
     898         || soap_envelope_begin_out(soap)
     899         || soap_putheader(soap)
     900         || soap_body_begin_out(soap)
     901         || soap_put_ns1__prune_USCOREobject(soap, &soap_tmp_ns1__prune_USCOREobject, "ns1:prune_object", "")
     902         || soap_body_end_out(soap)
     903         || soap_envelope_end_out(soap)
     904         || soap_end_send(soap))
     905                return soap_closesock(soap);
     906        if (!result)
     907                return soap_closesock(soap);
     908        soap_default_int(soap, result);
     909        if (soap_begin_recv(soap)
     910         || soap_envelope_begin_in(soap)
     911         || soap_recv_header(soap)
     912         || soap_body_begin_in(soap))
     913                return soap_closesock(soap);
     914        soap_tmp_ns1__prune_USCOREobjectResponse = soap_get_ns1__prune_USCOREobjectResponse(soap, NULL, "ns1:prune_objectResponse", "");
     915        if (soap->error)
     916        {       if (soap->error == SOAP_TAG_MISMATCH && soap->level == 2)
     917                        return soap_recv_fault(soap);
     918                return soap_closesock(soap);
     919        }
     920        if (soap_body_end_in(soap)
     921         || soap_envelope_end_in(soap)
     922         || soap_end_recv(soap))
     923                return soap_closesock(soap);
     924        if (result && soap_tmp_ns1__prune_USCOREobjectResponse->result)
     925                *result = *soap_tmp_ns1__prune_USCOREobjectResponse->result;
     926        return soap_closesock(soap);
     927}
     928
    872929#ifdef __cplusplus
    873930}

  • trunk/Nebulous/nebclient/src/soapH.h

    r24289 r24923  
    4242
    4343#ifndef SOAP_TYPE_SOAP_ENV__Fault
    44 #define SOAP_TYPE_SOAP_ENV__Fault (67)
     44#define SOAP_TYPE_SOAP_ENV__Fault (70)
    4545#endif
    4646SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Fault(struct soap*, struct SOAP_ENV__Fault *);
    … …  
    5656
    5757#ifndef SOAP_TYPE_SOAP_ENV__Reason
    58 #define SOAP_TYPE_SOAP_ENV__Reason (66)
     58#define SOAP_TYPE_SOAP_ENV__Reason (69)
    5959#endif
    6060SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Reason(struct soap*, struct SOAP_ENV__Reason *);
    … …  
    7070
    7171#ifndef SOAP_TYPE_SOAP_ENV__Detail
    72 #define SOAP_TYPE_SOAP_ENV__Detail (63)
     72#define SOAP_TYPE_SOAP_ENV__Detail (66)
    7373#endif
    7474SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Detail(struct soap*, struct SOAP_ENV__Detail *);
    … …  
    8484
    8585#ifndef SOAP_TYPE_SOAP_ENV__Code
    86 #define SOAP_TYPE_SOAP_ENV__Code (61)
     86#define SOAP_TYPE_SOAP_ENV__Code (64)
    8787#endif
    8888SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Code(struct soap*, struct SOAP_ENV__Code *);
    … …  
    9898
    9999#ifndef SOAP_TYPE_SOAP_ENV__Header
    100 #define SOAP_TYPE_SOAP_ENV__Header (60)
     100#define SOAP_TYPE_SOAP_ENV__Header (63)
    101101#endif
    102102SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Header(struct soap*, struct SOAP_ENV__Header *);
    … …  
    109109#endif
    110110
     111#ifndef SOAP_TYPE_ns1__prune_USCOREobject
     112#define SOAP_TYPE_ns1__prune_USCOREobject (62)
     113#endif
     114SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__prune_USCOREobject(struct soap*, struct ns1__prune_USCOREobject *);
     115SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__prune_USCOREobject(struct soap*, const struct ns1__prune_USCOREobject *);
     116SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__prune_USCOREobject(struct soap*, const struct ns1__prune_USCOREobject *, const char*, const char*);
     117SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__prune_USCOREobject(struct soap*, const char*, int, const struct ns1__prune_USCOREobject *, const char*);
     118SOAP_FMAC3 struct ns1__prune_USCOREobject * SOAP_FMAC4 soap_get_ns1__prune_USCOREobject(struct soap*, struct ns1__prune_USCOREobject *, const char*, const char*);
     119SOAP_FMAC3 struct ns1__prune_USCOREobject * SOAP_FMAC4 soap_in_ns1__prune_USCOREobject(struct soap*, const char*, struct ns1__prune_USCOREobject *, const char*);
     120
     121#ifndef SOAP_TYPE_ns1__prune_USCOREobjectResponse
     122#define SOAP_TYPE_ns1__prune_USCOREobjectResponse (61)
     123#endif
     124SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__prune_USCOREobjectResponse(struct soap*, struct ns1__prune_USCOREobjectResponse *);
     125SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__prune_USCOREobjectResponse(struct soap*, const struct ns1__prune_USCOREobjectResponse *);
     126SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__prune_USCOREobjectResponse(struct soap*, const struct ns1__prune_USCOREobjectResponse *, const char*, const char*);
     127SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__prune_USCOREobjectResponse(struct soap*, const char*, int, const struct ns1__prune_USCOREobjectResponse *, const char*);
     128SOAP_FMAC3 struct ns1__prune_USCOREobjectResponse * SOAP_FMAC4 soap_get_ns1__prune_USCOREobjectResponse(struct soap*, struct ns1__prune_USCOREobjectResponse *, const char*, const char*);
     129SOAP_FMAC3 struct ns1__prune_USCOREobjectResponse * SOAP_FMAC4 soap_in_ns1__prune_USCOREobjectResponse(struct soap*, const char*, struct ns1__prune_USCOREobjectResponse *, const char*);
     130
    111131#ifndef SOAP_TYPE_ns1__chmod_USCOREobject
    112132#define SOAP_TYPE_ns1__chmod_USCOREobject (59)
    … …  
    422442
    423443#ifndef SOAP_TYPE_PointerToSOAP_ENV__Reason
    424 #define SOAP_TYPE_PointerToSOAP_ENV__Reason (69)
     444#define SOAP_TYPE_PointerToSOAP_ENV__Reason (72)
    425445#endif
    426446SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Reason(struct soap*, struct SOAP_ENV__Reason *const*);
    … …  
    435455
    436456#ifndef SOAP_TYPE_PointerToSOAP_ENV__Detail
    437 #define SOAP_TYPE_PointerToSOAP_ENV__Detail (68)
     457#define SOAP_TYPE_PointerToSOAP_ENV__Detail (71)
    438458#endif
    439459SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Detail(struct soap*, struct SOAP_ENV__Detail *const*);
    … …  
    448468
    449469#ifndef SOAP_TYPE_PointerToSOAP_ENV__Code
    450 #define SOAP_TYPE_PointerToSOAP_ENV__Code (62)
     470#define SOAP_TYPE_PointerToSOAP_ENV__Code (65)
    451471#endif
    452472SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Code(struct soap*, struct SOAP_ENV__Code *const*);

  • trunk/Nebulous/nebclient/src/soapServer.c

    r24289 r24923  
    1010#endif
    1111
    12 SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.12 2009-06-01 23:55:50 GMT")
     12SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.12 2009-07-25 01:30:29 GMT")
    1313
    1414
    … …  
    107107        if (!soap_match_tag(soap, soap->tag, "ns1:chmod_object"))
    108108                return soap_serve_ns1__chmod_USCOREobject(soap);
     109        if (!soap_match_tag(soap, soap->tag, "ns1:prune_object"))
     110                return soap_serve_ns1__prune_USCOREobject(soap);
    109111        return soap->error = SOAP_NO_METHOD;
    110112}
    … …  
    759761}
    760762
     763SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__prune_USCOREobject(struct soap *soap)
     764{       struct ns1__prune_USCOREobject soap_tmp_ns1__prune_USCOREobject;
     765        struct ns1__prune_USCOREobjectResponse soap_tmp_ns1__prune_USCOREobjectResponse;
     766        int soap_tmp_int;
     767        soap_default_ns1__prune_USCOREobjectResponse(soap, &soap_tmp_ns1__prune_USCOREobjectResponse);
     768        soap_default_int(soap, &soap_tmp_int);
     769        soap_tmp_ns1__prune_USCOREobjectResponse.result = &soap_tmp_int;
     770        soap_default_ns1__prune_USCOREobject(soap, &soap_tmp_ns1__prune_USCOREobject);
     771        soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/";
     772        if (!soap_get_ns1__prune_USCOREobject(soap, &soap_tmp_ns1__prune_USCOREobject, "ns1:prune_object", NULL))
     773                return soap->error;
     774        if (soap_body_end_in(soap)
     775         || soap_envelope_end_in(soap)
     776         || soap_end_recv(soap))
     777                return soap->error;
     778        soap->error = ns1__prune_USCOREobject(soap, soap_tmp_ns1__prune_USCOREobject.key, &soap_tmp_int);
     779        if (soap->error)
     780                return soap->error;
     781        soap_serializeheader(soap);
     782        soap_serialize_ns1__prune_USCOREobjectResponse(soap, &soap_tmp_ns1__prune_USCOREobjectResponse);
     783        if (soap_begin_count(soap))
     784                return soap->error;
     785        if (soap->mode & SOAP_IO_LENGTH)
     786        {       if (soap_envelope_begin_out(soap)
     787                 || soap_putheader(soap)
     788                 || soap_body_begin_out(soap)
     789                 || soap_put_ns1__prune_USCOREobjectResponse(soap, &soap_tmp_ns1__prune_USCOREobjectResponse, "ns1:prune_objectResponse", "")
     790                 || soap_body_end_out(soap)
     791                 || soap_envelope_end_out(soap))
     792                         return soap->error;
     793        };
     794        if (soap_end_count(soap)
     795         || soap_response(soap, SOAP_OK)
     796         || soap_envelope_begin_out(soap)
     797         || soap_putheader(soap)
     798         || soap_body_begin_out(soap)
     799         || soap_put_ns1__prune_USCOREobjectResponse(soap, &soap_tmp_ns1__prune_USCOREobjectResponse, "ns1:prune_objectResponse", "")
     800         || soap_body_end_out(soap)
     801         || soap_envelope_end_out(soap)
     802         || soap_end_send(soap))
     803                return soap->error;
     804        return soap_closesock(soap);
     805}
     806
    761807#ifdef __cplusplus
    762808}

  • trunk/Nebulous/nebclient/src/soapStub.h

    r24289 r24923  
    325325#endif
    326326
     327#ifndef SOAP_TYPE_ns1__prune_USCOREobjectResponse
     328#define SOAP_TYPE_ns1__prune_USCOREobjectResponse (61)
     329/* ns1:prune_objectResponse */
     330struct ns1__prune_USCOREobjectResponse
     331{
     332        int *result;    /* SOAP 1.2 RPC return element (when namespace qualified) */    /* optional element of type xsd:int */
     333};
     334#endif
     335
     336#ifndef SOAP_TYPE_ns1__prune_USCOREobject
     337#define SOAP_TYPE_ns1__prune_USCOREobject (62)
     338/* ns1:prune_object */
     339struct ns1__prune_USCOREobject
     340{
     341        char *key;      /* optional element of type xsd:string */
     342};
     343#endif
     344
    327345#ifndef SOAP_TYPE_SOAP_ENV__Header
    328 #define SOAP_TYPE_SOAP_ENV__Header (60)
     346#define SOAP_TYPE_SOAP_ENV__Header (63)
    329347/* SOAP Header: */
    330348struct SOAP_ENV__Header
    … …  
    337355
    338356#ifndef SOAP_TYPE_SOAP_ENV__Code
    339 #define SOAP_TYPE_SOAP_ENV__Code (61)
     357#define SOAP_TYPE_SOAP_ENV__Code (64)
    340358/* SOAP Fault Code: */
    341359struct SOAP_ENV__Code
    … …  
    347365
    348366#ifndef SOAP_TYPE_SOAP_ENV__Detail
    349 #define SOAP_TYPE_SOAP_ENV__Detail (63)
     367#define SOAP_TYPE_SOAP_ENV__Detail (66)
    350368/* SOAP-ENV:Detail */
    351369struct SOAP_ENV__Detail
    … …  
    358376
    359377#ifndef SOAP_TYPE_SOAP_ENV__Reason
    360 #define SOAP_TYPE_SOAP_ENV__Reason (66)
     378#define SOAP_TYPE_SOAP_ENV__Reason (69)
    361379/* SOAP-ENV:Reason */
    362380struct SOAP_ENV__Reason
    … …  
    367385
    368386#ifndef SOAP_TYPE_SOAP_ENV__Fault
    369 #define SOAP_TYPE_SOAP_ENV__Fault (67)
     387#define SOAP_TYPE_SOAP_ENV__Fault (70)
    370388/* SOAP Fault: */
    371389struct SOAP_ENV__Fault
    … …  
    458476SOAP_FMAC5 int SOAP_FMAC6 ns1__chmod_USCOREobject(struct soap*, char *key, int mode, int *result);
    459477
     478SOAP_FMAC5 int SOAP_FMAC6 ns1__prune_USCOREobject(struct soap*, char *key, int *result);
     479
    460480/******************************************************************************\
    461481 *                                                                            *
    … …  
    495515SOAP_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);
    496516
     517SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__prune_USCOREobject(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, int *result);
     518
    497519/******************************************************************************\
    498520 *                                                                            *
    … …  
    534556
    535557SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__chmod_USCOREobject(struct soap*);
     558
     559SOAP_FMAC5 int SOAP_FMAC6 soap_serve_ns1__prune_USCOREobject(struct soap*);
    536560
    537561#ifdef __cplusplus

  • trunk/Nebulous/nebclient/tests/tests.c

    r24290 r24923  
    2020    char            *key = "foobarbaz";
    2121
    22     plan_tests(29);
     22    plan_tests(30);
    2323
    2424    if (getenv("NEB_SERVER")) {
    … …  
    138138    neb_ok(server, nebChmod(server, "movedfile", 0440) == 0, "chmod object");
    139139
     140    // no dead instances to remove
     141    neb_ok(server, nebPrune(server, "movedfile") == 0, "prune object");
     142
    140143    if (!nebDelete(server, "movedfile")) {
    141144        diag( "cleanup failed %s\n", nebErr(server));
Note: See TracChangeset for help on using the changeset viewer.