Changed som member names of DeleteResultSetRequest/Response.

diff --git a/CHANGELOG b/CHANGELOG
index 5b6f9d8..1bea92b 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
+* Slightly changed some member names of DeleteResultSetRequest/Response.
+
 * Changed some C definitions regarding EXPLAIN record syntax (prt-exp.h)
 and added member 'languages' in TargetInfo (which was missing).
 

diff --git a/asn/proto.c b/asn/proto.c
index 3054cc2..f65ad32 100644 (file)
--- a/asn/proto.c
+++ b/asn/proto.c
@@ -1,10 +1,13 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-1998, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: proto.c,v $
- * Revision 1.55  1998-02-11 11:53:32  adam
+ * Revision 1.56  1998-08-19 16:10:04  adam
+ * Changed som member names of DeleteResultSetRequest/Response.
+ *
+ * Revision 1.55  1998/02/11 11:53:32  adam
  * Changed code so that it compiles as C++.
  *
  * Revision 1.54  1996/11/11 13:14:46  adam
@@ -1493,13 +1496,24 @@ int z_DeleteResultSetRequest(ODR o, Z_DeleteResultSetRequest **p, int opt)
        odr_implicit(o, odr_integer, &(*p)->deleteFunction, ODR_CONTEXT, 32,
            0) &&
        (odr_sequence_of(o, z_ResultSetId, &(*p)->resultSetList,
-           &(*p)->num_ids) || odr_ok(o)) &&
+           &(*p)->num_resultSetList) || odr_ok(o)) &&
 #ifdef Z_95
        z_OtherInformation(o, &(*p)->otherInfo, 1) &&
 #endif
        odr_sequence_end(o);
 }
 
+int z_ListStatuses (ODR o, Z_ListStatuses **p, int opt)
+{
+    if (!odr_initmember (o, p, sizeof(**p)))
+        return opt && odr_ok(o);
+    if (odr_sequence_of (o, (Odr_fun) z_ListStatus, &(*p)->elements,
+        &(*p)->num))
+        return 1;
+    *p = 0;
+    return opt && odr_ok(o);
+}
+
 int z_DeleteResultSetResponse(ODR o, Z_DeleteResultSetResponse **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
@@ -1507,15 +1521,13 @@ int z_DeleteResultSetResponse(ODR o, Z_DeleteResultSetResponse **p, int opt)
     return
        z_ReferenceId(o, &(*p)->referenceId, 1) &&
        odr_implicit(o, z_DeleteSetStatus, &(*p)->deleteOperationStatus,
-           ODR_CONTEXT, 0, 1) &&
-       odr_implicit_settag(o, ODR_CONTEXT, 1) &&
-       (odr_sequence_of(o, (Odr_fun)z_ListStatus, &(*p)->deleteListStatuses,
-           &(*p)->num_statuses) || odr_ok(o)) &&
+           ODR_CONTEXT, 0, 0) &&
+        odr_implicit (o, z_ListStatuses,
+            &(*p)->deleteListStatuses, ODR_CONTEXT, 1, 1) &&
        odr_implicit(o, odr_integer, &(*p)->numberNotDeleted, ODR_CONTEXT,
            34, 1) &&
-       odr_implicit_settag(o, ODR_CONTEXT, 35) &&
-       (odr_sequence_of(o, (Odr_fun)z_ListStatus, &(*p)->bulkStatuses,
-           &(*p)->num_bulkStatuses) || odr_ok(o)) &&
+        odr_implicit (o, z_ListStatuses,
+             &(*p)->bulkStatuses, ODR_CONTEXT, 35, 1) &&
        odr_implicit(o, odr_visiblestring, &(*p)->deleteMessage, ODR_CONTEXT,
            36, 1) &&
 #ifdef Z_95

diff --git a/asn/zget.c b/asn/zget.c
index 1163246..ae9764c 100644 (file)
--- a/asn/zget.c
+++ b/asn/zget.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zget.c,v $
- * Revision 1.15  1998-03-31 15:13:19  adam
+ * Revision 1.16  1998-08-19 16:10:05  adam
+ * Changed som member names of DeleteResultSetRequest/Response.
+ *
+ * Revision 1.15  1998/03/31 15:13:19  adam
  * Development towards compiled ASN.1.
  *
  * Revision 1.14  1998/02/11 11:53:32  adam
@@ -207,11 +210,7 @@ Z_DeleteResultSetRequest *zget_DeleteResultSetRequest(ODR o)
     r->referenceId = 0;
     r->deleteFunction = (int *)odr_malloc(o, sizeof(int));
     *r->deleteFunction = Z_DeleteRequest_list;
-#ifdef ASN_COMPILED
     r->num_resultSetList = 0;
-#else
-    r->num_ids = 0;
-#endif
     r->resultSetList = 0;
 #ifdef Z_95
     r->otherInfo = 0;
@@ -226,19 +225,9 @@ Z_DeleteResultSetResponse *zget_DeleteResultSetResponse(ODR o)
     r->referenceId = 0;
     r->deleteOperationStatus = (int *)odr_malloc(o, sizeof(int));
     *r->deleteOperationStatus = Z_DeleteStatus_success;
-#ifdef ASN_COMPILED
-    r->deleteListStatuses = 0;
-#else
-    r->num_statuses = 0;
     r->deleteListStatuses = 0;
-#endif
     r->numberNotDeleted = 0;
-#ifdef ASN_COMPILED
-    r->bulkStatuses = 0;
-#else
-    r->num_bulkStatuses = 0;
     r->bulkStatuses = 0;
