X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=ir-tclp.h;h=eec70178be195db941bdd3a498029e4d462882da;hb=9c188c91c6a0a300762cedb5bdb384023e1c48b8;hp=8ad98d22b161b082cc8db32c24111b52c723428a;hpb=d156d1648f315bff34ee465d4de4dea5daa0ca4d;p=ir-tcl-moved-to-github.git

diff --git a/ir-tclp.h b/ir-tclp.h
index 8ad98d2..eec7017 100644
--- a/ir-tclp.h
+++ b/ir-tclp.h
@@ -5,7 +5,15 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ir-tclp.h,v $
- * Revision 1.8  1995-06-14 13:37:18  adam
+ * Revision 1.10  1995-06-16 12:28:20  adam
+ * Implemented preferredRecordSyntax.
+ * Minor changes in diagnostic handling.
+ * Record list deleted when connection closes.
+ *
+ * Revision 1.9  1995/06/14  15:08:01  adam
+ * Bug fix in cascade-target-list. Uses yaz-version.h.
+ *
+ * Revision 1.8  1995/06/14  13:37:18  adam
  * Setting recordType implemented.
  * Setting implementationVersion implemented.
  * Settings implementationId / implementationName edited.
@@ -55,6 +63,7 @@
 #include <xmosi.h>
 #endif
 
+#include <yaz-version.h>
 #include <odr.h>
 #include <proto.h>
 #include <oid.h>
@@ -65,8 +74,8 @@
 typedef struct {
     char      **databaseNames;
     int         num_databaseNames;
-
     char       *queryType;
+    enum oid_value *preferredRecordSyntax;
     int         replaceIndicator;
     char       *referenceId;
 
@@ -79,7 +88,7 @@ typedef struct {
     int         ref_count;
 
     char       *cs_type;
-    char       *protocol_type;
+    int         protocol_type;
     int         connectFlag;
     COMSTACK    cs_link;
 
@@ -128,6 +137,11 @@ typedef struct {
     IrTcl_SetCObj   set_inher;
 } IrTcl_Obj;
 
+typedef struct {
+    int condition;
+    char *addinfo;
+} IrTcl_Diagnostic;
+
 typedef struct IrTcl_RecordList_ {
     int no;
     int which;
@@ -138,9 +152,9 @@ typedef struct IrTcl_RecordList_ {
             enum oid_value type;
         } dbrec;
         struct {
-            int  condition;
-            char *addinfo;
-        } diag;
+            int num;
+            IrTcl_Diagnostic *list;
+        } surrogateDiagnostics;
     } u;
     struct IrTcl_RecordList_ *next;
 } IrTcl_RecordList;
@@ -157,8 +171,8 @@ typedef struct IrTcl_SetObj_ {
     char       *setName;
     int         recordFlag;
     int         which;
-    int         condition;
-    char       *addinfo;
+    int         nonSurrogateDiagnosticNum;
+    IrTcl_Diagnostic *nonSurrogateDiagnosticList;
     IrTcl_RecordList *record_list;
     IrTcl_SetCObj set_inher;
 } IrTcl_SetObj;
@@ -171,16 +185,12 @@ typedef struct IrTcl_ScanEntry_ {
 	    int  globalOccurrences;
 	} term;
 	struct {
-	    int  condition;
-	    char *addinfo;
+            IrTcl_Diagnostic *list;
+            int num;
 	} diag;
     } u;
 } IrTcl_ScanEntry;
 
-typedef struct IrTcl_ScanDiag_ {
-    int         dummy;
-} IrTcl_ScanDiag;
-
 typedef struct IrTcl_ScanObj_ {
     IrTcl_Obj   *parent;
     int         stepSize;
@@ -198,7 +208,8 @@ typedef struct IrTcl_ScanObj_ {
     int         num_diagRecs;
 
     IrTcl_ScanEntry *entries;
-    IrTcl_ScanDiag  *nonSurrogateDiagnostics;
+    IrTcl_Diagnostic  *nonSurrogateDiagnosticList;
+    int         nonSurrogateDiagnosticNum;
 } IrTcl_ScanObj;
 
 struct ir_named_entry {