README and rename of startup script.

diff --git a/README b/README
new file mode 100644 (file)
index 0000000..7d8f648
--- /dev/null
+++ b/README
@@ -0,0 +1,47 @@
+ 
+ * Copyright (C) 1995, Index Data.
+ * See the file LICENSE for details.
+ * Sebastian Hammer, Adam Dickmeiss
+
+Compilation and installation of IrTcl.
+This is a very early alpha-release of IrTcl.
+
+In order to compile you need:
+   
+  o  An ansi-C compiler such as GNU C
+  o  Tcl version 7.3
+  o  YAZ version 0.2 beta or higher
+
+You may also need:
+
+  o  Tk version 3.6 
+  o  The XTI/mosi package
+
+Compilation:
+  1) Compile/install yaz/tcl, etc.
+
+  2) Edit Makefile (in current directory)
+     Set MOSI to 1/0
+     Define include directory paths of yaz/tcl/tk
+     Define libraries of yaz/tcl/tk
+
+  3) Type 'make ir-tcl' to make the Tcl version or IrTcl.
+     Type 'make ir-tk' to make the Tk version of IrTcl.
+
+Install/run:
+
+  4) The resulting files are:
+     ir-tcl                     Tcl version of IrTcl
+     ir-tk                      Tk version of IrTcl
+     marc.tcl/iterate.tcl       small IrTcl scripts
+     client.tcl                 Tk graphical client - automatically
+                                executed by ir-tk
+     clientrc.tcl               Startup script - read by client.tcl - holds
+                                user/target definitions.
+
+  5) Type 'ir-tk' to run the Tk graphical client (client.tcl and 
+     clientrc.tcl should be in current directory)
+
+     Type 'ir-tcl' to run the Tcl client. Very similar to tclsh.
+
+

diff --git a/client.tcl b/client.tcl
index 38f62f7..45358ed 100644 (file)
--- a/client.tcl
+++ b/client.tcl
@@ -1,6 +1,9 @@
 #
 # $Log: client.tcl,v $
-# Revision 1.22  1995-05-26 11:44:09  adam
+# Revision 1.23  1995-05-29 10:33:41  adam
+# README and rename of startup script.
+#
+# Revision 1.22  1995/05/26  11:44:09  adam
 # Bugs fixed. More work on MARC utilities and queries. Test
 # client is up-to-date again.
 #
@@ -83,13 +86,13 @@ set setNo 0
 
 set queryTypes {Simple}
 set queryButtons { { {I 0} {I 1} {I 2} } }
-set queryInfo { { {Title {1=4 4=1 6=1}} {Author {1=1 4=1 6=1}} \
-        {Subject {1=21 4=1 6=1}} {Any {1=1016 4=1 6=1}} } }
+set queryInfo { { {Title {1=4}} {Author {1=1}} \
+        {Subject {1=21}} {Any {1=1016}} } }
 
 wm minsize . 350 250
 
