X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fproto.h;h=c476c9a78f55baa6067d5dae3a4de6833463778c;hb=142235dcf39ff59a20918e53abcf62f59fa9f2a4;hp=6ed2a1de377c8fd190ba89d356ac6c88a4ca62eb;hpb=b436ce38e1e619d2225c7c75c1f0de841aa13bad;p=yaz-moved-to-github.git

diff --git a/include/proto.h b/include/proto.h
index 6ed2a1d..c476c9a 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -24,7 +24,13 @@
  * OF THIS SOFTWARE.
  *
  * $Log: proto.h,v $
- * Revision 1.43  1998-03-31 11:07:45  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
  * Furhter work on UNIverse resource report.
  * Added Extended Services handling in frontend server.
  *
@@ -878,8 +884,6 @@ typedef struct Z_AlternativeTerm
     Z_AttributesPlusTerm **terms;
 } Z_AlternativeTerm;
 
-#if 1
-
 typedef struct Z_ByDatabase
 {
     char *db;
@@ -919,31 +923,6 @@ typedef struct Z_OccurrenceByAttributes
     Z_OccurrenceByAttributesElem **elements;
 } Z_OccurrenceByAttributes;
 
-#else
-
-/*
- * Old, incomplete definition of OccurrenceByAttributes.
- */
-
-typedef struct Z_OccurrenceByAttributes
-{
-    Z_AttributeList *attributes;
-#if 0
-    int which;
-#define Z_OByAtt_global 0
-#define Z_ObyAtt_byDatabase 1
-    union
-    {
-#endif
-    	int *global;
-#if 0
-	/* Z_ByDatabase *byDatabase; */
-    } u;
-#endif
-} Z_OccurrenceByAttributes;
-
-#endif
-
 typedef struct Z_TermInfo
 {
     Z_Term *term;
@@ -1048,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;