Configure no longer searches for Tk. Removed references to SR.

diff --git a/LICENSE b/LICENSE
index aeae2ef..5e59e8a 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 1995-1999, Index Data.
+ * Copyright (c) 1995-2001, Index Data.

  *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation, in whole or in part, for any purpose, is hereby granted,
  *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation, in whole or in part, for any purpose, is hereby granted,

diff --git a/Makefile.in b/Makefile.in
index 75e0fc1..5b57763 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
 # IR toolkit for tcl/tk
 # (c) Index Data 1995-1999
 # See the file LICENSE for details.
 # IR toolkit for tcl/tk
 # (c) Index Data 1995-1999
 # See the file LICENSE for details.

-# $Id: Makefile.in,v 1.55 2001-12-03 00:31:06 adam Exp $
+# $Id: Makefile.in,v 1.56 2001-12-03 18:52:06 adam Exp $

 SHELL=/bin/sh
 
 # IrTcl Version
 SHELL=/bin/sh
 
 # IrTcl Version

@@ -39,12 +39,10 @@ SHLIB_LD = @SHLIB_LD@
 SHLIB_SUFFIX = @SHLIB_SUFFIX@
 SHLIB_VERSION = @SHLIB_VERSION@
 
 SHLIB_SUFFIX = @SHLIB_SUFFIX@
 SHLIB_VERSION = @SHLIB_VERSION@
 

-# Where are Yaz libraries located?
+# Where are YAZ libraries located?

 YAZLIB=@YAZLIB@
 YAZLIB=@YAZLIB@

-# Where are Yaz header files located?
+# Where are YAZ header files located?

 YAZINC=@YAZINC@
 YAZINC=@YAZINC@

-# If Yaz is compiled with mosi support uncomment and specify.
-#OSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a

 
 # All include paths
 INCLUDE=-I. $(YAZINC) $(TKINC) $(TCLINC) 
 
 # All include paths
 INCLUDE=-I. $(YAZINC) $(TKINC) $(TCLINC) 

@@ -63,9 +61,6 @@ O=ir-tcl.o marc.o queue.o mem.o grs.o explain.o select.o
 
 all: @ALL_SPEC@
 
 
 all: @ALL_SPEC@
 

-ir-tk: libirtcl.a tkmain.o
-       $(CC) $(CFLAGS) tkmain.o -o ir-tk libirtcl.a $(YAZLIB) $(TKLIB) 
-

 ir-tcl: libirtcl.a tclmain.o
        $(CC) $(CFLAGS) tclmain.o -o ir-tcl libirtcl.a $(YAZLIB) $(TCLLIB) 
 
 ir-tcl: libirtcl.a tclmain.o
        $(CC) $(CFLAGS) tclmain.o -o ir-tcl libirtcl.a $(YAZLIB) $(TCLLIB) 
 

diff --git a/README b/README
index ab8b4cc..c3cd592 100644 (file)
--- a/README
+++ b/README
@@ -1,11 +1,10 @@
- 
- * Copyright (C) 1995-1999, Index Data.
- * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss

 
 

-IrTcl version 1.3  http://www.indexdata.dk/irtcl/
+IrTcl http://www.indexdata.dk/irtcl/
+ 
+Copyright (C) 1995-2001, Index Data.
+See the file LICENSE for details.

 
 

----- $Date: 1999-02-11 12:49:48 $
+---- $Date: 2001-12-03 18:52:06 $

 
 Documentation can be found in the sub directory 'doc'.
 
 
 Documentation can be found in the sub directory 'doc'.
 

diff --git a/client.tcl b/client.tcl
index 87a83b4..2403c2e 100644 (file)
--- a/client.tcl
+++ b/client.tcl
@@ -1,10 +1,13 @@
 # IR toolkit for tcl/tk
 # IR toolkit for tcl/tk

-# (c) Index Data 1995-1998
+# (c) Index Data 1995-2001

 # See the file LICENSE for details.
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: client.tcl,v $
 # See the file LICENSE for details.
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: client.tcl,v $

-# Revision 1.110  2000-10-11 12:26:47  adam
+# Revision 1.111  2001-12-03 18:52:06  adam
+# Configure no longer searches for Tk. Removed references to SR.
+#
+# Revision 1.110  2000/10/11 12:26:47  adam

 # Using yaz.m4 for aclocal.m4.
 #
 # Revision 1.109  1999/12/12 00:25:59  adam
 # Using yaz.m4 for aclocal.m4.
 #
 # Revision 1.109  1999/12/12 00:25:59  adam

diff --git a/configure.in b/configure.in
index 4d5999c..ace3902 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl IR toolkit for tcl/tk
 dnl (c) Index Data 1996-2001
 dnl See the file LICENSE for details.
 dnl IR toolkit for tcl/tk
 dnl (c) Index Data 1996-2001
 dnl See the file LICENSE for details.

-dnl $Id: configure.in,v 1.31 2001-12-03 00:31:06 adam Exp $
+dnl $Id: configure.in,v 1.32 2001-12-03 18:52:06 adam Exp $

 AC_INIT(ir-tcl.h)
 dnl ------ Substitutions
 AC_SUBST(CC)
 AC_INIT(ir-tcl.h)
 dnl ------ Substitutions
 AC_SUBST(CC)

