Index: /trunk/Nebulous/nebclient/nebulous.wsdl
===================================================================
--- /trunk/Nebulous/nebclient/nebulous.wsdl (revision 13095)
+++ /trunk/Nebulous/nebclient/nebulous.wsdl (revision 13096)
@@ -28,7 +28,5 @@
-
-
Index: /trunk/Nebulous/nebclient/src/nebclient.c
===================================================================
--- /trunk/Nebulous/nebclient/src/nebclient.c (revision 13095)
+++ /trunk/Nebulous/nebclient/src/nebclient.c (revision 13096)
@@ -4,5 +4,5 @@
* Copyright (C) 2005 Joshua Hoblitt
*
- * $Id: nebclient.c,v 1.43 2007-04-23 23:10:07 jhoblitt Exp $
+ * $Id: nebclient.c,v 1.44 2007-05-01 03:06:36 jhoblitt Exp $
*/
@@ -83,5 +83,5 @@
}
-char *nebCreate(nebServer *server, const char *key, unsigned int class, const char *volume, const char *comment, char **URI)
+char *nebCreate(nebServer *server, const char *key, const char *volume, char **URI)
{
struct ns1__create_USCOREobjectResponse response;
@@ -97,6 +97,5 @@
if (soap_call_ns1__create_USCOREobject(server->soap, server->endpoint, NULL,
- (char *)key, class, (char *)volume, (char *)comment,
- (char **)&response) != SOAP_OK) {
+ (char *)key, (char *)volume, (char **)&response) != SOAP_OK) {
nebSetServerErr(server);
@@ -123,5 +122,5 @@
}
-int nebOpenCreate(nebServer *server, const char *key, unsigned int class, const char *volume, const char *comment, char **URI)
+int nebOpenCreate(nebServer *server, const char *key, const char *volume, char **URI)
{
char *filename;
@@ -136,5 +135,5 @@
}
- filename = nebCreate(server, key, class, volume, comment, URI);
+ filename = nebCreate(server, key, volume, URI);
file = open(filename, O_RDWR|O_TRUNC, 0660);
@@ -522,5 +521,5 @@
}
- destFH = nebOpenCreate(server, newKey, 0, NULL, NULL, NULL);
+ destFH = nebOpenCreate(server, newKey, NULL, NULL);
if (destFH < 0) {
// propigate nebCreate() error
@@ -640,5 +639,5 @@
resultArray = response.result->__ptr;
- if (resultElements != 8) {
+ if (resultElements != 6) {
nebSetErr(server, "server didn't return the proper number of stat elements");
return NULL;
@@ -647,10 +646,8 @@
nullstrncpy(stat->so_id, resultArray[0], 256);
nullstrncpy(stat->ext_id, resultArray[1], 256);
- nullstrncpy(stat->class_id, resultArray[2], 256);
- nullstrncpy(stat->comment, resultArray[3], 256);
- nullstrncpy(stat->read_lock, resultArray[4], 256);
- nullstrncpy(stat->write_lock, resultArray[5], 256);
- nullstrncpy(stat->epoch, resultArray[6], 256);
- nullstrncpy(stat->mtime, resultArray[7], 256);
+ nullstrncpy(stat->read_lock, resultArray[2], 256);
+ nullstrncpy(stat->write_lock, resultArray[3], 256);
+ nullstrncpy(stat->epoch, resultArray[4], 256);
+ nullstrncpy(stat->mtime, resultArray[5], 256);
return stat;
Index: /trunk/Nebulous/nebclient/src/nebclient.h
===================================================================
--- /trunk/Nebulous/nebclient/src/nebclient.h (revision 13095)
+++ /trunk/Nebulous/nebclient/src/nebclient.h (revision 13096)
@@ -4,5 +4,5 @@
* Copyright (C) 2005 Joshua Hoblitt
*
- * $Id: nebclient.h,v 1.30 2005-12-02 23:49:08 jhoblitt Exp $
+ * $Id: nebclient.h,v 1.31 2007-05-01 03:06:36 jhoblitt Exp $
*/
@@ -37,6 +37,4 @@
char so_id[256]; ///< storage object ID
char ext_id[256]; ///< storage object key (name)
- char class_id[256]; ///< storage object class
- char comment[256]; ///< storage object comment
char read_lock[256]; ///< read lock value
char write_lock[256]; ///< write lock value
@@ -80,7 +78,5 @@
nebServer *server, ///< nebServer object
const char *key, ///< storage object key (name)
- unsigned int class, ///< storage object storage class
const char *volume, ///< preferred storage location of initial instance
- const char *comment, ///< storage object comment
char **URI ///< URL of initial instance, can be NULL
);
@@ -94,7 +90,5 @@
nebServer *server, ///< nebServer object
const char *key, ///< storage object key (name)
- unsigned int class, ///< storage object storage class
const char *volume, ///< preferred storage location of initial instance
- const char *comment, ///< storage object comment
char **URI ///< URL of initial instance, can be NULL
);
Index: /trunk/Nebulous/nebclient/src/nebulous.h
===================================================================
--- /trunk/Nebulous/nebclient/src/nebulous.h (revision 13095)
+++ /trunk/Nebulous/nebclient/src/nebulous.h (revision 13096)
@@ -1,5 +1,5 @@
/* src/nebulous.h
Generated by wsdl2h 1.2.1 from nebulous.wsdl and typemap.dat
- 2007-04-28 01:32:49 GMT
+ 2007-05-01 02:53:36 GMT
Copyright (C) 2001-2005 Robert van Engelen, Genivia Inc. All Rights Reserved.
This part of the software is released under one of the following licenses:
@@ -143,7 +143,5 @@
// request parameters:
char* key,
- int class_,
char* volume,
- char* comment,
// response parameters:
char* *result
@@ -158,7 +156,5 @@
int ns1__create_USCOREobject(
char* key,
- int class_,
char* volume,
- char* comment,
char* *result ///< response parameter
);
Index: /trunk/Nebulous/nebclient/src/soapC.c
===================================================================
--- /trunk/Nebulous/nebclient/src/soapC.c (revision 13095)
+++ /trunk/Nebulous/nebclient/src/soapC.c (revision 13096)
@@ -12,5 +12,5 @@
SOAP_BEGIN_NAMESPACE(soap)
-SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.2 2007-04-28 01:32:49 GMT")
+SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.2 2007-05-01 02:53:36 GMT")
@@ -2484,9 +2484,6 @@
soap_embedded(soap, &a->key, SOAP_TYPE_string);
soap_serialize_string(soap, &a->key);
- soap_embedded(soap, &a->class_, SOAP_TYPE_int);
soap_embedded(soap, &a->volume, SOAP_TYPE_string);
soap_serialize_string(soap, &a->volume);
- soap_embedded(soap, &a->comment, SOAP_TYPE_string);
- soap_serialize_string(soap, &a->comment);
}
@@ -2495,7 +2492,5 @@
(void)soap; (void)a; /* appease -Wall -Werror */
soap_default_string(soap, &a->key);
- soap_default_int(soap, &a->class_);
soap_default_string(soap, &a->volume);
- soap_default_string(soap, &a->comment);
}
@@ -2512,7 +2507,5 @@
soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__create_USCOREobject), type);
soap_out_string(soap, "key", -1, &a->key, "");
- soap_out_int(soap, "class", -1, &a->class_, "");
soap_out_string(soap, "volume", -1, &a->volume, "");
- soap_out_string(soap, "comment", -1, &a->comment, "");
soap_element_end_out(soap, tag);
return SOAP_OK;
@@ -2528,5 +2521,5 @@
SOAP_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)
{
- short soap_flag_key = 1, soap_flag_class_ = 1, soap_flag_volume = 1, soap_flag_comment = 1;
+ short soap_flag_key = 1, soap_flag_volume = 1;
if (soap_element_begin_in(soap, tag, 0))
return NULL;
@@ -2548,17 +2541,7 @@
continue;
}
- if (soap_flag_class_ && soap->error == SOAP_TAG_MISMATCH)
- if (soap_in_int(soap, "class", &a->class_, ""))
- { soap_flag_class_ = 0;
- continue;
- }
if (soap_flag_volume && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
if (soap_in_string(soap, "volume", &a->volume, ""))
{ soap_flag_volume = 0;
- continue;
- }
- if (soap_flag_comment && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
- if (soap_in_string(soap, "comment", &a->comment, ""))
- { soap_flag_comment = 0;
continue;
}
@@ -2569,8 +2552,4 @@
if (soap->error)
return NULL;
- }
- if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_class_))
- { soap->error = SOAP_OCCURS;
- return NULL;
}
if (soap_element_end_in(soap, tag))
Index: /trunk/Nebulous/nebclient/src/soapClient.c
===================================================================
--- /trunk/Nebulous/nebclient/src/soapClient.c (revision 13095)
+++ /trunk/Nebulous/nebclient/src/soapClient.c (revision 13096)
@@ -12,8 +12,8 @@
SOAP_BEGIN_NAMESPACE(soap)
-SOAP_SOURCE_STAMP("@(#) soapClient.c ver 2.7.2 2007-04-28 01:32:49 GMT")
-
-
-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)
+SOAP_SOURCE_STAMP("@(#) soapClient.c ver 2.7.2 2007-05-01 02:53:36 GMT")
+
+
+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)
{ struct ns1__create_USCOREobject soap_tmp_ns1__create_USCOREobject;
struct ns1__create_USCOREobjectResponse *soap_tmp_ns1__create_USCOREobjectResponse;
@@ -24,7 +24,5 @@
soap->encodingStyle = "http://schemas.xmlsoap.org/soap/encoding/";
soap_tmp_ns1__create_USCOREobject.key = key;
- soap_tmp_ns1__create_USCOREobject.class_ = class_;
soap_tmp_ns1__create_USCOREobject.volume = volume;
- soap_tmp_ns1__create_USCOREobject.comment = comment;
soap_begin(soap);
soap_serializeheader(soap);
Index: /trunk/Nebulous/nebclient/src/soapServer.c
===================================================================
--- /trunk/Nebulous/nebclient/src/soapServer.c (revision 13095)
+++ /trunk/Nebulous/nebclient/src/soapServer.c (revision 13096)
@@ -12,5 +12,5 @@
SOAP_BEGIN_NAMESPACE(soap)
-SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.2 2007-04-28 01:32:49 GMT")
+SOAP_SOURCE_STAMP("@(#) soapServer.c ver 2.7.2 2007-05-01 02:53:36 GMT")
@@ -84,5 +84,5 @@
|| soap_end_recv(soap))
return soap->error;
- 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);
+ soap->error = ns1__create_USCOREobject(soap, soap_tmp_ns1__create_USCOREobject.key, soap_tmp_ns1__create_USCOREobject.volume, &soap_tmp_string);
if (soap->error)
return soap->error;
Index: /trunk/Nebulous/nebclient/src/soapStub.h
===================================================================
--- /trunk/Nebulous/nebclient/src/soapStub.h (revision 13095)
+++ /trunk/Nebulous/nebclient/src/soapStub.h (revision 13096)
@@ -45,7 +45,5 @@
{
char *key; /* optional element of type xsd:string */
- int class_; /* required element of type xsd:int */
char *volume; /* optional element of type xsd:string */
- char *comment; /* optional element of type xsd:string */
};
@@ -230,5 +228,5 @@
-SOAP_FMAC5 int SOAP_FMAC6 ns1__create_USCOREobject(struct soap*, char *key, int class_, char *volume, char *comment, char **result);
+SOAP_FMAC5 int SOAP_FMAC6 ns1__create_USCOREobject(struct soap*, char *key, char *volume, char **result);
SOAP_FMAC5 int SOAP_FMAC6 ns1__rename_USCOREobject(struct soap*, char *key, char *newkey, char **result);
@@ -257,5 +255,5 @@
-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);
+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);
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);
Index: /trunk/Nebulous/nebclient/tests/tests.c
===================================================================
--- /trunk/Nebulous/nebclient/tests/tests.c (revision 13095)
+++ /trunk/Nebulous/nebclient/tests/tests.c (revision 13096)
@@ -31,5 +31,5 @@
char *filename;
- filename = nebCreate(server, key, 0, NULL, NULL, &URI);
+ filename = nebCreate(server, key, NULL, &URI);
neb_ok(server, filename, "create object");
@@ -45,5 +45,5 @@
int fh;
- fh = nebOpenCreate(server, key, 0, NULL, NULL, &URI);
+ fh = nebOpenCreate(server, key, NULL, &URI);
neb_ok(server, fh > -1, "create new object filehandle");