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

diff --git a/ir-tclp.h b/ir-tclp.h
index 8ad98d2..ebf7cb2 100644
--- a/ir-tclp.h
+++ b/ir-tclp.h
@@ -5,7 +5,29 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ir-tclp.h,v $
- * Revision 1.8  1995-06-14 13:37:18  adam
+ * Revision 1.14  1995-08-04 11:32:40  adam
+ * More work on output queue. Memory related routines moved
+ * to mem.c
+ *
+ * Revision 1.13  1995/08/03  13:23:00  adam
+ * Request queue.
+ *
+ * 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.
@@ -55,6 +77,7 @@
 #include <xmosi.h>
 #endif
 
+#include <yaz-version.h>
 #include <odr.h>
 #include <proto.h>
 #include <oid.h>
@@ -65,8 +88,8 @@
 typedef struct {
     char      **databaseNames;
     int         num_databaseNames;
-
     char       *queryType;
+    enum oid_value *preferredRecordSyntax;
     int         replaceIndicator;
     char       *referenceId;
 
@@ -79,9 +102,11 @@ typedef struct {
     int         ref_count;
 
     char       *cs_type;
-    char       *protocol_type;
-    int         connectFlag;
+    int         protocol_type;
+    int         failInfo;
     COMSTACK    cs_link;
+    
+    int         state;
 
     int         preferredMessageSize;
     int         maximumRecordSize;
@@ -104,12 +129,8 @@ typedef struct {
 
     char       *hostname;
    
-    char       *buf_out;
-    int         len_out;
     char       *buf_in;
     int         len_in;
-    char       *sbuf;
-    int         slen;
     ODR         odr_in;
     ODR         odr_out;
     ODR         odr_pr;
@@ -121,13 +142,27 @@ typedef struct {
 #if CCL2RPN
     CCL_bibset  bibset;
 #endif
-
-    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_ {
+    struct IrTcl_Request_ *next; 
+
+    char       *object_name;
+    
+    char       *buf_out;
+    int         len_out;
+
+    char       *callback;
+} IrTcl_Request;
+
+typedef struct {
+    int condition;
+    char *addinfo;
+} IrTcl_Diagnostic;
+
 typedef struct IrTcl_RecordList_ {
     int no;
     int which;
@@ -138,9 +173,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 +192,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 +206,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 +229,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 {
@@ -208,5 +240,25 @@ struct ir_named_entry {
 
 int ir_tcl_get_marc (Tcl_Interp *interp, const char *buf,
                      int argc, char **argv);
+int ir_tcl_send_APDU (Tcl_Interp *interp, IrTcl_Obj *p, Z_APDU *apdu,
+                      const char *msg, const char *object_name);
+int ir_tcl_send_q (IrTcl_Obj *p, IrTcl_Request *rq, const char *msg);
+void ir_tcl_del_q (IrTcl_Obj *p);
+void *ir_tcl_malloc (size_t size);
+int ir_tcl_strdup (Tcl_Interp *interp, char** p, const char *s);
+int ir_tcl_strdel (Tcl_Interp *interp, char **p);
+
 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_Idle            0
+#define IR_TCL_R_Writing         1
+#define IR_TCL_R_Waiting         2
+#define IR_TCL_R_Reading         3
+#define IR_TCL_R_Connecting      4
 #endif