X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=client.tcl;h=d4a10f4bf34d4c7950b1d7a6a9aa71f06a59f827;hb=71da3253847dfb239e28a7bb760d259ff3611ee7;hp=dbdc64418c46b8275de9b31b3f80deefddbca779;hpb=f490e9fbefdbf6ba1531eb3fba33467e55ac446c;p=ir-tcl-moved-to-github.git diff --git a/client.tcl b/client.tcl index dbdc644..d4a10f4 100644 --- a/client.tcl +++ b/client.tcl @@ -4,7 +4,29 @@ # Sebastian Hammer, Adam Dickmeiss # # $Log: client.tcl,v $ -# Revision 1.78 1995-10-18 15:45:36 quinn +# Revision 1.85 1996-01-19 16:22:36 adam +# New method: apduDump - returns information about last incoming APDU. +# +# Revision 1.84 1996/01/11 13:12:10 adam +# Bug fix. +# +# Revision 1.83 1995/11/28 17:26:36 adam +# Removed Carriage return from ir-tcl.c! +# Removed misc. debug logs. +# +# Revision 1.82 1995/11/02 08:47:56 adam +# Text widgets are flat now. +# +# Revision 1.81 1995/10/19 10:34:43 adam +# More configurable client. +# +# Revision 1.80 1995/10/18 17:20:32 adam +# Work on target setup in client.tcl. +# +# Revision 1.79 1995/10/18 16:42:37 adam +# New settings: smallSetElementSetNames and mediumSetElementSetNames. +# +# Revision 1.78 1995/10/18 15:45:36 quinn # *** empty log message *** # # Revision 1.77 1995/10/18 15:37:46 adam @@ -329,7 +351,7 @@ set hotTargets {} set hotInfo {} set busy 0 -set profile(Default) {{} {} {210} {} 16384 8192 tcpip {} 1 {} {} Z39 1} +set profile(Default) {{} {} {210} {} 50000 30000 tcpip {} 1 {} {} Z39 1 2 0 0 4} set hostid Default set settingsChanged 0 set setNo 0 @@ -342,6 +364,7 @@ set textWrap word set recordSyntax None set elementSetNames None set delayRequest {} +set debugMode 0 set queryTypes {Simple} set queryButtons { { {I 0} {I 1} {I 2} } } @@ -372,21 +395,37 @@ proc tkerror err { bottom-buttons $w [list {Close} [list destroy $w]] 1 } +if {[file readable "clientrc.tcl"]} { + source "clientrc.tcl" +} else { + if {[file readable "${libdir}/clientrc.tcl"]} { + source "${libdir}/clientrc.tcl" + } +} + +if {[file readable "~/.clientrc.tcl"]} { + source "~/.clientrc.tcl" +} + +set queryButtonsFind [lindex $queryButtons 0] +set queryInfoFind [lindex $queryInfo 0] + proc read-formats {} { global displayFormats global libdir - if {[catch {set formats [glob -nocomplain ${libdir}/formats/*.tcl]}]} { - set formats ./formats/raw.tcl - } + + set oldDir [pwd] + cd ${libdir}/formats + set formats [glob {*.[tT][cC][lL]}] foreach f $formats { if {[file readable $f]} { source $f set l [string length $f] - set f [string range $f [string length "${libdir}/formats/"] \ - [expr $l - 5]] + set f [string tolower [string range $f 0 [expr $l - 5]]] lappend displayFormats $f } } + cd $oldDir } proc set-wrap {m} { @@ -397,9 +436,53 @@ proc set-wrap {m} { } proc dputs {m} { - puts $m + global debugMode + if {$debugMode} { + puts $m + } +} + +proc apduDump {} { + global debugMode + + set w .apdu + + if {$debugMode == 0} return + set x [z39 apduInfo] + + set offset [lindex $x 1] + set length [lindex $x 0] + + if {![winfo exists $w]} { + catch {destroy $w} + toplevelG $w + + wm title $w "APDU information" + + wm minsize $w 0 0 + + top-down-window $w + + text $w.top.t -width 60 -height 12 -wrap word -relief flat \ + -borderwidth 0 \ + -yscrollcommand [list $w.top.s set] + scrollbar $w.top.s -command [list $w.top.t yview] + + pack $w.top.s -side right -fill y + pack $w.top.t -expand yes -fill both + + bottom-buttons $w [list {Close} [list destroy $w]] 0 + } + $w.top.t insert end "Length: ${length}\n" + if {$offset != -1} { + $w.top.t insert end "Offset: ${offset}\n" + } + $w.top.t insert end [lindex $x 2] + $w.top.t insert end "---------------------------------\n" + } + proc set-display-format {f} { global displayFormat global setNo @@ -466,20 +549,6 @@ proc toplevelG {w} { bind $w [list destroyGW $w] } -if {[file readable "clientrc.tcl"]} { - source "clientrc.tcl" -} else { - if {[file readable "${libdir}/clientrc.tcl"]} { - source "${libdir}/clientrc.tcl" - } -} - -if {[file readable "~/.clientrc.tcl"]} { - source "~/.clientrc.tcl" -} - -set queryButtonsFind [lindex $queryButtons 0] -set queryInfoFind [lindex $queryInfo 0] proc top-down-window {w} { frame $w.top -relief raised -border 1 @@ -653,7 +722,7 @@ proc popup-license {} { top-down-window $w - text $w.top.t -width 80 -height 10 -wrap word \ + text $w.top.t -width 80 -height 10 -wrap word -relief flat -borderwidth 0 \ -yscrollcommand [list $w.top.s set] scrollbar $w.top.s -command [list $w.top.t yview] @@ -786,7 +855,7 @@ proc popup-marc {sno no b df} { pack $w.top -side top -fill both -expand yes pack $w.bot -fill both - text $w.top.record -width 60 -height 5 -wrap word \ + text $w.top.record -width 60 -height 5 -wrap word -relief flat -borderwidth 0 \ -yscrollcommand [list $w.top.s set] scrollbar $w.top.s -command [list $w.top.record yview] @@ -934,22 +1003,30 @@ proc define-target-action {} { } foreach n [array names profile] { if {$n == $target} { + destroy .target-define protocol-setup $n return } } set seq [lindex $profile(Default) 12] dputs "seq=${seq}" + dputs $profile(Default) set profile($target) $profile(Default) set profile(Default) [lreplace $profile(Default) 12 12 [incr seq]] - + protocol-setup $target destroy .target-define } proc fail-response {target} { + global debugMode + set c [lindex [z39 failInfo] 0] set m [lindex [z39 failInfo] 1] + if {$c == 4 || $c == 5} { + set debugMode 1 + apduDump + } close-target tkerror "$m ($c)" } @@ -963,6 +1040,7 @@ proc connect-response {target base} { proc open-target {target base} { global profile global hostid + global presentChunk z39 disconnect z39 comstack [lindex $profile($target) 6] @@ -980,6 +1058,29 @@ proc open-target {target base} { } else { z39 databaseNames $base } + set x [lindex $profile($target) 13] + if {$x == ""} { + set x 2 + } + z39 largeSetLowerBound $x + + set x [lindex $profile($target) 14] + if {$x == ""} { + set x 0 + } + z39 smallSetUpperBound $x + + set x [lindex $profile($target) 15] + if {$x == ""} { + set x 0 + } + z39 mediumSetPresentNumber $x + + set presentChunk [lindex $profile($target) 16] + if {$presentChunk == ""} { + set presentChunk 4 + } + z39 failback [list fail-response $target] z39 callback [list connect-response $target $base] update idletasks @@ -1085,6 +1186,7 @@ proc init-response {} { global scanEnable dputs {init-reponse} + apduDump if {$cancelFlag} { close-target return @@ -1164,8 +1266,12 @@ proc search-request {bflag} { } if {$elementSetNames == "None" } { z39.$setNo elementSetNames {} + z39.$setNo smallSetElementSetNames {} + z39.$setNo mediumSetElementSetNames {} } else { z39.$setNo elementSetNames $elementSetNames + z39.$setNo smallSetElementSetNames $elementSetNames + z39.$setNo mediumSetElementSetNames $elementSetNames } z39 callback {search-response} z39.$setNo search $query @@ -1282,6 +1388,7 @@ proc scan-response {attr start toget} { set w .scan-window dputs "In scan-response" + apduDump set m [z39.scan numberOfEntriesReturned] dputs $m dputs attr=$attr @@ -1450,7 +1557,9 @@ proc search-response {} { global cancelFlag global busy global delayRequest + global presentChunk + apduDump dputs "In search-response" if {$cancelFlag} { dputs "Handling cancel" @@ -1490,9 +1599,18 @@ proc search-response {} { dputs "Returned $no records, setOffset $setOffset" add-title-lines $setNo $no $setOffset set setOffset [expr $setOffset + $no] - z39 callback {present-response} - z39.$setNo present $setOffset 1 - show-status Retrieving 1 0 + + set toGet [expr $setMax - $setOffset + 1] + if {$toGet > 0} { + if {$setOffset == 1} { + set toGet 1 + } elseif {$toGet > $presentChunk} { + set toGet $presentChunk + } + z39 callback {present-response} + z39.$setNo present $setOffset $toGet + show-status Retrieving 1 0 + } } proc present-more {number} { @@ -1502,6 +1620,7 @@ proc present-more {number} { global busy global cancelFlag global delayRequest + global presentChunk dputs "present-more" if {$cancelFlag} { @@ -1539,8 +1658,8 @@ proc present-more {number} { if {$toGet <= 0} { return } - if {$toGet > 3} { - set toGet 3 + if {$toGet > $presentChunk} { + set toGet $presentChunk } z39.$setNo present $setOffset $toGet show-status Retrieving 1 0 @@ -1556,12 +1675,14 @@ proc add-title-lines {setno no offset} { global setNo global busy + dputs "add-title-lines offset=${offset} no=${no}" if {$setno != -1} { set setNo $setno } else { set setno $setNo } if {$offset == 1} { + .bot.a.set configure -text $setno .data.record delete 0.0 end } @@ -1572,6 +1693,7 @@ proc add-title-lines {setno no offset} { set o [expr $i + $offset] set type [z39.$setno type $o] if {$type == ""} { + dputs "no more at $o" break } .data.record tag bind r$o {} @@ -1594,8 +1716,10 @@ proc present-response {} { global setMax global cancelFlag global delayRequest + global presentChunk dputs "In present-response" + apduDump set no [z39.$setNo numberOfRecordsReturned] dputs "Returned $no records, setOffset $setOffset" add-title-lines $setNo $no $setOffset @@ -1620,8 +1744,8 @@ proc present-response {} { if {$no > 0 && $setOffset <= $setMax} { dputs "present-request from ${setOffset}" set toGet [expr $setMax - $setOffset + 1] - if {$toGet > 3} { - set toGet 3 + if {$toGet > $presentChunk} { + set toGet $presentChunk } z39.$setNo present $setOffset $toGet } else { @@ -1717,18 +1841,14 @@ definition $target ?"] proc protocol-setup-action {target w} { global profile - global csRadioType - global protocolRadioType global settingsChanged - global RPNCheck - global CCLCheck - global ResultSetCheck + global targetS - set b {} + set dataBases {} set settingsChanged 1 set len [$w.top.databases.list size] for {set i 0} {$i < $len} {incr i} { - lappend b [$w.top.databases.list get $i] + lappend dataBases [$w.top.databases.list get $i] } set wno [lindex $profile($target) 12] @@ -1736,15 +1856,19 @@ proc protocol-setup-action {target w} { [$w.top.host.entry get] \ [$w.top.port.entry get] \ [$w.top.idAuthentication.entry get] \ - [$w.top.maximumRecordSize.entry get] \ - [$w.top.preferredMessageSize.entry get] \ - $csRadioType \ - $b \ - $RPNCheck \ - $CCLCheck \ - $ResultSetCheck \ - $protocolRadioType \ - $wno] + $targetS($target,MRS) \ + $targetS($target,PMS) \ + $targetS($target,csType) \ + $dataBases \ + $targetS($target,RPN) \ + $targetS($target,CCL) \ + $targetS($target,ResultSets) \ + $targetS($target,protocolType) \ + $wno \ + $targetS($target,LSLB) \ + $targetS($target,SSUB) \ + $targetS($target,MSPN) \ + $targetS($target,presentChunk) ] cascade-target-list delete-target-hotlist $target @@ -1813,17 +1937,13 @@ proc delete-database {target w} { proc protocol-setup {target} { global profile - global csRadioType - global protocolRadioType - global RPNCheck - global CCLCheck - global ResultSetCheck + global targetS - set b 0 - while {[winfo exists .setup-$b]} { - incr b + set bno 0 + while {[winfo exists .setup-$bno]} { + incr bno } - set w .setup-$b + set w .setup-$bno toplevelG $w @@ -1841,8 +1961,6 @@ proc protocol-setup {target} { frame $w.top.host frame $w.top.port frame $w.top.idAuthentication - frame $w.top.maximumRecordSize - frame $w.top.preferredMessageSize frame $w.top.cs-type -relief ridge -border 2 frame $w.top.protocol -relief ridge -border 2 frame $w.top.query -relief ridge -border 2 @@ -1850,17 +1968,13 @@ proc protocol-setup {target} { # Maximum/preferred/idAuth ... pack $w.top.description $w.top.host $w.top.port \ - $w.top.idAuthentication $w.top.maximumRecordSize \ - $w.top.preferredMessageSize -side top -anchor e -pady 2 + $w.top.idAuthentication -side top -anchor e -pady 2 - entry-fields $w.top {description host port idAuthentication \ - maximumRecordSize preferredMessageSize} \ - {{Description:} {Host:} {Port:} {Id Authentication:} \ - {Maximum Record Size:} {Preferred Message Size:}} \ + entry-fields $w.top {description host port idAuthentication } \ + {{Description:} {Host:} {Port:} {Id Authentication:}} \ [list protocol-setup-action $target $w] [list destroy $w] - foreach sub {description host port idAuthentication \ - maximumRecordSize preferredMessageSize} { + foreach sub {description host port idAuthentication} { dputs $sub bind $w.top.$sub.entry [list add-database $target $w] bind $w.top.$sub.entry [list delete-database $target $w] @@ -1869,17 +1983,20 @@ proc protocol-setup {target} { $w.top.host.entry insert 0 [lindex $profile($target) 1] $w.top.port.entry insert 0 [lindex $profile($target) 2] $w.top.idAuthentication.entry insert 0 [lindex $profile($target) 3] - $w.top.maximumRecordSize.entry insert 0 [lindex $profile($target) 4] - $w.top.preferredMessageSize.entry insert 0 [lindex $profile($target) 5] - set csRadioType [lindex $profile($target) 6] - set RPNCheck [lindex $profile($target) 8] - set CCLCheck [lindex $profile($target) 9] - set ResultSetCheck [lindex $profile($target) 10] - set protocolRadioType [lindex $profile($target) 11] - if {$protocolRadioType == ""} { - set protocolRadioType Z39 - } - + set targetS($target,csType) [lindex $profile($target) 6] + set targetS($target,RPN) [lindex $profile($target) 8] + set targetS($target,CCL) [lindex $profile($target) 9] + set targetS($target,ResultSets) [lindex $profile($target) 10] + set targetS($target,protocolType) [lindex $profile($target) 11] + if {$targetS($target,protocolType) == ""} { + set targetS($target,protocolType) Z39 + } + set targetS($target,LSLB) [lindex $profile($target) 13] + set targetS($target,SSUB) [lindex $profile($target) 14] + set targetS($target,MSPN) [lindex $profile($target) 15] + set targetS($target,presentChunk) [lindex $profile($target) 16] + set targetS($target,MRS) [lindex $profile($target) 4] + set targetS($target,PMS) [lindex $profile($target) 5] # Databases .... pack $w.top.databases -side left -pady 2 -padx 2 -expand yes -fill both @@ -1915,9 +2032,9 @@ proc protocol-setup {target} { label $w.top.cs-type.label -text "Transport" radiobutton $w.top.cs-type.tcpip -text "TCP/IP" -anchor w \ - -variable csRadioType -value tcpip + -variable targetS($target,csType) -value tcpip radiobutton $w.top.cs-type.mosi -text "MOSI" -anchor w\ - -variable csRadioType -value mosi + -variable targetS($target,csType) -value mosi pack $w.top.cs-type.label $w.top.cs-type.tcpip $w.top.cs-type.mosi \ -padx 2 -side top -fill x @@ -1927,9 +2044,9 @@ proc protocol-setup {target} { label $w.top.protocol.label -text "Protocol" radiobutton $w.top.protocol.z39v2 -text "Z39.50" -anchor w \ - -variable protocolRadioType -value Z39 + -variable targetS($target,protocolType) -value Z39 radiobutton $w.top.protocol.sr -text "SR" -anchor w \ - -variable protocolRadioType -value SR + -variable targetS($target,protocolType) -value SR pack $w.top.protocol.label $w.top.protocol.z39v2 $w.top.protocol.sr \ -padx 2 -side top -fill x @@ -1938,9 +2055,12 @@ proc protocol-setup {target} { pack $w.top.query -pady 2 -padx 2 -side top -fill x label $w.top.query.label -text "Query support" - checkbutton $w.top.query.c1 -text "RPN query" -anchor w -variable RPNCheck - checkbutton $w.top.query.c2 -text "CCL query" -anchor w -variable CCLCheck - checkbutton $w.top.query.c3 -text "Result sets" -anchor w -variable ResultSetCheck + checkbutton $w.top.query.c1 -text "RPN query" -anchor w \ + -variable targetS($target,RPN) + checkbutton $w.top.query.c2 -text "CCL query" -anchor w \ + -variable targetS($target,CCL) + checkbutton $w.top.query.c3 -text "Result sets" -anchor w \ + -variable targetS($target,ResultSets) pack $w.top.query.label -side top pack $w.top.query.c1 $w.top.query.c2 $w.top.query.c3 \ @@ -1949,9 +2069,74 @@ proc protocol-setup {target} { # Ok-cancel bottom-buttons $w [list {Ok} [list protocol-setup-action $target $w] \ {Delete} [list protocol-setup-delete $target $w] \ + {Advanced} [list advanced-setup $target $bno] \ {Cancel} [list destroy $w]] 0 } + +proc advanced-setup {target b} { + global profile + global targetS + + set w .advanced-setup-$b + + toplevelG $w + + wm title $w "Advanced setup $target" + + top-down-window $w + + if {$target == ""} { + set target Default + } + dputs target + + frame $w.top.largeSetLowerBound + frame $w.top.smallSetUpperBound + frame $w.top.mediumSetPresentNumber + frame $w.top.presentChunk + frame $w.top.maximumRecordSize + frame $w.top.preferredMessageSize + + pack $w.top.largeSetLowerBound $w.top.smallSetUpperBound \ + $w.top.mediumSetPresentNumber $w.top.presentChunk \ + $w.top.maximumRecordSize $w.top.preferredMessageSize \ + -side top -anchor e -pady 2 + + entry-fields $w.top {largeSetLowerBound smallSetUpperBound \ + mediumSetPresentNumber presentChunk maximumRecordSize \ + preferredMessageSize} \ + {{Large Set Lower Bound:} {Small Set Upper Bound:} \ + {Medium Set Present Number:} {Present Chunk:} \ + {Maximum Record Size:} {Preferred Message Size:}} \ + [list advanced-setup-action $target $b] [list destroy $w] + + $w.top.largeSetLowerBound.entry insert 0 $targetS($target,LSLB) + $w.top.smallSetUpperBound.entry insert 0 $targetS($target,SSUB) + $w.top.mediumSetPresentNumber.entry insert 0 $targetS($target,MSPN) + $w.top.presentChunk.entry insert 0 $targetS($target,presentChunk) + $w.top.maximumRecordSize.entry insert 0 $targetS($target,MRS) + $w.top.preferredMessageSize.entry insert 0 $targetS($target,PMS) + + bottom-buttons $w [list {Ok} [list advanced-setup-action $target $b] \ + {Cancel} [list destroy $w]] 0 +} + +proc advanced-setup-action {target b} { + set w .advanced-setup-$b + global targetS + + set targetS($target,LSLB) [$w.top.largeSetLowerBound.entry get] + set targetS($target,SSUB) [$w.top.smallSetUpperBound.entry get] + set targetS($target,MSPN) [$w.top.mediumSetPresentNumber.entry get] + set targetS($target,presentChunk) [$w.top.presentChunk.entry get] + set targetS($target,MRS) [$w.top.maximumRecordSize.entry get] + set targetS($target,PMS) [$w.top.preferredMessageSize.entry get] + + dputs "advanced-setup-action" + destroy $w +} + proc database-select-action {} { set w .database-select.top set b {} @@ -2024,10 +2209,8 @@ proc cascade-target-list {} { } .top.target.m.slist delete 0 last foreach n [lsort [array names profile]] { - if {$n != "Default"} { - .top.target.m.slist add command -label $n \ - -command [list protocol-setup $n] - } + .top.target.m.slist add command -label $n \ + -command [list protocol-setup $n] } } @@ -2141,12 +2324,18 @@ proc save-geometry {} { global popupMarcdf global recordSyntax global elementSetNames + global hostid set windowGeometry(.) [wm geometry .] if {[catch {set f [open ~/.clientrc.tcl w]}]} { return } + if {$hostid != "Default"} { + puts $f "set hostid \{$hostid\}" + set b [z39 databaseNames] + puts $f "set hostbase $b" + } puts $f "set hotTargets \{ $hotTargets \}" puts $f "set textWrap $textWrap" puts $f "set displayFormat $displayFormat" @@ -3081,6 +3270,7 @@ menu .top.options.m .top.options.m add cascade -label "Wrap" -menu .top.options.m.wrap .top.options.m add cascade -label "Syntax" -menu .top.options.m.syntax .top.options.m add cascade -label "Elements" -menu .top.options.m.elements +.top.options.m add radiobutton -label "Debug" -variable debugMode -value 1 menu .top.options.m.query .top.options.m.query add cascade -label "Select" \ @@ -3169,7 +3359,7 @@ button .mid.clear -text Clear -command index-clear pack .mid.search .mid.scan .mid.present .mid.clear -side left \ -fill y -pady 1 -text .data.record -height 2 -width 20 -wrap none \ +text .data.record -height 2 -width 20 -wrap none -borderwidth 0 -relief flat \ -yscrollcommand [list .data.scroll set] -wrap $textWrap scrollbar .data.scroll -command [list .data.record yview] if {[tk4]} { @@ -3230,8 +3420,11 @@ if {[catch {ir z39}]} { ir z39 puts "ok" } -z39 largeSetLowerBound 20 -z39 smallSetUpperBound 2 -z39 mediumSetPresentNumber 2 -z39 logLevel all +#z39 logLevel all + +if {$hostid != "Default"} { + catch {open-target $hostid $hostbase} +} + show-logo 1 +