@@ -16,6 +16,7 @@ AC_SUBST(SHLIB_VERSION)
 AC_SUBST(SHLIB_IRTCL)
 AC_SUBST(ALL_SPEC)
 AC_SUBST(IRCLIENT_SHELL)
 AC_SUBST(SHLIB_IRTCL)
 AC_SUBST(ALL_SPEC)
 AC_SUBST(IRCLIENT_SHELL)

+AC_SUBST(RANLIB)

 dnl
 dnl ------ Build root
 AC_SUBST(build_root)
 dnl
 dnl ------ Build root
 AC_SUBST(build_root)

@@ -29,8 +30,7 @@ YAZ_INIT
 dnl
 dnl ------ look for Tcl
 tclconfig=NONE
 dnl
 dnl ------ look for Tcl
 tclconfig=NONE

-tryprefix=NONE
-AC_ARG_WITH(tclconfig, [  --with-tclconfig=DIR    tclConfig.sh/tkConfig.sh in DIR (example /usr/lib)], [tclconfig=$withval])
+AC_ARG_WITH(tclconfig, [  --with-tclconfig=DIR    tclConfig.sh in DIR (example /usr/lib)], [tclconfig=$withval])

 if test "x$tclconfig" = xNONE; then
         saveprefix=${prefix}
        AC_PREFIX_PROGRAM(tclsh)
 if test "x$tclconfig" = xNONE; then
         saveprefix=${prefix}
        AC_PREFIX_PROGRAM(tclsh)

@@ -50,18 +50,17 @@ if test "x$tclconfig" = xNONE; then
                AC_PREFIX_PROGRAM(tclsh7.6)
        fi
        if test "x$prefix" = xNONE; then
                AC_PREFIX_PROGRAM(tclsh7.6)
        fi
        if test "x$prefix" = xNONE; then

-               AC_PREFIX_PROGRAM(tclsh7.5)
-       fi
-       if test "x$prefix" = xNONE; then

                prefix=/usr/local
        fi
         tclconfig=${prefix}/lib
                prefix=/usr/local
        fi
         tclconfig=${prefix}/lib

-       tryprefix=${prefix}

         prefix=${saveprefix}
 fi
         prefix=${saveprefix}
 fi

-if test -r ${tclconfig}/tclConfig.sh; then
-       AC_MSG_CHECKING(for Tcl)
-       . ${tclconfig}/tclConfig.sh
+AC_MSG_CHECKING(for Tcl)
+if test -f ${tclconfig}/tclConfig.sh; then
+       tclconfig=${tclconfig}/tclConfig.sh
+fi
+if test -f ${tclconfig}; then
+       . ${tclconfig}

        TCLLIB="${TCL_LIB_SPEC} ${TCL_LIBS}"
        if test -d ${TCL_PREFIX}/include/tcl${TCL_VERSION}; then
                TCLINC=-I${TCL_PREFIX}/include/tcl${TCL_VERSION}
        TCLLIB="${TCL_LIB_SPEC} ${TCL_LIBS}"
        if test -d ${TCL_PREFIX}/include/tcl${TCL_VERSION}; then
                TCLINC=-I${TCL_PREFIX}/include/tcl${TCL_VERSION}

@@ -80,126 +79,11 @@ if test -r ${tclconfig}/tclConfig.sh; then
        AC_MSG_RESULT($TCL_VERSION)
        CC=$TCL_CC
 else
        AC_MSG_RESULT($TCL_VERSION)
        CC=$TCL_CC
 else