-#endif
     r->deleteMessage = 0;
 #ifdef Z_95
     r->otherInfo = 0;

diff --git a/client/client.c b/client/client.c
index 8d4cba5..421cb16 100644 (file)
--- a/client/client.c
+++ b/client/client.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: client.c,v $
- * Revision 1.68  1998-07-20 12:37:06  adam
+ * Revision 1.69  1998-08-19 16:10:06  adam
+ * Changed som member names of DeleteResultSetRequest/Response.
+ *
+ * Revision 1.68  1998/07/20 12:37:06  adam
  * Added 'delete <resultset>' command. Changed open command so that
  * it reconnects if already connected.
  *
@@ -763,7 +766,7 @@ static int send_deleteResultSetRequest(char *arg)
 
     req->referenceId = set_refid (out);
 
-    req->num_ids = 1;
+    req->num_resultSetList = 1;
     req->resultSetList = (char **)
        odr_malloc (out, sizeof(*req->resultSetList));
     *req->resultSetList = arg;

diff --git a/include/proto.h b/include/proto.h
index 354d136..c476c9a 100644 (file)
--- a/include/proto.h
+++ b/include/proto.h
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: proto.h,v $
- * Revision 1.44  1998-05-18 10:14:08  adam
+ * Revision 1.45  1998-08-19 16:10:07  adam
+ * Changed som member names of DeleteResultSetRequest/Response.
+ *
+ * Revision 1.44  1998/05/18 10:14:08  adam
  * Minor change - removed 'dead' definitions.
  *
  * Revision 1.43  1998/03/31 11:07:45  adam
@@ -1024,22 +1027,25 @@ typedef struct Z_DeleteResultSetRequest
     int *deleteFunction;
 #define Z_DeleteRequest_list    0
 #define Z_DeleteRequest_all     1
-    int num_ids;
+    int num_resultSetList;
     Z_ResultSetId **resultSetList;      /* OPTIONAL */
 #ifdef Z_95
     Z_OtherInformation *otherInfo;
 #endif
 } Z_DeleteResultSetRequest;
 
+typedef struct Z_ListStatuses {
+    int num;
+    Z_ListStatus **elements;
+} Z_ListStatuses;
+
 typedef struct Z_DeleteResultSetResponse
 {
     Z_ReferenceId *referenceId;        /* OPTIONAL */
     int *deleteOperationStatus;
-    int num_statuses;
-    Z_ListStatus **deleteListStatuses; /* OPTIONAL */
+    Z_ListStatuses *deleteListStatuses;/* OPTIONAL */
     int *numberNotDeleted;             /* OPTIONAL */
-    int num_bulkStatuses;
-    Z_ListStatus **bulkStatuses;       /* OPTIONAL */
+    Z_ListStatuses *bulkStatuses;      /* OPTIONAL */
     char *deleteMessage;               /* OPTIONAL */
 #ifdef Z_95
     Z_OtherInformation *otherInfo;

diff --git a/server/seshigh.c b/server/seshigh.c
index 3233f05..3d808ac 100644 (file)
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $
- * Revision 1.78  1998-08-03 10:23:55  adam
+ * Revision 1.79  1998-08-19 16:10:08  adam
+ * Changed som member names of DeleteResultSetRequest/Response.
+ *
+ * Revision 1.78  1998/08/03 10:23:55  adam
  * Fixed bug regarding Options for Sort.
  *
  * Revision 1.77  1998/07/20 12:38:42  adam
@@ -1605,7 +1608,7 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb,
 
     logf(LOG_LOG, "Got DeleteRequest.");
 
-    bdrr->num_setnames = req->num_ids;
+    bdrr->num_setnames = req->num_resultSetList;
     bdrr->setnames = req->resultSetList;
     bdrr->stream = assoc->encode;
     bdrr->function = *req->deleteFunction;
@@ -1619,10 +1622,8 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb,
        odr_malloc (assoc->encode, sizeof(*res->deleteOperationStatus));
     *res->deleteOperationStatus = bdrr->delete_status;
 
-    res->num_statuses = 0;
     res->deleteListStatuses = 0;
     res->numberNotDeleted = 0;
-    res->num_bulkStatuses = 0;
     res->bulkStatuses = 0;
     res->deleteMessage = 0;
     res->otherInfo = 0;

diff --git a/ztest/ztest.c b/ztest/ztest.c
index 6bcf04d..06e2a58 100644 (file)
--- a/ztest/ztest.c
+++ b/ztest/ztest.c
@@ -7,7 +7,10 @@
  *    Chas Woodfield, Fretwell Downing Datasystems.
  *
  * $Log: ztest.c,v $
- * Revision 1.12  1998-07-20 12:38:44  adam
+ * Revision 1.13  1998-08-19 16:10:09  adam
+ * Changed som member names of DeleteResultSetRequest/Response.
+ *
+ * Revision 1.12  1998/07/20 12:38:44  adam
  * Implemented delete result set service to server API.
  *
  * Revision 1.11  1998/06/09 13:55:08  adam
@@ -208,7 +211,7 @@ static Z_GenericRecord *dummy_grs_record (int num, ODR o)
     return r;
 }
 
-bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *num)
+bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *fd)
 {
     bend_fetchresult *r = (bend_fetchresult *)
                        odr_malloc (q->stream, sizeof(*r));
@@ -255,7 +258,7 @@ bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *num)
 /*
  * silly dummy-scan what reads words from a file.
  */
-bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num)
+bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *fd)
 {
     bend_scanresult *r = (bend_scanresult *) odr_malloc (q->stream, sizeof(*r));
     static FILE *f = 0;