IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 13096


Ignore:
Timestamp:
Apr 30, 2007, 5:06:36 PM (19 years ago)
Author:
jhoblitt
Message:

remove $class_id & $comment params from Nebulous::Server->create() and Nebulous::Client->create*() and all supporting functions and tests

Location:
trunk/Nebulous/nebclient
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Nebulous/nebclient/nebulous.wsdl

    r13078 r13096  
    2828    <message name="create_objectRequest">
    2929        <part name="key" type="xsd:string" />
    30         <part name="class" type="xsd:int" />
    3130        <part name="volume" type="xsd:string" />
    32         <part name="comment" type="xsd:string" />
    3331    </message>
    3432    <message name="create_objectResponse">

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

    r12963 r13096  
    44 * Copyright (C) 2005  Joshua Hoblitt
    55 *
    6  * $Id: nebclient.c,v 1.43 2007-04-23 23:10:07 jhoblitt Exp $
     6 * $Id: nebclient.c,v 1.44 2007-05-01 03:06:36 jhoblitt Exp $
    77 */
    88
    … …  
    8383}
    8484
    85 char *nebCreate(nebServer *server, const char *key, unsigned int class, const char *volume, const char *comment, char **URI)
     85char *nebCreate(nebServer *server, const char *key, const char *volume, char **URI)
    8686{
    8787    struct ns1__create_USCOREobjectResponse response;
    … …  
    9797
    9898    if (soap_call_ns1__create_USCOREobject(server->soap, server->endpoint, NULL,
    99             (char *)key, class, (char *)volume, (char *)comment,
    100             (char **)&response) != SOAP_OK) {
     99            (char *)key, (char *)volume, (char **)&response) != SOAP_OK) {
    101100        nebSetServerErr(server);
    102101
    … …  
    123122}
    124123
    125 int nebOpenCreate(nebServer *server, const char *key, unsigned int class, const char *volume, const char *comment, char **URI)
     124int nebOpenCreate(nebServer *server, const char *key, const char *volume, char **URI)
    126125{
    127126    char            *filename;
    … …  
    136135    }
    137136
    138     filename = nebCreate(server, key, class, volume, comment, URI);
     137    filename = nebCreate(server, key, volume, URI);
    139138
    140139    file = open(filename, O_RDWR|O_TRUNC, 0660);
    … …  
    522521    }
    523522
    524     destFH = nebOpenCreate(server, newKey, 0, NULL, NULL, NULL);
     523    destFH = nebOpenCreate(server, newKey, NULL, NULL);
    525524    if (destFH < 0) {
    526525        // propigate nebCreate() error
    … …  
    640639    resultArray    = response.result->__ptr;
    641640
    642     if (resultElements != 8) {
     641    if (resultElements != 6) {
    643642        nebSetErr(server, "server didn't return the proper number of stat elements");
    644643        return NULL;
    … …  
    647646    nullstrncpy(stat->so_id, resultArray[0], 256);
    648647    nullstrncpy(stat->ext_id, resultArray[1], 256);
    649     nullstrncpy(stat->class_id, resultArray[2], 256);
    650     nullstrncpy(stat->comment, resultArray[3], 256);
    651     nullstrncpy(stat->read_lock, resultArray[4], 256);
    652     nullstrncpy(stat->write_lock, resultArray[5], 256);
    653     nullstrncpy(stat->epoch, resultArray[6], 256);
    654     nullstrncpy(stat->mtime, resultArray[7], 256);
     648    nullstrncpy(stat->read_lock, resultArray[2], 256);
     649    nullstrncpy(stat->write_lock, resultArray[3], 256);
     650    nullstrncpy(stat->epoch, resultArray[4], 256);
     651    nullstrncpy(stat->mtime, resultArray[5], 256);
    655652
    656653    return stat;

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

    r5661 r13096  
    44 * Copyright (C) 2005  Joshua Hoblitt
    55 *
    6  * $Id: nebclient.h,v 1.30 2005-12-02 23:49:08 jhoblitt Exp $
     6 * $Id: nebclient.h,v 1.31 2007-05-01 03:06:36 jhoblitt Exp $
    77 */
    88
    … …  
    3737    char            so_id[256];         ///< storage object ID
    3838    char            ext_id[256];        ///< storage object key (name)
    39     char            class_id[256];      ///< storage object class
    40     char            comment[256];       ///< storage object comment
    4139    char            read_lock[256];     ///< read lock value
    4240    char            write_lock[256];    ///< write lock value
    … …  
    8078    nebServer *server,                  ///< nebServer object
    8179    const char *key,                    ///< storage object key (name)
    82     unsigned int class,                 ///< storage object storage class
    8380    const char *volume,                 ///< preferred storage location of initial instance
    84     const char *comment,                ///< storage object comment
    8581    char **URI                          ///< URL of initial instance, can be NULL
    8682);
    … …  
    9490    nebServer *server,                  ///< nebServer object
    9591    const char *key,                    ///< storage object key (name)
    96     unsigned int class,                 ///< storage object storage class
    9792    const char *volume,                 ///< preferred storage location of initial instance
    98     const char *comment,                ///< storage object comment
    9993    char **URI                          ///< URL of initial instance, can be NULL
    10094);

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

    r13078 r13096  
    11/* src/nebulous.h
    22   Generated by wsdl2h 1.2.1 from nebulous.wsdl and typemap.dat
    3    2007-04-28 01:32:49 GMT
     3   2007-05-01 02:53:36 GMT
    44   Copyright (C) 2001-2005 Robert van Engelen, Genivia Inc. All Rights Reserved.
    55   This part of the software is released under one of the following licenses:
    … …  
    143143    // request parameters:
    144144    char*                               key,
    145     int                                 class_,
    146145    char*                               volume,
    147     char*                               comment,
    148146    // response parameters:
    149147    char*                              *result
    … …  
    158156int ns1__create_USCOREobject(
    159157    char*                               key,
    160     int                                 class_,
    161158    char*                               volume,
    162     char*                               comment,
    163159    char*                              *result ///< response parameter
    164160);

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

    r13078 r13096  
    1212SOAP_BEGIN_NAMESPACE(soap)
    1313
    14 SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.2 2007-04-28 01:32:49 GMT")
     14SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.2 2007-05-01 02:53:36 GMT")
    1515
    1616
    … …  
    24842484        soap_embedded(soap, &a->key, SOAP_TYPE_string);
    24852485        soap_serialize_string(soap, &a->key);
    2486         soap_embedded(soap, &a->class_, SOAP_TYPE_int);
    24872486        soap_embedded(soap, &a->volume, SOAP_TYPE_string);
    24882487        soap_serialize_string(soap, &a->volume);
    2489         soap_embedded(soap, &a->comment, SOAP_TYPE_string);
    2490         soap_serialize_string(soap, &a->comment);
    24912488}
    24922489
    … …  
    24952492        (void)soap; (void)a; /* appease -Wall -Werror */
    24962493        soap_default_string(soap, &a->key);
    2497         soap_default_int(soap, &a->class_);
    24982494        soap_default_string(soap, &a->volume);
    2499         soap_default_string(soap, &a->comment);
    25002495}
    25012496
    … …  
    25122507        soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__create_USCOREobject), type);
    25132508        soap_out_string(soap, "key", -1, &a->key, "");
    2514         soap_out_int(soap, "class", -1, &a->class_, "");
    25152509        soap_out_string(soap, "volume", -1, &a->volume, "");
    2516         soap_out_string(soap, "comment", -1, &a->comment, "");
    25172510        soap_element_end_out(soap, tag);
    25182511        return SOAP_OK;
    … …  
    25282521SOAP_FMAC3 struct ns1__create_USCOREobject * SOAP_FMAC4 soap_in_ns1__create_USCOREobject(struct soap *soap, const char *tag, struct ns1__create_USCOREobject *a, const char *type)
    25292522{
    2530         short soap_flag_key = 1, soap_flag_class_ = 1, soap_flag_volume = 1, soap_flag_comment = 1;
     2523        short soap_flag_key = 1, soap_flag_volume = 1;
    25312524        if (soap_element_begin_in(soap, tag, 0))
    25322525                return NULL;
    … …  
    25482541                                        continue;
    25492542                                }
    2550                         if (soap_flag_class_ && soap->error == SOAP_TAG_MISMATCH)
    2551                                 if (soap_in_int(soap, "class", &a->class_, ""))
    2552                                 {       soap_flag_class_ = 0;
    2553                                         continue;
    2554                                 }
    25552543                        if (soap_flag_volume && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
    25562544                                if (soap_in_string(soap, "volume", &a->volume, ""))
    25572545                                {       soap_flag_volume = 0;
    2558                                         continue;
    2559                                 }
    2560                         if (soap_flag_comment && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
    2561                                 if (soap_in_string(soap, "comment", &a->comment, ""))
    2562                                 {       soap_flag_comment = 0;
    25632546                                        continue;
    25642547                                }
    … …  
    25692552                        if (soap->error)
    25702553                                return NULL;
    2571                 }
    2572                 if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_class_))
    2573                 {       soap->error = SOAP_OCCURS;
    2574                         return NULL;
    25752554                }
    25762555                if (soap_element_end_in(soap, tag))

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

    r13078 r13096  
    1212SOAP_BEGIN_NAMESPACE(soap)
    1313
    14 SOAP_SOURCE_STAMP("@(#) soapClient.c ver 2.7.2 2007-04-28 01:32:49 GMT")
    15 
    16 
    17 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__create_USCOREobject(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, int class_, char *volume, char *comment, char **result)
     14SOAP_SOURCE_STAMP("@(#) soapClient.c ver 2.7.2 2007-05-01 02:53:36 GMT")
     15
     16
     17SOAP_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)
    1818{       struct ns1__create_USCOREobject soap_tmp_ns1__create_USCOREobject;
    1919        struct ns1__create_USCOREobjectResponse *soap_tmp_ns1__create_USCOREobjectResponse;
    … …  
    2424        soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/";
    2525        soap_tmp_ns1__create_USCOREobject.key = key;
    26         soap_tmp_ns1__create_USCOREobject.class_ = class_;
    2726        soap_tmp_ns1__create_USCOREobject.volume = volume;
    28         soap_tmp_ns1__create_USCOREobject.comment = comment;
    2927        soap_begin(soap);
    3028        soap_serializeheader(soap);

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

    r13078 r13096  
    1212SOAP_BEGIN_NAMESPACE(soap)
    1313
    14 SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.2 2007-04-28 01:32:49 GMT")
     14SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.2 2007-05-01 02:53:36 GMT")
    1515
    1616
    … …  
    8484         || soap_end_recv(soap))
    8585                return soap->error;
    86         soap->error = ns1__create_USCOREobject(soap, soap_tmp_ns1__create_USCOREobject.key, soap_tmp_ns1__create_USCOREobject.class_, soap_tmp_ns1__create_USCOREobject.volume, soap_tmp_ns1__create_USCOREobject.comment, &soap_tmp_string);
     86        soap->error = ns1__create_USCOREobject(soap, soap_tmp_ns1__create_USCOREobject.key, soap_tmp_ns1__create_USCOREobject.volume, &soap_tmp_string);
    8787        if (soap->error)
    8888                return soap->error;

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

    r13078 r13096  
    4545{
    4646        char *key;      /* optional element of type xsd:string */
    47         int class_;     /* required element of type xsd:int */
    4847        char *volume;   /* optional element of type xsd:string */
    49         char *comment;  /* optional element of type xsd:string */
    5048};
    5149
    … …  
    230228
    231229
    232 SOAP_FMAC5 int SOAP_FMAC6 ns1__create_USCOREobject(struct soap*, char *key, int class_, char *volume, char *comment, char **result);
     230SOAP_FMAC5 int SOAP_FMAC6 ns1__create_USCOREobject(struct soap*, char *key, char *volume, char **result);
    233231
    234232SOAP_FMAC5 int SOAP_FMAC6 ns1__rename_USCOREobject(struct soap*, char *key, char *newkey, char **result);
    … …  
    257255
    258256
    259 SOAP_FMAC5 int SOAP_FMAC6 soap_call_ns1__create_USCOREobject(struct soap *soap, const char *soap_endpoint, const char *soap_action, char *key, int class_, char *volume, char *comment, char **result);
     257SOAP_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);
    260258
    261259SOAP_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);

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

    r13045 r13096  
    3131        char        *filename;
    3232       
    33         filename = nebCreate(server, key, 0, NULL, NULL, &URI);
     33        filename = nebCreate(server, key, NULL, &URI);
    3434
    3535        neb_ok(server, filename, "create object");
    … …  
    4545        int         fh;
    4646       
    47         fh = nebOpenCreate(server, key, 0, NULL, NULL, &URI);
     47        fh = nebOpenCreate(server, key, NULL, &URI);
    4848
    4949        neb_ok(server, fh > -1, "create new object filehandle");
Note: See TracChangeset for help on using the changeset viewer.