#
# $Log: client.tcl,v $
-# Revision 1.25 1995-05-31 13:09:57 adam
+# Revision 1.26 1995-06-01 16:36:46 adam
+# About buttons. Minor bug fixes.
+#
+# Revision 1.25 1995/05/31 13:09:57 adam
# Client searches/presents may be interrupted.
# New moving book-logo.
#
set setNo 0
set cancelFlag 0
set searchEnable 0
+set fullMarcSeq 0
set queryTypes {Simple}
set queryButtons { { {I 0} {I 1} {I 2} } }
proc top-down-ok-cancel {w ok-action g} {
frame $w.bot.left -relief sunken -border 1
- pack $w.bot.left -side left -expand yes -padx 5 -pady 5
+ pack $w.bot.left -side left -expand yes -ipadx 2 -ipady 2 -padx 5 -pady 5
button $w.bot.left.ok -width 6 -text {Ok} \
-command ${ok-action}
- pack $w.bot.left.ok -expand yes -padx 3 -pady 3
+ pack $w.bot.left.ok -expand yes -ipadx 2 -ipady 2 -padx 3 -pady 3
button $w.bot.cancel -width 6 -text {Cancel} \
-command "destroy $w"
pack $w.bot.cancel -side left -expand yes
if {$g} {
- # Grab ...
grab $w
tkwait window $w
}
}
-proc top-down-ok-cancelx {w buttonList g} {
+proc bottom-buttons {w buttonList g} {
set i 0
set l [llength $buttonList]
pack $w.bot.$i -side left -expand yes -padx 5 -pady 5
button $w.bot.$i.ok -text [lindex $buttonList $i] \
-command [lindex $buttonList [expr $i+1]]
- pack $w.bot.$i.ok -expand yes -padx 3 -pady 3 -side left
+ pack $w.bot.$i.ok -expand yes -ipadx 2 -ipady 2 -padx 3 -pady 3 -side left
incr i 2
while {$i < $l} {
button $w.bot.$i -text [lindex $buttonList $i] \
-command [lindex $buttonList [expr $i+1]]
- pack $w.bot.$i -expand yes -padx 3 -pady 3 -side left
+ pack $w.bot.$i -expand yes -ipadx 2 -ipady 2 -padx 3 -pady 3 -side left
incr i 2
}
- button $w.bot.cancel -width 6 -text {Cancel} \
- -command "destroy $w"
- pack $w.bot.cancel -side left -expand yes
-
if {$g} {
# Grab ...
grab $w
proc cancel-operation {} {
global cancelFlag
+ global busy
set cancelFlag 1
- show-status Cancelled 0 {}
+ if {$busy} {
+ show-status Cancelled 0 {}
+ }
}
proc show-target {target} {
- .bot.target configure -text "$target"
+ .bot.a.target configure -text "$target"
}
proc show-logo {v1} {
if {$v1==0} {
set v1 9
}
- .mid.logo configure -bitmap @book${v1}
+ .bot.logo configure -bitmap @book${v1}
after 140 [list show-logo $v1]
return
}
while {1} {
+ .bot.logo configure -bitmap @book1
tkwait variable busy
if {$busy} {
show-logo 1
return
}
- .mid.logo configure -bitmap @book1
}
}
global busy
global searchEnable
- .bot.status configure -text "$status"
+ .bot.a.status configure -text "$status"
if {$b == 1} {
if {$busy == 0} {set busy 1}
} else {
}
proc show-message {msg} {
- .bot.message configure -text "$msg"
+ .bot.a.message configure -text "$msg"
}
proc insertWithTags {w text args} {
}
}
-proc show-full-marc {no} {
- global setNo
+proc about-target {} {
+ set w .about-target-w
+
+ toplevel $w
+
+ wm title $w "About target"
+ place-force $w .
+ top-down-window $w
+
+ set i [z39 targetImplementationName]
+ label $w.top.in -text "Implementation name: $i"
+ set i [z39 targetImplementationId]
+ label $w.top.ii -text "Implementation id: $i"
+ set i [z39 targetImplementationVersion]
+ label $w.top.iv -text "Implementation version: $i"
- set w .full-marc
+ pack $w.top.in $w.top.ii $w.top.iv -side top -anchor nw
+
+ bottom-buttons $w [list {Close} [list destroy $w]] 1
+}
+
+proc about-origin {} {
+ set w .about-origin-w
+
+ toplevel $w
+
+ wm title $w "About IrTcl"
+ place-force $w .
+ top-down-window $w
+
+ set i [z39 implementationName]
+ label $w.top.in -text "Implementation name: $i"
+ set i [z39 implementationId]
+ label $w.top.ii -text "Implementation id: $i"
+
+ pack $w.top.in $w.top.ii -side top -anchor nw
+
+ bottom-buttons $w [list {Close} [list destroy $w]] 1
+}
+
+proc show-full-marc {no b} {
+ global setNo
+ global fullMarcSeq
+ if {[z39.$setNo type $no] != "DB"} {
+ return
+ }
+ if {$b} {
+ set w .full-marc-$fullMarcSeq
+ incr fullMarcSeq
+ } else {
+ set w .full-marc
+ }
if {[winfo exists $w]} {
$w.top.record delete 0.0 end
set new 0
toplevel $w
- wm minsize $w 200 200
+ wm minsize $w 0 0
frame $w.top -relief raised -border 1
frame $w.bot -relief raised -border 1
set new 1
}
- incr no
-
set r [z39.$setNo getMarc $no list * * *]
$w.top.record tag configure marc-tag -foreground blue
pack $w.top.s -side right -fill y
pack $w.top.record -expand yes -fill both
-
- frame $w.bot.left -relief sunken -border 1
- pack $w.bot.left -side left -expand yes -padx 5 -pady 5
- button $w.bot.left.close -width 6 -text {Close} \
- -command {destroy .full-marc}
- pack $w.bot.left.close -expand yes -padx 3 -pady 3
- button $w.bot.edit -width 6 -text {Edit} \
- -command {destroy .full-marc}
- pack $w.bot.edit -side left -expand yes
+
+ bottom-buttons $w [list \
+ {Close} [list destroy $w] \
+ {Duplicate} [list show-full-marc $no 1]] 0
}
}
set len [llength $hotTargets]
if {$len > 0} {
- .top.target.m delete 5 [expr 5+[llength $hotTargets]]
+ .top.target.m delete 6 [expr 6+[llength $hotTargets]]
}
set indx [lsearch $hotTargets $target]
if {$indx >= 0} {
set hostid $target
.top.target.m disable 0
.top.target.m enable 1
+ .top.target.m enable 2
}
proc close-target {} {
set cancelFlag 0
set hostid Default
z39 disconnect
- show-target {None}
+ show-target {}
show-status {Not connected} 0 0
show-message {}
.top.target.m disable 1
+ .top.target.m disable 2
.top.target.m enable 0
- .mid.logo configure -bitmap @book1
}
proc load-set-action {} {
return
}
show-status {Ready} 0 1
- .mid.logo configure -bitmap @book1
if {![z39 initResult]} {
set u [z39 userInformationField]
close-target
pack $w.top.scroll -side right -fill y
$w.top.scroll config -command [list $w.top.list yview]
- top-down-ok-cancelx $w [list {Close} [list destroy $w]] 0
+ bottom-buttons $w [list {Close} [list destroy $w]] 0
}
z39.scan numberOfTermsRequested 100
z39.scan scan "@attr 1=4 0"
puts "In search-response"
init-title-lines
show-status {Ready} 0 1
- if {$cancelFlag} {
- set cancelFlag 0
- return
- }
show-message "[z39.$setNo resultCount] hits"
set setMax [z39.$setNo resultCount]
- puts $setMax
if {$setMax == 0} {
set status [z39.$setNo responseStatus]
if {[lindex $status 0] == "NSD"} {
}
return
}
- if {$setMax > 10} {
- set setMax 10
+ if {$setMax > 20} {
+ set setMax 20
}
- z39 callback {present-response}
set setOffset 1
- z39.$setNo present $setOffset $setMax
+ if {$cancelFlag} {
+ set cancelFlag 0
+ return
+ }
+ z39 callback {present-response}
+ z39.$setNo present $setOffset 1
show-status {Retrieve} 1 0
}
if {$max <= $setMax} {
return
}
- puts "max=$max"
- puts "setOffset=$setOffset"
if {$number == ""} {
set setMax $max
} else {
incr setMax $number
}
z39 callback {present-response}
- z39.$setNo present $setOffset [expr $setMax - $setOffset + 1]
+
+ set toGet [expr $setMax - $setOffset + 1]
+ if {$toGet > 3} {
+ set toGet 3
+ }
+ z39.$setNo present $setOffset $toGet
show-status {Retrieve} 1 0
}
proc add-title-lines {setno no offset} {
for {set i 0} {$i < $no} {incr i} {
set o [expr $i + $offset]
- set title [lindex [z39.$setno getMarc $o field 245 * a] 0]
- set year [lindex [z39.$setno getMarc $o field 260 * c] 0]
- set nostr [format "%5d" $o]
- .data.list insert end "$nostr $title - $year"
+ set type [z39.$setno type $o]
+ if {$type == "DB"} {
+ set title [lindex [z39.$setno getMarc $o field 245 * a] 0]
+ set year [lindex [z39.$setno getMarc $o field 260 * c] 0]
+ set nostr [format "%5d" $o]
+ .data.list insert end "$nostr $title - $year"
+ } elseif {$type == "SD"} {
+ set err [lindex [z39.$setno diag $o] 1]
+ set add [lindex [z39.$setno diag $o] 2]
+ if {$add != {}} {
+ set add " :${add}"
+ }
+ .data.list insert end "Error ${err}${add}"
+ } elseif {$type == ""} {
+ .data.list insert end "empty"
+ }
}
}
return
}
if {$no > 0 && $setOffset <= $setMax} {
- z39.$setNo present $setOffset [expr $setMax - $setOffset + 1]
+ puts "present from ${setOffset}"
+ set toGet [expr $setMax - $setOffset + 1]
+ if {$toGet > 3} {
+ set toGet 3
+ }
+ z39.$setNo present $setOffset $toGet
} else {
show-status {Finished} 0 1
}
pack $w.top.completeness.label $w.top.completeness.b -fill x
# Ok-cancel
- top-down-ok-cancelx $w [list \
+ bottom-buttons $w [list \
{Ok} [list query-setup-action $queryNo] \
{Add index} [list query-add-index $queryNo] \
{Add line} [list query-add-line $queryNo] \
- {Delete line} [list query-del-line $queryNo]] 0
+ {Delete line} [list query-del-line $queryNo] \
+ {Cancel} [list destroy $w]] 0
}
proc index-clear {} {
.top.file.m add command -label "Load Set" -command {load-set}
.top.file.m add separator
.top.file.m add command -label "Exit" -command {exit-action}
+.top.file.m add separator
+.top.file.m add command -label "About" -command {about-origin}
menubutton .top.target -text "Target" -underline 0 -menu .top.target.m
menu .top.target.m
.top.target.m add cascade -label "Connect" -menu .top.target.m.clist
.top.target.m add command -label "Disconnect" -command {close-target}
-#.top.target.m add command -label "Initialize" -command {init-request}
+.top.target.m add command -label "About" -command {about-target}
.top.target.m add cascade -label "Setup" -menu .top.target.m.slist
.top.target.m add command -label "Setup new" -command {define-target-dialog}
.top.target.m add separator
set-target-hotlist
.top.target.m disable 1
+.top.target.m disable 2
menu .top.target.m.clist
menu .top.target.m.slist
pack .mid.search .mid.scan .mid.present .mid.clear -side left \
-fill y -padx 5 -pady 3
-button .mid.logo -bitmap @book1 -command cancel-operation
-pack .mid.logo -side right -pady 3
-
listbox .data.list -yscrollcommand {.data.scroll set} -font fixed
scrollbar .data.scroll -orient vertical -border 1
pack .data.list -side left -fill both -expand yes
pack .data.scroll -side right -fill y
.data.scroll config -command {.data.list yview}
-message .bot.target -text "None" -aspect 1000 -relief sunken -border 1
-label .bot.status -text "Not connected" -width 12 -relief \
+button .bot.logo -bitmap @book1 -command cancel-operation
+frame .bot.a
+pack .bot.a -side left -fill x
+pack .bot.logo -side right -padx 2 -pady 2
+
+message .bot.a.target -text "" -aspect 1000 -border 1
+
+label .bot.a.status -text "Not connected" -width 15 -relief \
sunken -anchor w -border 1
-label .bot.set -textvariable setNo -width 5 -relief \
+label .bot.a.set -textvariable setNo -width 5 -relief \
sunken -anchor w -border 1
-label .bot.message -text "" -width 14 -relief \
+label .bot.a.message -text "" -width 15 -relief \
sunken -anchor w -border 1
-pack .bot.target .bot.status .bot.set .bot.message -anchor nw \
+
+pack .bot.a.target -side top -anchor nw -padx 2 -pady 2
+pack .bot.a.status .bot.a.set .bot.a.message \
-side left -padx 2 -pady 2
bind .data.list <Double-Button-1> {set indx [.data.list nearest %y]
-show-full-marc $indx}
+show-full-marc [incr indx] 0}
ir z39
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ir-tcl.c,v $
- * Revision 1.37 1995-06-01 07:31:20 adam
+ * Revision 1.38 1995-06-01 16:36:47 adam
+ * About buttons. Minor bug fixes.
+ *
+ * Revision 1.37 1995/06/01 07:31:20 adam
* Rename of many typedefs -> IrTcl_...
*
* Revision 1.36 1995/05/31 13:09:59 adam
* do_numberOfRecordsReturned: Get number of records returned
*/
static int do_numberOfRecordsReturned (void *o, Tcl_Interp *interp,
- int argc, char **argv)
+ int argc, char **argv)
{
IrTcl_SetObj *obj = o;
}
/*
- * do_recordType: Return record type (if any) at position.
+ * do_type: Return type (if any) at position.
*/
-static int do_recordType (void *o, Tcl_Interp *interp, int argc, char **argv)
+static int do_type (void *o, Tcl_Interp *interp, int argc, char **argv)
{
IrTcl_SetObj *obj = o;
int offset;
switch (rl->which)
{
case Z_NamePlusRecord_databaseRecord:
- interp->result = "databaseRecord";
+ interp->result = "DB";
break;
case Z_NamePlusRecord_surrogateDiagnostic:
- interp->result = "surrogateDiagnostic";
+ interp->result = "SD";
break;
}
return TCL_OK;
}
/*
- * do_recordDiag: Return diagnostic record info
+ * do_diag: Return diagnostic record info
*/
-static int do_recordDiag (void *o, Tcl_Interp *interp, int argc, char **argv)
+static int do_diag (void *o, Tcl_Interp *interp, int argc, char **argv)
{
IrTcl_SetObj *obj = o;
int offset;
IrTcl_RecordList *rl;
char buf[20];
+ const char *cp;
if (argc <= 0)
return TCL_OK;
Tcl_AppendResult (interp, "No Diagnostic record at #", argv[2], NULL);
return TCL_ERROR;
}
+
sprintf (buf, "%d", rl->u.diag.condition);
- Tcl_AppendResult (interp, buf, " {",
- (rl->u.diag.addinfo ? rl->u.diag.addinfo : ""),
- "}", NULL);
+ Tcl_AppendElement (interp, buf);
+ cp = diagbib1_str (rl->u.diag.condition);
+ if (cp)
+ Tcl_AppendElement (interp, (char*) cp);
+ else
+ Tcl_AppendElement (interp, "");
+ if (rl->u.diag.addinfo)
+ Tcl_AppendElement (interp, (char*) rl->u.diag.addinfo);
+ else
+ Tcl_AppendElement (interp, "");
return TCL_OK;
}
{ 0, "resultCount", do_resultCount },
{ 0, "numberOfRecordsReturned", do_numberOfRecordsReturned },
{ 0, "present", do_present },
- { 0, "recordType", do_recordType },
+ { 0, "type", do_type },
{ 0, "getMarc", do_getMarc },
- { 0, "Diag", do_recordDiag },
+ { 0, "diag", do_diag },
{ 0, "responseStatus", do_responseStatus },
{ 0, "loadFile", do_loadFile },
{ 0, NULL, NULL}