-if {[file readable "~/.tk-c"]} {
-    source "~/.tk-c"
+if {[file readable "clientrc.tcl"]} {
+    source "clientrc.tcl"
 }
 
 set queryButtonsFind [lindex $queryButtons 0]

diff --git a/clientrc.tcl b/clientrc.tcl
new file mode 100644 (file)
index 0000000..b39793e
--- /dev/null
+++ b/clientrc.tcl
@@ -0,0 +1,21 @@
+# Setup file
+set hotTargets { LOC ztest  RLG Penn DANBIB dranet Aleph CARL OCLC IREG Innovative CNIDR CLSI AULS Nsrtest                              }
+set profile(CNIDR) {CNIDR Kudzu.cnidr.org 5556 {} 16384 8192 tcpip {Book ERIC} 1 {} {} z39v2}
+set profile(Penn) {{Penn State's Library} 128.118.88.200 210 {} 16384 8192 tcpip CATALOG 1 {} {} z39v2}
+set profile(ztest) {{test server} localhost 9999 {} 16384 8192 tcpip dummy 1 {} {} z39v2}
+set profile(Nsrtest) {{NSR in house.} localhost 4500 {} 16384 8192 mosi x 1 {} {} sr}
+set profile(Default) {{} {} {210} {} 16384 8192 tcpip {} }
+set profile(RLG) {{Research Libraries group} rlg.stanford.edu 210 {} 16384 4096 tcpip {BKS AMC MAPS MDF REC SCO SER VIM NAF SAF AUT CATALOG ABI AVI DSA EIP FLP HAP HST NPA PAI PRA WLI} 1 {} {} z39v2}
+set profile(LOC) {{Library of Congress} IBM2.LOC.gov 210 {} 16384 16384 tcpip {BOOKS NAMES} 1 {} 0 z39v2}
+set profile(IREG) {{Internet Resource} frost.notis.com 210 {} 16384 8192 tcpip {IREG ERIC} 1 {} {} z39v2}
+set profile(DANBIB) {{SR Target DANBIB} 0103/find2.denet.dk 4500 {} 8192 8192 mosi danbib 1 {} 1 z39v2}
+set profile(OCLC) {OCLC rdsd-rs6000.dev.oclc.org 211 {} 16384 8192 tcpip OLUC 1 {} {} z39v2}
+set profile(Aleph) {{Aleph at ram10.aleph.co.il:5555} localhost 9998 {} 16384 4096 tcpip {dem mar} 1 0 1 z39v2}
+set profile(CARL) {{CARL systems} Z39.50.carl.org 210 {} 16384 8192 tcpip {ACC AIC AUR BEM CUB DPL DNU EPL FRC LAW LCC MCC MIN MPL NJC NWC OCC PPC PUE RDR RGU SPL TCC TKU UNC WYO} 1 {} {} z39v2}
+set profile(Innovative) {{Innovatives server: demo.iii.com} demo.iii.com 210 {} 16384 8192 tcpip DEFAULT 1 {} {} z39v2}
+set profile(CLSI) {CLSI inet-gw.clsi.uc.geac.com 210 {} 16384 8192 tcpip Cl 1 {} {} z39v2}
+set profile(AULS) {{Acadia university} auls.acadiau.ca 210 {} 16384 8192 tcpip AULS 1 {} {} z39v2}
+set profile(dranet) {dranet dranet.dra.com 210 {} 16384 16384 tcpip drewdb 1 {} {} z39v2}
+set queryTypes {Simple}
+set queryButtons { { {I 0} {I 1} {I 2} } }
+set queryInfo { { {Title {1=4}} {Author {1=1}}  {Subject {1=21}} {Any {1=1016}} } }

diff --git a/ir-tcl.c b/ir-tcl.c
index bf3f75c..bb22467 100644 (file)
--- a/ir-tcl.c
+++ b/ir-tcl.c
@@ -5,7 +5,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ir-tcl.c,v $
- * Revision 1.33  1995-05-29 09:15:11  quinn
+ * Revision 1.34  1995-05-29 10:33:42  adam
+ * README and rename of startup script.
+ *
+ * Revision 1.33  1995/05/29  09:15:11  quinn
  * Changed CS_SR to PROTO_SR, etc.
  *
  * Revision 1.32  1995/05/29  08:44:16  adam
@@ -1809,7 +1812,7 @@ static void ir_set_obj_delete (ClientData clientData)
  * ir_set_obj_mk: IR Set Object creation
  */
 static int ir_set_obj_mk (ClientData clientData, Tcl_Interp *interp,
-                            int argc, char **argv)
+                          int argc, char **argv)
 {
     IRMethods tabs[3];
     IRSetObj *obj;
@@ -1819,6 +1822,8 @@ static int ir_set_obj_mk (ClientData clientData, Tcl_Interp *interp,
         interp->result = "wrong # args";
         return TCL_ERROR;
     }
+    if (!(obj = ir_malloc (interp, sizeof(*obj))))
+        return TCL_ERROR;
     else if (argc == 3)
     {
         Tcl_CmdInfo parent_info;
@@ -1831,8 +1836,6 @@ static int ir_set_obj_mk (ClientData clientData, Tcl_Interp *interp,
             interp->result = "No parent";
             return TCL_ERROR;
         }
-        if (!(obj = ir_malloc (interp, sizeof(*obj))))
-            return TCL_ERROR;
         obj->parent = (IRObj *) parent_info.clientData;
 
         dst = &obj->set_inher;
@@ -2175,7 +2178,7 @@ static int ir_scan_obj_mk (ClientData clientData, Tcl_Interp *interp,
         return TCL_ERROR;
 
     tabs[0].tab = ir_scan_method_tab;
-    tabs[0].obj = clientData;
+    tabs[0].obj = obj;
     tabs[1].tab = NULL;
 
     if (ir_method (interp, 0, NULL, tabs) == TCL_ERROR)