X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fproto.h;h=ec99207df31109e9ef1b6168085437b9df3875fc;hb=c7faf05cbdcd2718c695c36b2d4b3793a61c70a7;hp=3d05a577037e11127ebbcafdcc60b55a52c301dc;hpb=1db60f5a7396b9b37560f6b6962be0b68240486c;p=yaz-moved-to-github.git

diff --git a/include/proto.h b/include/proto.h
index 3d05a57..ec99207 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -24,7 +24,16 @@
  * OF THIS SOFTWARE.
  *
  * $Log: proto.h,v $
- * Revision 1.16  1995-06-15 07:45:06  quinn
+ * Revision 1.19  1995-06-19 12:38:28  quinn
+ * Reorganized include-files. Added small features.
+ *
+ * Revision 1.18  1995/06/16  13:16:05  quinn
+ * Fixed Defaultdiagformat.
+ *
+ * Revision 1.17  1995/06/15  15:42:05  quinn
+ * Fixed some v3 bugs
+ *
+ * Revision 1.16  1995/06/15  07:45:06  quinn
  * Moving to v3.
  *
  * Revision 1.15  1995/06/14  15:26:43  quinn
@@ -190,6 +199,8 @@ typedef struct Z_IntUnit
     Z_Unit *unitUsed;
 } Z_IntUnit;
 
+typedef Odr_oct Z_SUTRS;
+
 /* ----------------- INIT SERVICE  ----------------*/
 
 typedef struct
@@ -521,6 +532,13 @@ typedef struct Z_DefaultDiagFormat
 {
     Odr_oid *diagnosticSetId; /* This is opt'l to interwork with bad targets */
     int *condition;
+    /* until the whole character set issue becomes more definite,
+     * you can probably ignore this on input. */
+    enum  
+    {
+    	Z_DiagForm_v2AddInfo,
+	Z_DiagForm_v3AddInfo
+    } which;
     char *addinfo;
 } Z_DefaultDiagFormat;
 
@@ -549,11 +567,11 @@ typedef struct Z_DiagRec
 
 #endif
 
-typedef struct Z_DiagRecList
+typedef struct Z_DiagRecs
 {
-    int num;
-    Z_DiagRec **list;
-} Z_DiagRecList;
+    int num_diagRecs;
+    Z_DiagRec **diagRecs;
+} Z_DiagRecs;
 
 typedef struct Z_NamePlusRecord
 {
@@ -561,15 +579,13 @@ typedef struct Z_NamePlusRecord
     enum
     {
 	Z_NamePlusRecord_databaseRecord,
-	Z_NamePlusRecord_surrogateDiagnostic,
-	Z_NamePlusRecord_multipleNonSurDiagnostics
+	Z_NamePlusRecord_surrogateDiagnostic
     }
     which;
     union
     {
     	Z_DatabaseRecord *databaseRecord;
     	Z_DiagRec *surrogateDiagnostic;
-	Z_DiagRecList *multipleNonSurDiagnostics;
     } u;
 } Z_NamePlusRecord;
 
@@ -591,7 +607,7 @@ typedef struct Z_Records
     {
     	Z_NamePlusRecordList *databaseOrSurDiagnostics;
     	Z_DiagRec *nonSurrogateDiagnostic;
-	Z_DiagRecList *multipleNonSurDiagnostics;
+	Z_DiagRecs *multipleNonSurDiagnostics;
     } u;
 } Z_Records;
 
@@ -858,12 +874,6 @@ typedef struct Z_Entries
     Z_Entry **entries;
 } Z_Entries;
 
-typedef struct Z_DiagRecs
-{
-    int num_diagRecs;
-    Z_DiagRec **diagRecs;
-} Z_DiagRecs;
-
 typedef struct Z_ListEntries
 {
     enum
@@ -1042,6 +1052,7 @@ typedef struct Z_APDU
 } Z_APDU;
 
 int z_APDU(ODR o, Z_APDU **p, int opt);
+int z_SUTRS(ODR o, Odr_oct **p, int opt);
 
 Z_InitRequest *zget_InitRequest(ODR o);
 Z_InitResponse *zget_InitResponse(ODR o);