X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;ds=sidebyside;f=ir-tclp.h;h=31fe2c071a612edd5eee12edfe5acf744f196975;hb=ed6b88adb8132f4668c60113532d5c2da34523e7;hp=1cfdcfeef85a7456ff4d317f3e2c5903777935bf;hpb=df5d5526e333bd83a4f656840e7bb57df4bd7f9d;p=ir-tcl-moved-to-github.git

diff --git a/ir-tclp.h b/ir-tclp.h
index 1cfdcfe..31fe2c0 100644
--- a/ir-tclp.h
+++ b/ir-tclp.h
@@ -1,10 +1,24 @@
 /*
  * IR toolkit for tcl/tk
  * (c) Index Data 1995
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ir-tclp.h,v $
- * Revision 1.1  1995-05-23 15:34:49  adam
+ * Revision 1.5  1995-05-29 08:44:25  adam
+ * Work on delete of objects.
+ *
+ * Revision 1.4  1995/05/26  11:44:10  adam
+ * Bugs fixed. More work on MARC utilities and queries. Test
+ * client is up-to-date again.
+ *
+ * Revision 1.3  1995/05/26  08:54:17  adam
+ * New MARC utilities. Uses prefix query.
+ *
+ * Revision 1.2  1995/05/24  14:10:23  adam
+ * Work on idAuthentication, protocolVersion and options.
+ *
+ * Revision 1.1  1995/05/23  15:34:49  adam
  * Many new settings, userInformationField, smallSetUpperBound, etc.
  * A number of settings are inherited when ir-set is executed.
  * This version is incompatible with the graphical test client (client.tcl).
@@ -16,8 +30,15 @@
 
 #include <tcl.h>
 
+#include <log.h>
+#include <pquery.h>
+#if CCL2RPN
 #include <yaz-ccl.h>
+#endif
+#if 0
 #include <iso2709.h>
+#endif
+
 #include <comstack.h>
 #include <tcpip.h>
 
@@ -45,6 +66,8 @@ typedef struct {
 } IRSetCObj;
     
 typedef struct {
+    int         ref_count;
+
     char       *cs_type;
     char       *protocol_type;
     int         connectFlag;
@@ -54,7 +77,12 @@ typedef struct {
     int         maximumRecordSize;
     Odr_bitmask options;
     Odr_bitmask protocolVersion;
-    char       *idAuthentication;
+
+    char       *idAuthenticationOpen;
+    char       *idAuthenticationGroupId;
+    char       *idAuthenticationUserId;
+    char       *idAuthenticationPassword;
+
     char       *implementationName;
     char       *implementationId;
     int        initResult;
@@ -79,8 +107,9 @@ typedef struct {
     char       *callback;
     char       *failback;
 
+#if CCL2RPN
     CCL_bibset  bibset;
-    oident      bib1;
+#endif
 
     struct IRSetObj_ *set_child;
     struct IRScanObj_ *scan_child;
@@ -93,8 +122,9 @@ typedef struct IRRecordList_ {
     int which;
     union {
         struct {
-            Iso2709Rec rec;
-        } marc;
+	    char *buf;
+	    size_t size;
+        } dbrec;
         struct {
             int  condition;
             char *addinfo;
@@ -106,7 +136,9 @@ typedef struct IRRecordList_ {
 typedef struct IRSetObj_ {
     IRObj      *parent;
     int         searchStatus;
+    int         presentStatus;
     int         resultCount;
+    int         nextResultSetPosition;
     int         start;
     int         number;
     int         numberOfRecordsReturned;
@@ -157,4 +189,12 @@ typedef struct IRScanObj_ {
     IRScanDiag  *nonSurrogateDiagnostics;
 } IRScanObj;
 
+struct ir_named_entry {
+    char *name;
+    int  pos;
+};
+
+int ir_tcl_get_marc (Tcl_Interp *interp, const char *buf,
+                     int argc, char **argv);
+char *ir_tcl_fread_marc (FILE *inf, size_t *size);
 #endif