X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fproto.h;h=96ab94bc15500f870f914b8c58f313985b213a5c;hb=87ef7657b92bc53bd98e18ef5046ae3698a7fb01;hp=b2e095a69bae9caa21be3b7ee3f765fe2b70034c;hpb=84b60b9a8d2052540541726390fde416c59e1f40;p=yaz-moved-to-github.git

diff --git a/include/proto.h b/include/proto.h
index b2e095a..96ab94b 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -24,7 +24,20 @@
  * OF THIS SOFTWARE.
  *
  * $Log: proto.h,v $
- * Revision 1.42  1998-03-20 14:46:06  adam
+ * Revision 1.46  1998-10-20 13:55:44  quinn
+ * Fixed Scan bug in asn and client
+ *
+ * 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.
+ *
+ * Revision 1.42  1998/03/20 14:46:06  adam
  * Added UNIverse Resource Reports.
  *
  * Revision 1.41  1998/02/10 15:31:52  adam
@@ -874,8 +887,6 @@ typedef struct Z_AlternativeTerm
     Z_AttributesPlusTerm **terms;
 } Z_AlternativeTerm;
 
-#if 1
-
 typedef struct Z_ByDatabase
 {
     char *db;
@@ -915,31 +926,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;
@@ -963,6 +949,8 @@ typedef struct Z_Entry
     } u;
 } Z_Entry;
 
+#ifdef BUGGY_LISTENTRIES
+
 typedef struct Z_Entries
 {
     int num_entries;
@@ -981,6 +969,15 @@ typedef struct Z_ListEntries
     } u;
 } Z_ListEntries;
 
+#endif
+
+typedef struct Z_ListEntries {
+	int num_entries;
+	Z_Entry **entries; /* OPT */
+	int num_nonsurrogateDiagnostics;
+	Z_DiagRec **nonsurrogateDiagnostics; /* OPT */
+} Z_ListEntries;
+
 typedef struct Z_ScanRequest
 {
     Z_ReferenceId *referenceId;       /* OPTIONAL */
@@ -1044,22 +1041,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;
@@ -1388,8 +1388,8 @@ YAZ_EXPORT int z_Query(ODR o, Z_Query **p, int opt);
 #include <prt-esp.h>
 #include <prt-add.h>
 
-#include <prt-ext.h>
 #include <prt-dat.h>
 #include <prt-univ.h>
+#include <prt-ext.h>
 
 #endif