-       AC_PROG_CC
-        SHLIB_CFLAGS=""
-       SHLIB_LD="shared-linker"
-       SHLIB_SUFFIX=""
-       SHLIB_VERSION=""
-       SHLIB_IRTCL="irtcl-shared"
-       AC_PROG_RANLIB
-       AC_MSG_CHECKING(for Tcl)
-       TCL_VERSION=nope
-       for i in "" 7.4 7.5 7.6 8.0; do
-               if test -r ${tryprefix}/lib/libtcl${i}.a; then
-                       TCL_VERSION=$i
-               fi
-       done
-       if test "$TCL_VERSION" = nope; then
-               AC_MSG_WARN(Didn't find Tcl)
-               TCL_LIB_SPEC=-ltcl
-               TCLINC=" # -I.. Tcl/Tk include path"
-       else
-               if test "$TCL_VERSION" = ""; then
-                       AC_MSG_RESULT(7.3)
-               else
-                       AC_MSG_RESULT($TCL_VERSION)
-               fi
-               TCL_LIB_SPEC=${tryprefix}/lib/libtcl${TCL_VERSION}.a
-               TCLINC=-I${tryprefix}/include
-       fi
-       TCLLIB="${TCL_LIB_SPEC} ${LIBS} -lm"
-       ALL_SPEC="ir-tcl ir-tk"
+       AC_MSG_RESULT(not found)
+       SHLIB_IRTCL=irtcl-shared
+       ALL_SPEC="ir-tcl"
+       CC=gcc
+       RANLIB=ranlib

 fi
 dnl 
 fi
 dnl 

-
-
-dnl ------ look for Tk
-dnl
-if test -r ${tclconfig}/tkConfig.sh; then
-       AC_MSG_CHECKING(for Tk)
-       . ${tclconfig}/tkConfig.sh
-       AC_MSG_RESULT($TK_VERSION)
-       TKINC=${TK_XINCLUDES}
-       TKLIB="${TK_LIB_SPEC} ${TCL_LIB_SPEC} ${TK_LIBS}"
-       IRCLIENT_SHELL=wish${TK_VERSION}
-else
-       AC_MSG_CHECKING(for Tk)
-       TK_VERSION=nope
-       for i in "" 4.0 4.1 4.2 8.0; do
-               if test -r ${tryprefix}/lib/libtk${i}.a; then
-                       TK_VERSION=$i
-               fi
-       done
-       if test "$TK_VERSION" = nope; then
-               AC_MSG_WARN(Didn't find Tk)
-               TKLIB=-ltk
-       else
-               TKLIB=${tryprefix}/lib/libtk${TK_VERSION}.a
-               if test "$TK_VERSION" = ""; then
-                       AC_MSG_RESULT(3.x)
-               else
-                       AC_MSG_RESULT($TK_VERSION)
-               fi
-               AC_PATH_X
-               not_really_there=""
-               if test "$no_x" = ""; then
-                       if test "$x_includes" = ""; then
-                               AC_TRY_CPP([#include <X11/XIntrinsic.h>], , not_really_there="yes")
-                       else
-                               if test ! -r $x_includes/X11/Intrinsic.h; then
-                                       not_really_there="yes"
-                               fi
-                       fi
-               fi
-               if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then
-                       echo checking for X11 header files
-                       XINCLUDES="# no special path needed"
-                       AC_TRY_CPP([#include <X11/Intrinsic.h>], , XINCLUDES="nope")
-                       if test "$XINCLUDES" = nope; then dirs="/usr/unsupported/include /usr/local/include /usr/X386/include /usr/include/X11R4 /usr/X11R5/include /usr/include/X11R5 /usr/openwin/include /usr/X11/include /usr/sww/include"
-                               for i in $dirs ; do
-                                       if test -r $i/X11/Intrinsic.h; then
-                                               XINCLUDES=" -I$i"
-                                       fi
-                               done
-                       fi
-               else
-                       if test "$x_includes" != ""; then
-                               XINCLUDES=-I$x_includes
-                       else
-                               XINCLUDES="# no special path needed"
-                       fi
-               fi
-               if test "$XINCLUDES" = nope; then
-                       echo "Warning:  couldn't find any X11 include files."
-                       XINCLUDES="# no include files found"
-               fi
-               if test "$no_x" = yes; then
-                       XLIBSW=nope
-                       if test "$XLIBSW" = nope; then
-                               dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/lib/X11R4 /usr/X11R5/lib /usr/lib/X11R5 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
-                       for i in $dirs ; do
-                               if test -r $i/libX11.a; then
-                                       XLIBSW="-L$i -lX11"
-                               fi
-                       done
-               fi
-               else
-                       if test "$x_libraries" = ""; then
-                               XLIBSW=-lX11
-                       else
-                               XLIBSW="-L$x_libraries -lX11"
-                       fi
-               fi
-               if test "$XLIBSW" = nope ; then
-                       AC_CHECK_LIB(Xwindow, XCreateWindow, XLIBSW=-lXwindow)
-               fi
-               if test "$XLIBSW" = nope ; then
-                       echo "Warning:  couldn't find the X11 library archive.  Using -lX11."
-                       XLIBSW=-lX11
-               fi
-       fi
-       TKINC=$XINCLUDES
-       TKLIB="${TKLIB} ${XLIBSW} ${TCLLIB}"
-       IRCLIENT_SHELL=ir-tk
-fi

 AC_OUTPUT(Makefile)
 AC_OUTPUT(Makefile)

diff --git a/doc/ir-tcl.sgml b/doc/ir-tcl.sgml
index 4cdde11..4f48254 100644 (file)
--- a/doc/ir-tcl.sgml
+++ b/doc/ir-tcl.sgml
@@ -1,17 +1,17 @@
 <!doctype linuxdoc system>
 
 <!--
 <!doctype linuxdoc system>
 
 <!--

-  $Id: ir-tcl.sgml,v 1.31 1999-12-10 10:36:13 adam Exp $
+  $Id: ir-tcl.sgml,v 1.32 2001-12-03 18:52:06 adam Exp $

 -->
 
 <article>
 <title>IrTcl User's Guide and Reference 
 <author><htmlurl url="http://www.indexdata.dk/" name="Index Data">,
 <tt><htmlurl url="mailto:info@indexdata.dk" name="info@indexdata.dk"></tt>
 -->
 
 <article>
 <title>IrTcl User's Guide and Reference 
 <author><htmlurl url="http://www.indexdata.dk/" name="Index Data">,
 <tt><htmlurl url="mailto:info@indexdata.dk" name="info@indexdata.dk"></tt>

-<date>$Revision: 1.31 $
+<date>$Date: 2001-12-03 18:52:06 $

 <abstract>
 <abstract>

-This document describes IrTcl -- an information retrieval toolkit for
-Tcl and Tk that provides access to the Z39.50/SR protocol.
+IrTcl version 1.4 -- a Tcl extension that allows you to build
+Z39.50 clients.

 </abstract>
 
 <toc>
 </abstract>
 
 <toc>

@@ -20,26 +20,19 @@ Tcl and Tk that provides access to the Z39.50/SR protocol.
 
 <p>
 This document describes the <sf/IrTcl/ information retrieval toolkit,
 
 <p>
 This document describes the <sf/IrTcl/ information retrieval toolkit,

-which offers a high-level, client interface to the Z39.50 and SR protocols.
-The toolkit is based on the Tcl/Tk toolkit developed by Prof. John
+which offers a high-level interface for the development of Z39.50
+clients. The toolkit is based on the Tcl/Tk toolkit developed by Prof. John

 K. Ousterhout at the University of California &lsqb;ref 1&rsqb;. 
 K. Ousterhout at the University of California &lsqb;ref 1&rsqb;. 

-Tcl is a simple, somewhat shell-like, interpreted language. What
-makes Tcl attractive is that it also offers a C API, which makes
-extensions to the language possible. The most important Tcl extension is
-probably Tk -- A Motif look-and-feel interface to the X window
-system.
-
-To interface the Z39.50/SR protocol <sf/IrTcl/ uses <bf/YAZ/.
-<bf/YAZ/ offers two transport types: RFC1729/BER on TCP/IP and the mOSI
-protocol stack.
-However, the mOSI transport is only an option, and hence it is not
-needed unless you wish to communicate within an OSI environment.
-See &lsqb;ref 2&rsqb; for more information about the XTI/mOSI implementation.
+The core of Tcl is rather small but it offers a flexible C API
+for easy development of Tcl extensions. The most important Tcl
+extension is probably Tk -- A portale GUI for X/WIN32/MAC.
+
+To interface the Z39.50 protocol <sf/IrTcl/ uses the <bf/YAZ/ toolkit.

 
 <sf/IrTcl/ is usually build as a <it/dynamic/ library (WIN32)
 
 <sf/IrTcl/ is usually build as a <it/dynamic/ library (WIN32)

-or shared Object (Unix) which is dynamically loaded by using the Tcl's
-<tt/load/ command. However, <sf/IrTcl/ can be compiled as a
-traditional <it/static/ library as well.
+or a shared object (Unix) which is dynamically loaded by using the Tcl's
+<tt/load/ command. However, <sf/IrTcl/ can also be compiled as a
+traditional <it/static/ library.

 
 <sect>Compilation and installation
 
 
 <sect>Compilation and installation
 

@@ -50,16 +43,9 @@ In order to compile the software on UNIX you need:
 <itemize>
 <item> An ANSI C compiler such as GNU C.
 <item> <htmlurl url="http://www.scriptics.com" name="Tcl">.
 <itemize>
 <item> An ANSI C compiler such as GNU C.
 <item> <htmlurl url="http://www.scriptics.com" name="Tcl">.

- Version 8.0 and 8.2 has been tested.
+ Version 8.0 and 8.3 has been tested.

 <item> <htmlurl url="http://www.indexdata.dk/yaz/" name="YAZ">
 <item> <htmlurl url="http://www.indexdata.dk/yaz/" name="YAZ">

- version 1.5 or higher.
-</itemize>
-
-As an option you may want:
-<itemize>
-<item> <htmlurl url="http://www.scriptics.com" name="Tk">.
-Version 8.0 and 8.2 has been tested.
-<item> XTI/mOSI
+ version 1.6 or higher.

 </itemize>
 
 Unpack the <sf/IrTcl/ package at the same directory level as <bf/YAZ/.
 </itemize>
 
 Unpack the <sf/IrTcl/ package at the same directory level as <bf/YAZ/.

@@ -72,7 +58,7 @@ $ ./configure
 This command tries to configure <sf/IrTcl/ for your system and creates
 a <tt>Makefile</tt>.
 
 This command tries to configure <sf/IrTcl/ for your system and creates
 a <tt>Makefile</tt>.
 

-The <tt>configure</tt> command tries to locate the file <tt/tclConfig.sh/
+The <tt>configure</tt> script tries to locate the file <tt/tclConfig.sh/

 which should be generated by Tcl's installation script. Configure
 looks for ther Tcl shell on your system in order to locate this file.
 For example if <tt/tclsh/ is located in <tt>/home/joe/bin</tt>, configure will
 which should be generated by Tcl's installation script. Configure
 looks for ther Tcl shell on your system in order to locate this file.
 For example if <tt/tclsh/ is located in <tt>/home/joe/bin</tt>, configure will

@@ -99,8 +85,8 @@ normal static library, <tt/libirtcl.a/.
 
 For Tcl versions that doesn't support dynamic libraries the
 make command will create two shells will build-in <sf/IrTcl/ support --
 
 For Tcl versions that doesn't support dynamic libraries the
 make command will create two shells will build-in <sf/IrTcl/ support --

-a Tcl shell called <tt/ir-tcl/ and a Tcl/Tk shell called <tt/ir-tk/.
-The traditional static library, <tt/libirtcl.a/, is build as well.
+a Tcl shell called <tt/ir-tcl/. The traditional static
+library, <tt/libirtcl.a/, is build as well.

 
 To install the programs and support files type:
 <tscreen><verb>
 
 To install the programs and support files type:
 <tscreen><verb>

@@ -119,19 +105,11 @@ Summary of files installed (the names refer to the Makefile variables):
 The actual name of this library vary. Installed in <tt>IRTCLDIR</tt>.
 This file is only generated when using newer versions of Tcl/Tk.
 
 The actual name of this library vary. Installed in <tt>IRTCLDIR</tt>.
 This file is only generated when using newer versions of Tcl/Tk.
 

-<tag><tt>ir-tk</tt></tag> The <sf/IrTcl/ shell for Tk. This shell
- is not needed when using a Tk version that supports shared libraries.
- Installed in <tt>BINDIR</tt> -- defaults to
- <tt>/usr/local/bin</tt>. <tt>ir-tk</tt> works like
- <tt>wish</tt> &mdash without arguments it reads commands from stdin.
- A source file may be specified by option <tt>-f</tt>. <tt>ir-tk</tt>
- accept the same set of options as <tt>wish</tt>.
-

 <tag><tt>ir-tcl</tt></tag> The <sf/IrTcl/ shell for Tcl. This program
  is not needed when using a Tcl that supports shared libraries. Installed
  in <tt>BINDIR</tt> -- defaults to <tt>/usr/local/bin</tt>.
 
 <tag><tt>ir-tcl</tt></tag> The <sf/IrTcl/ shell for Tcl. This program
  is not needed when using a Tcl that supports shared libraries. Installed
  in <tt>BINDIR</tt> -- defaults to <tt>/usr/local/bin</tt>.
 

-<tag><tt>client.tcl</tt></tag> A graphical client for <tt>ir-tk</tt>.
+<tag><tt>client.tcl</tt></tag> A graphical client for Tk.

  The client is installed as an executable script called <tt>irclient</tt> in
  <tt>BINDIR</tt>. This client needs a number of files, bitmaps, etc.
  The client looks for the files in the current directory &mdash if
  The client is installed as an executable script called <tt>irclient</tt> in
  <tt>BINDIR</tt>. This client needs a number of files, bitmaps, etc.
  The client looks for the files in the current directory &mdash if

@@ -162,18 +140,17 @@ This file is only generated when using newer versions of Tcl/Tk.
 </descrip>
 
 <p>
 </descrip>
 
 <p>

-Basic Tcl is handled by the program <tt/tclsh/. The script
-must use the <tt/load/ command to load the <sf/IrTcl/ dynamic
-library. If dynamic libraries are unsupported the <tt/ir-tcl/ program
-should be used instead, since that program is statically linked
-with the <sf/IrTcl/ library.
+<sf/IrTcl/ can be used either from the Tcl interpreter
+<tt/tclsh/ or the statically linked program <tt/ir-tcl/.
+Using <tt/tclsh/ is the preferred method. You must load
+the <sf/IrTcl/ library by using the <tt/load/ command.

 
 

-So the static, non-dynamic, version goes like this:
+A static, non-dynamic, version goes like this:

 <tscreen><verb>
    $ ir-tcl
    % 
 </verb></tscreen>
 <tscreen><verb>
    $ ir-tcl
    % 
 </verb></tscreen>

-and the dynamic version goes like:
+and the dynamic version (preferred) goes like:

 <tscreen><verb>
    $ tclsh
    % load ./irtcl.tcl
 <tscreen><verb>
    $ tclsh
    % load ./irtcl.tcl

@@ -183,8 +160,8 @@ and the dynamic version goes like:
 <sect1>WIN32
 <p>
 
 <sect1>WIN32
 <p>
 

-<sf/IrTcl/ is shipped with a "makefile" for the NMAKE tool that comes
-with Visual C++.
+<sf/IrTcl/ is shipped with a "makefile" for the NMAKE tool part of
+with Microsoft Visual C++.

 
 Start an MS-DOS prompt and switch the sub directory <tt>WIN</tt> where
 the file <tt>makefile</tt> is located. Customize the installation
 
 Start an MS-DOS prompt and switch the sub directory <tt>WIN</tt> where
 the file <tt>makefile</tt> is located. Customize the installation

@@ -220,11 +197,9 @@ short-cut to start this.
 If your Tcl/Tk supports dynamic libraries you can use the
 <tt/load/ command from within <tt/wish/ as described in the previous
 section.
 If your Tcl/Tk supports dynamic libraries you can use the
 <tt/load/ command from within <tt/wish/ as described in the previous
 section.

-If not, you must use the <tt>ir-tk</tt> shell that acts as <tt>wish</tt>
-except that it includes the <sf/IrTcl/ commands.

 
 The enclosed script <tt>client.tcl</tt> is a graphical client
 
 The enclosed script <tt>client.tcl</tt> is a graphical client

-which demonstates an example of a user interface for the Z39.50/SR protocols. 
+which demonstates an example of a user interface for the Z39.50 protocol. 

 At first the script was relatively small but it has grown since the 
 beginning. At present it is about 3000 lines. 
 
 At first the script was relatively small but it has grown since the 
 beginning. At present it is about 3000 lines. 
 

@@ -236,15 +211,10 @@ $ wish -f client.tcl
 Note: Substitute the real name for the wish interpreter above, for
 version 8.0 it is probably called <tt/wish8.0/.
 
 Note: Substitute the real name for the wish interpreter above, for
 version 8.0 it is probably called <tt/wish8.0/.
 

-To start the client without dynamic library support use:
-<tscreen><verb>
-$ ./ir-tk -f client.tcl
-</verb></tscreen>
-

 The client lets up define targets and query types within the interface.
 The client lets up define targets and query types within the interface.

-Hence, you will not need to modify configation files. 
+Hence, you will not need to modify configuration files. 

 
 

-Stuff concerning targets can be found in the pull down menu 'Target'
+Stuff regarding targets can be found in the pull down menu 'Target'

 with the following options:
 <descrip>
 <tag>Connect</tag> Establishes connection to a target.
 with the following options:
 <descrip>
 <tag>Connect</tag> Establishes connection to a target.

@@ -336,7 +306,7 @@ is called. Callback routines are represented in Tcl as
 a list, which is re-interpreted prior to invocation.
 The method is similar to the one used in Tk to capture X events.
 
 a list, which is re-interpreted prior to invocation.
 The method is similar to the one used in Tk to capture X events.
 

-For each SR/Z39.50 request there is a corresponding object action. The most
+For each Z39.50 request there is a corresponding object action. The most

 important actions are:
 <descrip>
 <tag/connect/ Establishes connection with a target
 important actions are:
 <descrip>
 <tag/connect/ Establishes connection with a target

@@ -435,9 +405,10 @@ immediately followed by a hostname. A number of settings affect the
 
 <descrip>
 <tag><tt>comstack </tt><tt>mosi|tcpip</tt></tag>
 
 <descrip>
 <tag><tt>comstack </tt><tt>mosi|tcpip</tt></tag>

- Comstack type.
+ Comstack type. Note that <tt/mosi/ is no longer supported by <bf/YAZ/.

 <tag><tt>protocol </tt><tt>Z39|SR</tt></tag>
 <tag><tt>protocol </tt><tt>Z39|SR</tt></tag>

- Protocol type - ANSI/NISO Z39.50 or ISO SR.
+ Protocol type - ANSI/NISO Z39.50 or ISO SR. Note, that SR
+ is no longer supported by <bf/YAZ/.

 <tag><tt>callback </tt><em>list</em></tag>
  Tcl script called when the connection is established.
 <tag><tt>failback </tt><em>list</em></tag>
 <tag><tt>callback </tt><em>list</em></tag>
  Tcl script called when the connection is established.
 <tag><tt>failback </tt><em>list</em></tag>

@@ -554,10 +525,10 @@ Each item in the list describes the target parameters with
 the following four components: association-name, comstack-type,
 protocol-type and a hostname.
 
 the following four components: association-name, comstack-type,
 protocol-type and a hostname.
 

-The list for the two targets: ISO/SR target DANBIB and TCP/Z39.50 
+The list for the two targets: Library of Congress and Z39.50 

 target Data Research, will be defined as:
 <tscreen><verb>
 target Data Research, will be defined as:
 <tscreen><verb>

-set targetList { {danbib mosi SR 0103/find2.denet.dk:4500}
+set targetList { {loc tcpip Z39 z3950.loc.gov:7090}

                  {drs tcpip Z39 dranet.dra.com} }
 </verb></tscreen>
 
                  {drs tcpip Z39 dranet.dra.com} }
 </verb></tscreen>
 

@@ -1437,7 +1408,7 @@ been created.
 <sect>License
 
 <p>
 <sect>License
 
 <p>

-Copyright &copy; 1995-1999, Index Data.
+Copyright &copy; 1995-2001, Index Data ApS.

 
 Permission to use, copy, modify, distribute, and sell this software and
 its documentation, in whole or in part, for any purpose, is hereby granted,
 
 Permission to use, copy, modify, distribute, and sell this software and
 its documentation, in whole or in part, for any purpose, is hereby granted,

@@ -1480,14 +1451,14 @@ in general.
 
 <tscreen><verb>
 Index Data
 
 <tscreen><verb>
 Index Data

-Ryesgade 3
-2200 Copenhagen N
+Kobmagergade 43
+1150 Copenhagen K

 Denmark
 </verb></tscreen>
 <p>
 <tscreen><verb>
 Denmark
 </verb></tscreen>
 <p>
 <tscreen><verb>

-Phone: +45 3536 3672
-Fax  : +45 3536 0449
+Phone: +45 3341 0100
+Fax  : +45 3341 0101

 Email: info@indexdata.dk
 </verb></tscreen>
 
 Email: info@indexdata.dk
 </verb></tscreen>
 

@@ -1503,11 +1474,11 @@ name="http://www.indexdata.dk/irtcl/">
 <tag>2 Ousterhout, John K.:</tag>
 Tcl and the Tk Toolkit. Addison-Wesley Company Inc (ISBN
 0-201-63337-X). The Tcl/Tk toolkit home page is
 <tag>2 Ousterhout, John K.:</tag>
 Tcl and the Tk Toolkit. Addison-Wesley Company Inc (ISBN
 0-201-63337-X). The Tcl/Tk toolkit home page is

-<htmlurl url="http://www.scriptics.com"
- name="http://www.scriptics.com">.
+<htmlurl url="http://tcl.activestate.com"
+ name="http://tcl.activestate.com">.

 The primary download area is 
 The primary download area is 

-<htmlurl url="http://www.scriptics.com/software/download.html"
-name="http://www.scriptics.com/software/download.html">.
+<htmlurl url="http://prdownloads.sourceforge.net/tcl/"
+name="http://prdownloads.sourceforge.net/tcl/">.

 
 <tag>3 Welch, Brent B.:</tag>
 Practical Programming in Tcl and Tk. Prentice Hall
 
 <tag>3 Welch, Brent B.:</tag>
 Practical Programming in Tcl and Tk. Prentice Hall

diff --git a/irtdb.tcl b/irtdb.tcl
index dd6be21..95519fd 100644 (file)
--- a/irtdb.tcl
+++ b/irtdb.tcl
@@ -84,7 +84,7 @@ set profile(AGCI,timeDefine) 944954173
 set profile(AGCI,timeLastExplain) {}
 set profile(AGCI,timeLastInit) {}
 set profile(AGCI,welcomeMessage) {}
 set profile(AGCI,timeLastExplain) {}
 set profile(AGCI,timeLastInit) {}
 set profile(AGCI,welcomeMessage) {}

-set profile(AGCI,windowNumber) 14
+set profile(AGCI,windowNumber) 15

 set profile(BIBSYS,authentication) {}
 set profile(BIBSYS,comstack) tcpip
 set profile(BIBSYS,databases) {BIBSYS PERI}
 set profile(BIBSYS,authentication) {}
 set profile(BIBSYS,comstack) tcpip
 set profile(BIBSYS,databases) {BIBSYS PERI}

@@ -140,7 +140,7 @@ set {profile(Bell Laboratories Library Network,timeDefine)} {}
 set {profile(Bell Laboratories Library Network,timeLastExplain)} {}
 set {profile(Bell Laboratories Library Network,timeLastInit)} 944953393
 set {profile(Bell Laboratories Library Network,welcomeMessage)} {}
 set {profile(Bell Laboratories Library Network,timeLastExplain)} {}
 set {profile(Bell Laboratories Library Network,timeLastInit)} 944953393
 set {profile(Bell Laboratories Library Network,welcomeMessage)} {}

-set {profile(Bell Laboratories Library Network,windowNumber)} 15
+set {profile(Bell Laboratories Library Network,windowNumber)} 16

 set {profile(Bibliotheque Nationale du Quebec,authentication)} {}
 set {profile(Bibliotheque Nationale du Quebec,comstack)} tcpip
 set {profile(Bibliotheque Nationale du Quebec,databases)} IRIS
 set {profile(Bibliotheque Nationale du Quebec,authentication)} {}
 set {profile(Bibliotheque Nationale du Quebec,comstack)} tcpip
 set {profile(Bibliotheque Nationale du Quebec,databases)} IRIS

@@ -196,7 +196,7 @@ set {profile(Colorado Alliance of Research Libraries,timeDefine)} 944954480
 set {profile(Colorado Alliance of Research Libraries,timeLastExplain)} {}
 set {profile(Colorado Alliance of Research Libraries,timeLastInit)} {}
 set {profile(Colorado Alliance of Research Libraries,welcomeMessage)} {}
 set {profile(Colorado Alliance of Research Libraries,timeLastExplain)} {}
 set {profile(Colorado Alliance of Research Libraries,timeLastInit)} {}
 set {profile(Colorado Alliance of Research Libraries,welcomeMessage)} {}

-set {profile(Colorado Alliance of Research Libraries,windowNumber)} 13
+set {profile(Colorado Alliance of Research Libraries,windowNumber)} 14

 set {profile(DTV Alis,authentication)} {}
 set {profile(DTV Alis,comstack)} tcpip
 set {profile(DTV Alis,databases)} DTV01
 set {profile(DTV Alis,authentication)} {}
 set {profile(DTV Alis,comstack)} tcpip
 set {profile(DTV Alis,databases)} DTV01

@@ -250,7 +250,7 @@ set {profile(DanBib V2,smallSetUpperBound)} 0
 set {profile(DanBib V2,targetInfoName)} {}
 set {profile(DanBib V2,timeDefine)} 944954541
 set {profile(DanBib V2,timeLastExplain)} {}
 set {profile(DanBib V2,targetInfoName)} {}
 set {profile(DanBib V2,timeDefine)} 944954541
 set {profile(DanBib V2,timeLastExplain)} {}

-set {profile(DanBib V2,timeLastInit)} 971251341
+set {profile(DanBib V2,timeLastInit)} 1007339533

 set {profile(DanBib V2,welcomeMessage)} {}
 set {profile(DanBib V2,windowNumber)} 12
 set {profile(Data Research Associates,authentication)} {}
 set {profile(DanBib V2,welcomeMessage)} {}
 set {profile(DanBib V2,windowNumber)} 12
 set {profile(Data Research Associates,authentication)} {}

@@ -446,7 +446,7 @@ set {profile(University of Arkansas,timeDefine)} 944956252
 set {profile(University of Arkansas,timeLastExplain)} {}
 set {profile(University of Arkansas,timeLastInit)} 971251409
 set {profile(University of Arkansas,welcomeMessage)} {}
 set {profile(University of Arkansas,timeLastExplain)} {}
 set {profile(University of Arkansas,timeLastInit)} 971251409
 set {profile(University of Arkansas,welcomeMessage)} {}

-set {profile(University of Arkansas,windowNumber)} 16
+set {profile(University of Arkansas,windowNumber)} 17

 set {profile(University of British Columbia,authentication)} {}
 set {profile(University of British Columbia,comstack)} tcpip
 set {profile(University of British Columbia,databases)} MARION
 set {profile(University of British Columbia,authentication)} {}
 set {profile(University of British Columbia,comstack)} tcpip
 set {profile(University of British Columbia,databases)} MARION

@@ -474,7 +474,7 @@ set {profile(University of British Columbia,timeDefine)} 944955536
 set {profile(University of British Columbia,timeLastExplain)} {}
 set {profile(University of British Columbia,timeLastInit)} 944955627
 set {profile(University of British Columbia,welcomeMessage)} {}
 set {profile(University of British Columbia,timeLastExplain)} {}
 set {profile(University of British Columbia,timeLastInit)} 944955627
 set {profile(University of British Columbia,welcomeMessage)} {}

-set {profile(University of British Columbia,windowNumber)} 20
+set {profile(University of British Columbia,windowNumber)} 21

 set {profile(University of California MELVYL,authentication)} {}
 set {profile(University of California MELVYL,comstack)} tcpip
 set {profile(University of California MELVYL,databases)} PE
 set {profile(University of California MELVYL,authentication)} {}
 set {profile(University of California MELVYL,comstack)} tcpip
 set {profile(University of California MELVYL,databases)} PE

@@ -502,7 +502,7 @@ set {profile(University of California MELVYL,timeDefine)} 944955670
 set {profile(University of California MELVYL,timeLastExplain)} {}
 set {profile(University of California MELVYL,timeLastInit)} 944955675
 set {profile(University of California MELVYL,welcomeMessage)} {}
 set {profile(University of California MELVYL,timeLastExplain)} {}
 set {profile(University of California MELVYL,timeLastInit)} 944955675
 set {profile(University of California MELVYL,welcomeMessage)} {}

-set {profile(University of California MELVYL,windowNumber)} 18
+set {profile(University of California MELVYL,windowNumber)} 19

 set {profile(University of Illinois,authentication)} {}
 set {profile(University of Illinois,comstack)} tcpip
 set {profile(University of Illinois,databases)} {UICOPAC2 UICOPAC1}
 set {profile(University of Illinois,authentication)} {}
 set {profile(University of Illinois,comstack)} tcpip
 set {profile(University of Illinois,databases)} {UICOPAC2 UICOPAC1}

@@ -528,7 +528,7 @@ set {profile(University of Illinois,smallSetUpperBound)} 0
 set {profile(University of Illinois,targetInfoName)} {}
 set {profile(University of Illinois,timeDefine)} 944955869
 set {profile(University of Illinois,timeLastExplain)} {}
 set {profile(University of Illinois,targetInfoName)} {}
 set {profile(University of Illinois,timeDefine)} 944955869
 set {profile(University of Illinois,timeLastExplain)} {}

-set {profile(University of Illinois,timeLastInit)} 944956081
+set {profile(University of Illinois,timeLastInit)} 1007339488

 set {profile(University of Illinois,welcomeMessage)} {}
 set {profile(University of Illinois,windowNumber)} 8
 set profile(indexdata,authentication) {}
 set {profile(University of Illinois,welcomeMessage)} {}
 set {profile(University of Illinois,windowNumber)} 8
 set profile(indexdata,authentication) {}

@@ -558,7 +558,7 @@ set profile(indexdata,timeDefine) 944954185
 set profile(indexdata,timeLastExplain) 1007339347
 set profile(indexdata,timeLastInit) 971253620
 set profile(indexdata,welcomeMessage) {}
 set profile(indexdata,timeLastExplain) 1007339347
 set profile(indexdata,timeLastInit) 971253620
 set profile(indexdata,welcomeMessage) {}

-set profile(indexdata,windowNumber) 19
+set profile(indexdata,windowNumber) 20

 set profile(localhost,authentication) {}
 set profile(localhost,comstack) tcpip
 set profile(localhost,databases) Default
 set profile(localhost,authentication) {}
 set profile(localhost,comstack) tcpip
 set profile(localhost,databases) Default

@@ -586,7 +586,7 @@ set profile(localhost,timeDefine) 1007339366
 set profile(localhost,timeLastExplain) {}
 set profile(localhost,timeLastInit) 1007339370
 set profile(localhost,welcomeMessage) {}
 set profile(localhost,timeLastExplain) {}
 set profile(localhost,timeLastInit) 1007339370
 set profile(localhost,welcomeMessage) {}

-set profile(localhost,windowNumber) 21
+set profile(localhost,windowNumber) 13

 set queryTypes Simple
 set queryButtons {{ {I 0} {I 1} {I 2} }}
 set queryInfo {{{Title {1=4}} {Author {1=1003}}  {Subject {1=21}} {Any {1=1016}} {Abstract {1=62}}}}
 set queryTypes Simple
 set queryButtons {{ {I 0} {I 1} {I 2} }}
 set queryInfo {{{Title {1=4}} {Author {1=1003}}  {Subject {1=21}} {Any {1=1016}} {Abstract {1=62}}}}

diff --git a/msearch.tcl b/msearch.tcl
index 256156b..7f859f5 100755 (executable)
--- a/msearch.tcl
+++ b/msearch.tcl
@@ -1,5 +1,5 @@
 #!/usr/bin/tclsh
 #!/usr/bin/tclsh

-# $Id: msearch.tcl,v 1.1 2001-03-26 11:39:35 adam Exp $
+# $Id: msearch.tcl,v 1.2 2001-12-03 18:52:06 adam Exp $

 # Simple multi-target search
 
 if {[catch {ir-log-init all irtcl shell.log}]} {
 # Simple multi-target search
 
 if {[catch {ir-log-init all irtcl shell.log}]} {

@@ -24,7 +24,7 @@ proc msearch {targets query pending} {
        set n 0
        foreach t $targets {
                if {[catch {z.$n connect [lindex $t 0]}]} {
        set n 0
        foreach t $targets {
                if {[catch {z.$n connect [lindex $t 0]}]} {

-                       fail-response $targets $n
+                       fail-response $targets $n $query $pending

                }
                incr n
        }
                }
                incr n
        }