First work on request queue.

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

diff --git a/ir-tclp.h b/ir-tclp.h
index 8876c4c..e5b03b6 100644 (file)
--- a/ir-tclp.h
+++ b/ir-tclp.h
@@ -5,7 +5,27 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ir-tclp.h,v $
- * Revision 1.7  1995-06-01 07:31:28  adam
+ * Revision 1.12  1995-07-28 10:28:38  adam
+ * First work on request queue.
+ *
+ * Revision 1.11  1995/06/20  08:07:35  adam
+ * New setting: failInfo.
+ * Working on better cancel mechanism.
+ *
+ * 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
@@ -50,6 +70,7 @@
 #include <xmosi.h>
 #endif
 
+#include <yaz-version.h>
 #include <odr.h>
 #include <proto.h>
 #include <oid.h>
@@ -60,8 +81,8 @@
 typedef struct {
     char      **databaseNames;
     int         num_databaseNames;
-
     char       *queryType;
+    enum oid_value *preferredRecordSyntax;
     int         replaceIndicator;
     char       *referenceId;
 
@@ -74,8 +95,9 @@ typedef struct {
     int         ref_count;
 
     char       *cs_type;
-    char       *protocol_type;
+    int         protocol_type;
     int         connectFlag;
+    int         failInfo;
     COMSTACK    cs_link;
 
     int         preferredMessageSize;
@@ -90,6 +112,7 @@ typedef struct {
 
     char       *implementationName;
     char       *implementationId;
+    char       *implementationVersion;
     int        initResult;
     char       *targetImplementationName;
     char       *targetImplementationId;
@@ -118,10 +141,31 @@ typedef struct {
 
     struct IrTcl_SetObj_ *set_child;
     struct IrTcl_ScanObj_ *scan_child;
+    struct IrTcl_Request_ *request_queue;
 
     IrTcl_SetCObj   set_inher;
 } IrTcl_Obj;
 
+typedef struct IrTcl_Request_ {
+    char       *name_of_object;
+    struct IrTcl_Request_ *next; 
+    
+    char       *buf_out;
+    int         len_out;
+    char       *buf_in;
+    int         len_in;
+
+    char       *callback;
+    char       *failback;
+
+    int         state;
+} IrTcl_Request;
+
+typedef struct {
+    int condition;
+    char *addinfo;
+} IrTcl_Diagnostic;
+
 typedef struct IrTcl_RecordList_ {
     int no;
     int which;
@@ -129,11 +173,12 @@ typedef struct IrTcl_RecordList_ {
         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 IrTcl_RecordList_ *next;
 } IrTcl_RecordList;
@@ -150,8 +195,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;
@@ -164,16 +209,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;
@@ -191,7 +232,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 {
@@ -201,5 +243,17 @@ struct ir_named_entry {
 
 int ir_tcl_get_marc (Tcl_Interp *interp, const char *buf,
                      int argc, char **argv);
+int ir_tcl_send (Tcl_Interp *interp, IrTcl_Obj *p, Z_APDU *apdu,
+                 const char *msg);
 char *ir_tcl_fread_marc (FILE *inf, size_t *size);
+
+#define IR_TCL_FAIL_CONNECT      1
+#define IR_TCL_FAIL_READ         2
+#define IR_TCL_FAIL_WRITE        3
+#define IR_TCL_FAIL_IN_APDU      4
+#define IR_TCL_FAIL_UNKNOWN_APDU 5
+
+#define IR_TCL_R_Queue           0
+#define IR_TCL_R_Writing         1
+#define IR_TCL_R_Waiting         2
 #endif