client.tcl: hotTargets now contain both database and target name.

[ir-tcl-moved-to-github.git] / ir-tclp.h

diff --git a/ir-tclp.h b/ir-tclp.h
index 3732962..eec7017 100644 (file)
--- a/ir-tclp.h
+++ b/ir-tclp.h
@@ -5,7 +5,23 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ir-tclp.h,v $
- * Revision 1.6  1995-05-31 08:36:40  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.
+ *
+ * Revision 1.7  1995/06/01  07:31:28  adam
+ * Rename of many typedefs -> IrTcl_...
+ *
+ * Revision 1.6  1995/05/31  08:36:40  adam
  * Bug fix in client.tcl: didn't save options on clientrc.tcl.
  * New method: referenceId. More work on scan.
  *
@@ -39,9 +55,6 @@
 #if CCL2RPN
 #include <yaz-ccl.h>
 #endif
-#if 0
-#include <iso2709.h>
-#endif
 
 #include <comstack.h>
 #include <tcpip.h>
@@ -50,6 +63,7 @@
 #include <xmosi.h>
 #endif
 
+#include <yaz-version.h>
 #include <odr.h>
 #include <proto.h>
 #include <oid.h>
@@ -60,21 +74,21 @@
 typedef struct {
     char      **databaseNames;
     int         num_databaseNames;
-
     char       *queryType;
+    enum oid_value *preferredRecordSyntax;
     int         replaceIndicator;
     char       *referenceId;
 
     int         smallSetUpperBound;
     int         largeSetLowerBound;
     int         mediumSetPresentNumber;
-} IRSetCObj;
+} IrTcl_SetCObj;
     
 typedef struct {
     int         ref_count;
 
     char       *cs_type;
-    char       *protocol_type;
+    int         protocol_type;
     int         connectFlag;
     COMSTACK    cs_link;
 
@@ -90,6 +104,7 @@ typedef struct {
 
     char       *implementationName;
     char       *implementationId;
+    char       *implementationVersion;
     int        initResult;
     char       *targetImplementationName;
     char       *targetImplementationId;
@@ -116,30 +131,36 @@ typedef struct {
     CCL_bibset  bibset;
 #endif
 
-    struct IRSetObj_ *set_child;
-    struct IRScanObj_ *scan_child;
+    struct IrTcl_SetObj_ *set_child;
+    struct IrTcl_ScanObj_ *scan_child;
+
+    IrTcl_SetCObj   set_inher;
+} IrTcl_Obj;
 
-    IRSetCObj   set_inher;
-} IRObj;
+typedef struct {
+    int condition;
+    char *addinfo;
+} IrTcl_Diagnostic;
 
-typedef struct IRRecordList_ {
+typedef struct IrTcl_RecordList_ {
     int no;
     int which;
     union {
         struct {
            char *buf;
            size_t size;
+            enum oid_value type;
         } dbrec;
         struct {
-            int  condition;
-            char *addinfo;
-        } diag;
+            int num;
+            IrTcl_Diagnostic *list;
+        } surrogateDiagnostics;
     } u;
-    struct IRRecordList_ *next;
-} IRRecordList;
+    struct IrTcl_RecordList_ *next;
+} IrTcl_RecordList;
 
-typedef struct IRSetObj_ {
-    IRObj      *parent;
+typedef struct IrTcl_SetObj_ {
+    IrTcl_Obj  *parent;
     int         searchStatus;
     int         presentStatus;
     int         resultCount;
@@ -150,13 +171,13 @@ typedef struct IRSetObj_ {
     char       *setName;
     int         recordFlag;
     int         which;
-    int         condition;
-    char       *addinfo;
-    IRRecordList *record_list;
-    IRSetCObj   set_inher;
-} IRSetObj;
+    int         nonSurrogateDiagnosticNum;
+    IrTcl_Diagnostic *nonSurrogateDiagnosticList;
+    IrTcl_RecordList *record_list;
+    IrTcl_SetCObj set_inher;
+} IrTcl_SetObj;
 
-typedef struct IRScanEntry_ {
+typedef struct IrTcl_ScanEntry_ {
     int         which;
     union {
         struct {
@@ -164,18 +185,14 @@ typedef struct IRScanEntry_ {
            int  globalOccurrences;
        } term;
        struct {
-           int  condition;
-           char *addinfo;
+            IrTcl_Diagnostic *list;
+            int num;
        } diag;
     } u;
-} IRScanEntry;
-
-typedef struct IRScanDiag_ {
-    int         dummy;
-} IRScanDiag;
+} IrTcl_ScanEntry;
 
-typedef struct IRScanObj_ {
-    IRObj      *parent;
+typedef struct IrTcl_ScanObj_ {
+    IrTcl_Obj   *parent;
     int         stepSize;
     int         numberOfTermsRequested;
     int         preferredPositionInResponse;
@@ -190,9 +207,10 @@ typedef struct IRScanObj_ {
     int         num_entries;
     int         num_diagRecs;
 
-    IRScanEntry *entries;
-    IRScanDiag  *nonSurrogateDiagnostics;
-} IRScanObj;
+    IrTcl_ScanEntry *entries;
+    IrTcl_Diagnostic  *nonSurrogateDiagnosticList;
+    int         nonSurrogateDiagnosticNum;
+} IrTcl_ScanObj;
 
 struct ir_named_entry {
     char *name;