Bump version to 1.4.3

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

diff --git a/ir-tclp.h b/ir-tclp.h
index caa038d..0c371d9 100644 (file)
--- a/ir-tclp.h
+++ b/ir-tclp.h
@@ -1,11 +1,21 @@
 /*
  * IR toolkit for tcl/tk
- * (c) Index Data 1995-1998
+ * (c) Index Data 1995-2002
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ir-tclp.h,v $
- * Revision 1.38  1999-03-22 06:51:34  adam
+ * Revision 1.41  2005-03-10 14:05:08  adam
+ * Define USE_NON_CONST to avoid bad warnings for const for Tcl 8.4
+ * or later.
+ *
+ * Revision 1.40  2002/03/20 14:48:54  adam
+ * implemented USR.1 SearchResult-1
+ *
+ * Revision 1.39  1999/11/30 14:05:58  adam
+ * Updated for new location of YAZ headers.
+ *
+ * Revision 1.38  1999/03/22 06:51:34  adam
  * Implemented sort.
  *
  * Revision 1.37  1998/04/02 14:31:08  adam
@@ -150,27 +160,29 @@
 #ifndef IR_TCLP_H
 #define IR_TCLP_H
 
+/* to avoid Tcl8.4 or newer to use const */
+#define USE_NON_CONST
 #include <tcl.h>
 
-#include <log.h>
-#include <pquery.h>
+#include <yaz/log.h>
+#include <yaz/pquery.h>
 #if CCL2RPN
-#include <yaz-ccl.h>
+#include <yaz/yaz-ccl.h>
 #endif
 
-#include <comstack.h>
-#include <tcpip.h>
+#include <yaz/comstack.h>
+#include <yaz/tcpip.h>
 
 #if MOSI
-#include <xmosi.h>
+#include <yas/xmosi.h>
 #endif
 
-#include <yaz-version.h>
-#include <odr.h>
-#include <proto.h>
-#include <oid.h>
-#include <diagbib1.h>
-#include <xmalloc.h>
+#include <yaz/yaz-version.h>
+#include <yaz/odr.h>
+#include <yaz/proto.h>
+#include <yaz/oid.h>
+#include <yaz/diagbib1.h>
+#include <yaz/xmalloc.h>
 
 #include "ir-tcl.h"
 
@@ -254,6 +266,7 @@ typedef struct {
     struct IrTcl_Request_ *request_queue;
 
     IrTcl_SetCObj   set_inher;
+
 } IrTcl_Obj;
 
 typedef struct IrTcl_Request_ {
@@ -343,6 +356,9 @@ typedef struct IrTcl_SetObj_ {
     IrTcl_Diagnostic *nonSurrogateDiagnosticList;
     IrTcl_RecordList *record_list;
     IrTcl_SetCObj set_inher;
+    int        searchResult_num;
+    char       **searchResult_terms;
+    int        *searchResult_count;
 } IrTcl_SetObj;
 
 typedef struct IrTcl_ScanEntry_ {