X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=client.tcl;h=ebb18f16e8e60cf539bd22045db750cc1847f067;hb=600bbc839430064941f0e48ec2be3588eb5ec84a;hp=f4c37c8dac75a595888cdf2e8ef3ce5c33fc393b;hpb=aa30eee6a1b9d8b08982965c7235ba3b806e94b9;p=ir-tcl-moved-to-github.git

diff --git a/client.tcl b/client.tcl
index f4c37c8..ebb18f1 100644
--- a/client.tcl
+++ b/client.tcl
@@ -1,6 +1,16 @@
 #
 # $Log: client.tcl,v $
-# Revision 1.30  1995-06-06 11:35:41  adam
+# Revision 1.33  1995-06-09 11:17:35  adam
+# Start work on geometry management.
+#
+# Revision 1.32  1995/06/07  09:16:37  adam
+# New presentation format.
+#
+# Revision 1.31  1995/06/06  16:31:09  adam
+# Bug fix: target names couldn't contain blanks.
+# Bug fix: scan.
+#
+# Revision 1.30  1995/06/06  11:35:41  adam
 # Work on scan. Display of old sets.
 #
 # Revision 1.29  1995/06/05  14:11:18  adam
@@ -109,12 +119,33 @@ set setNo 0
 set cancelFlag 0
 set searchEnable 0
 set fullMarcSeq 0
+set displayFormat nice
 
 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}} } }
 
+set windowGeometry(.scan-window) {}
+
+proc destroyG {w} {
+    global windowGeometry
+    set windowGeometry($w) [wm geometry $w]
+    destroy $w
+}
+
+proc toplevelG {w} {
+    global windowGeometry
+
+    toplevel $w
+    if {[info exists windowGeometry($w)]} {
+        set g $windowGeometry($w)
+        if {$g != ""} {
+            wm geometry $w $g
+        }
+    }
+}
+
 wm minsize . 0 0
 
 if {[file readable "clientrc.tcl"]} {
@@ -139,7 +170,7 @@ proc top-down-ok-cancel {w ok-action g} {
             -command ${ok-action}
     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"
+            -command [list destroy $w]
     pack $w.bot.cancel -side left -expand yes    
 
     if {$g} {
@@ -262,10 +293,9 @@ proc insertWithTags {w text args} {
 proc about-target {} {
     set w .about-target-w
 
-    toplevel $w
+    toplevelG $w
 
     wm title $w "About target"
-    place-force $w .
     top-down-window $w
 
     set i [z39 targetImplementationName]
@@ -279,13 +309,13 @@ proc about-target {} {
 
     pack $w.top.in $w.top.ii $w.top.iv $w.top.op -side top -anchor nw
 
-    bottom-buttons $w [list {Close} [list destroy $w]] 1
+    bottom-buttons $w [list {Close} [list destroyG $w]] 1
 }
 
 proc about-origin {} {
     set w .about-origin-w
 
-    toplevel $w
+    toplevelG $w
 
     wm title $w "About IrTcl"
     place-force $w .
@@ -298,11 +328,139 @@ proc about-origin {} {
 
     pack $w.top.in $w.top.ii -side top -anchor nw
 
-    bottom-buttons $w [list {Close} [list destroy $w]] 1
+    bottom-buttons $w [list {Close} [list destroyG $w]] 1
+}
+
+proc display-raw {sno no w} {
+    $w delete 0.0 end
+    set r [z39.$sno getMarc $no list * * *]
+    foreach line $r {
+        set tag [lindex $line 0]
+        set indicator [lindex $line 1]
+        set fields [lindex $line 2]
+        
+        if {$indicator != ""} {
+            insertWithTags $w "$tag $indicator" marc-tag
+        } else {
+            insertWithTags $w "$tag    " marc-tag
+        }
+        foreach field $fields {
+            set id [lindex $field 0]
+            set data [lindex $field 1]
+            if {$id != ""} {
+                insertWithTags $w " $id " marc-id
+            }
+            set start [$w index insert]
+            insertWithTags $w $data {}
+        }
+        $w insert end "\n"
+    }
+}
+
+proc display-nice {sno no w} {
+    $w delete 0.0 end
+    set i [z39.$sno getMarc $no field 245 * a]
+    if {$i != ""} {
+        set i [lindex $i 0]
+        insertWithTags $w "Title:      " marc-tag
+        insertWithTags $w $i marc-data
+        set i [z39.$sno getMarc $no field 245 * b]
+        if {$i != ""} {
+            insertWithTags $w [lindex $i 0] marc-data
+        }
+        $w insert end "\n"
+    }
+    set i [z39.$sno getMarc $no field 700 * a]
+    if {$i == ""} {
+        set i [z39.$sno getMarc $no field 100 * a]
+    }
+    if {$i != ""} {
+        if {[llength $i] > 1} {
+            insertWithTags $w "Authors:    " marc-tag
+        } else {
+            insertWithTags $w "Author:     " marc-tag
+        }
+        foreach x $i {
+            insertWithTags $w $x marc-data
+        }
+        $w insert end "\n"
+    }
+    set i [z39.$sno getMarc $no field 110 * *]
+    if {$i != ""} {
+        insertWithTags $w "Co-Author:  " marc-tag
+        foreach x $i {
+            insertWithTags $w $x marc-data
+        }
+        $w insert end "\n"
+    }
+
+    set i [z39.$sno getMarc $no field 650 * *]
+    if {$i != ""} {
+        set n 0
+        insertWithTags $w "Keywords:   " marc-tag
+        foreach x $i {
+            if {$n > 0} {
+                $w insert end ", "
+            }
+            insertWithTags $w $x marc-data
+            incr n
+        }
+        $w insert end "\n"
+    }
+    set i [concat [z39.$sno getMarc $no field 260 * a] \
+            [z39.$sno getMarc $no field 260 * b]]
+    if {$i != ""} {
+        insertWithTags $w "Publisher:  " marc-tag
+        foreach x $i {
+            insertWithTags $w $x marc-data
+        }
+        $w insert end "\n"
+    }
+    set i [z39.$sno getMarc $no field 020 * a]
+    if {$i != ""} {
+        insertWithTags $w "ISBN:       " marc-tag
+        foreach x $i {
+            insertWithTags $w $x marc-data
+        }
+        $w insert end "\n"
+    }
+    set i [z39.$sno getMarc $no field 022 * a]
+    if {$i != ""} {
+        insertWithTags $w "ISSN:       " marc-tag
+        foreach x $i {
+            insertWithTags $w $x marc-data
+        }
+        $w insert end "\n"
+    }
+    set i [z39.$sno getMarc $no field 030 * a]
+    if {$i != ""} {
+        insertWithTags $w "CODEN:      " marc-tag
+        foreach x $i {
+            insertWithTags $w $x marc-data
+        }
+        $w insert end "\n"
+    }
+    set i [z39.$sno getMarc $no field 015 * a]
+    if {$i != ""} {
+        insertWithTags $w "Ctl number: " marc-tag
+        foreach x $i {
+            insertWithTags $w $x marc-data
+        }
+        $w insert end "\n"
+    }
+    set i [z39.$sno getMarc $no field 010 * a]
+    if {$i != ""} {
+        insertWithTags $w "LC number:  " marc-tag
+        foreach x $i {
+            insertWithTags $w $x marc-data
+        }
+        $w insert end "\n"
+    }
 }
 
 proc show-full-marc {sno no b} {
     global fullMarcSeq
+    global displayFormat
 
     if {[z39.$sno type $no] != "DB"} {
         return
@@ -314,11 +472,14 @@ proc show-full-marc {sno no b} {
         set w .full-marc
     }
     if {[winfo exists $w]} {
-        $w.top.record delete 0.0 end
         set new 0
     } else {
 
-        toplevel $w
+        if {$b} {
+            toplevel $w
+        } else {
+            toplevelG $w
+        }
 
         wm minsize $w 0 0
         
@@ -334,42 +495,28 @@ proc show-full-marc {sno no b} {
 
         set new 1
     }
-    set r [z39.$sno getMarc $no list * * *]
-
     $w.top.record tag configure marc-tag -foreground blue
     $w.top.record tag configure marc-data -foreground black
     $w.top.record tag configure marc-id -foreground red
 
-    foreach line $r {
-        set tag [lindex $line 0]
-        set indicator [lindex $line 1]
-        set fields [lindex $line 2]
-
-        if {$indicator != ""} {
-            insertWithTags $w.top.record "$tag $indicator" marc-tag
-        } else {
-            insertWithTags $w.top.record "$tag    " marc-tag
-        }
-        foreach field $fields {
-            set id [lindex $field 0]
-            set data [lindex $field 1]
-            if {$id != ""} {
-                insertWithTags $w.top.record " $id " marc-id
-            }
-            set start [$w.top.record index insert]
-            insertWithTags $w.top.record $data {}
-        }
-        $w.top.record insert end "\n"
+    if {$displayFormat == "nice"} {
+        display-nice $sno $no $w.top.record
+    } else {
+        display-raw $sno $no $w.top.record
     }
     if {$new} {
-        bind $w <Return> {destroy .full-marc}
+        bind $w.top.record <Return> {destroy .full-marc}
         
         pack $w.top.s -side right -fill y
         pack $w.top.record -expand yes -fill both
 
         bottom-buttons $w [list \
                 {Close} [list destroy $w] \
+                {Raw} [list display-raw $sno $no $w.top.record] \
                 {Duplicate} [list show-full-marc $sno $no 1]] 0
+    } else {
+        $w.bot.2 configure -command [list display-raw $sno $no $w.top.record]
+        $w.bot.4 configure -command [list show-full-marc $sno $no 1]
     }
 }
 
@@ -394,7 +541,7 @@ proc set-target-hotlist {} {
     set i 1
     foreach target $hotTargets {
         .top.target.m add command -label "$i $target" -command \
-                "reopen-target $target {}"
+                [list reopen-target $target {}]
         incr i
         if {$i > 8} {
              break
@@ -410,7 +557,7 @@ proc reopen-target {target base} {
 
 proc define-target-action {} {
     global profile
-
+    
     set target [.target-define.top.target.entry get]
     if {$target == ""} {
         return
@@ -422,7 +569,11 @@ proc define-target-action {} {
             return
         }
     }
+    set seq [lindex $profile(Default) 12]
+    puts "seq=${seq}"
     set profile($target) $profile(Default)
+    set profile(Default) [lreplace $profile(Default) 12 12 [incr seq]]
+
     protocol-setup $target
     destroy .target-define
 }
@@ -492,8 +643,6 @@ proc load-set-action {} {
     set fname [.load-set.top.filename.entry get]
     destroy .load-set
     if {$fname != ""} {
-        init-title-lines
-
         show-status {Loading} 1 {}
         z39.$setNo loadFile $fname
 
@@ -609,7 +758,7 @@ proc scan-request {attr} {
     ir-scan z39.scan z39
 
     if {![winfo exists $w]} {
-        toplevel $w
+        toplevelG $w
         
         wm title $w "Scan"
         
@@ -632,14 +781,14 @@ proc scan-request {attr} {
             pack $w.top.list -side left -fill both -expand yes
         }
         
-        bottom-buttons $w [list {Close} [list destroy $w] \
+        bottom-buttons $w [list {Close} [list destroyG $w] \
                 {Up} [list scan-up $attr] \
                 {Down} [list scan-down $attr]] 0
         bind $w.top.list <Up> [list scan-up $attr]
         bind $w.top.list <Down> [list scan-down $attr]
     }
     focus $w.top.entry
-    z39 callback [list scan-response $attr 0 25]
+    z39 callback [list scan-response $attr 0 35]
     z39.scan numberOfTermsRequested 5
     z39.scan preferredPositionInResponse 1
     z39.scan scan "${attr} 0"
@@ -660,10 +809,9 @@ proc scan-term-h {attr} {
         return
     }
     set scanTerm $nScanTerm
-    z39 callback [list scan-response $attr 0 25]
+    z39 callback [list scan-response $attr 0 35]
     z39.scan numberOfTermsRequested 5
     z39.scan preferredPositionInResponse 1
-    $w.top.list delete 0 end
     puts "${attr} \{${scanTerm}\}"
     if {$scanTerm == ""} {
         z39.scan scan "${attr} 0"
@@ -676,6 +824,7 @@ proc scan-term-h {attr} {
 proc scan-response {attr start toget} {
     global cancelFlag
     global scanTerm
+    global scanView
 
     set w .scan-window
     puts "In scan-response"
@@ -692,11 +841,10 @@ proc scan-response {attr start toget} {
     }
     set nScanTerm [$w.top.entry get]
     if {$nScanTerm != $scanTerm} {
-        z39 callback [list scan-response $attr 0 25]
+        z39 callback [list scan-response $attr 0 35]
         z39.scan numberOfTermsRequested 5
         z39.scan preferredPositionInResponse 1
         set scanTerm $nScanTerm
-        $w.top.list delete 0 end
         puts "${attr} \{${scanTerm}\}"
         if {$scanTerm == ""} {
             z39.scan scan "${attr} 0"
@@ -704,6 +852,14 @@ proc scan-response {attr start toget} {
             z39.scan scan "${attr} \{${scanTerm}\}"
         }
         show-status {Scan} 1 0
+        return
+    }
+    set status [z39.scan scanStatus]
+    if {$status == 6} {
+        tkerror "Scan fail"
+        show-status {Ready} 0 1
+        set cancelFlag 0
+        return
     }
     if {$toget < 0} {
         for {set i 0} {$i < $m} {incr i} {
@@ -711,6 +867,8 @@ proc scan-response {attr start toget} {
             set nostr [format " %-6d" [lindex [z39.scan scanLine $i] 2]]
             $w.top.list insert $i "$nostr $term"
         }
+        incr scanView $m
+        $w.top.list yview $scanView
     } else {
         $w.top.list delete $start end
         for {set i 0} {$i < $m} {incr i} {
@@ -767,7 +925,7 @@ proc scan-down {attr} {
     set scanView [expr $scanView + 5]
     set s [$w.top.list size]
     if {$scanView > $s} {
-        z39 callback [list scan-response $attr [expr $s - 1] 30]
+        z39 callback [list scan-response $attr [expr $s - 1] 25]
         set q [string range [$w.top.list get [expr $s - 1]] 8 end]
         puts "down: $q"
         z39.scan numberOfTermsRequested 10
@@ -784,8 +942,9 @@ proc scan-up {attr} {
     global scanView
 
     set w .scan-window
-    if {$scanView < 5} {
-        z39 callback [list scan-response $attr 0 -30]
+    set scanView [expr $scanView - 5]
+    if {$scanView < 0} {
+        z39 callback [list scan-response $attr 0 -25]
         set q [string range [$w.top.list get 0] 8 end]
         puts "up: $q"
         z39.scan numberOfTermsRequested 10
@@ -794,7 +953,6 @@ proc scan-up {attr} {
         z39.scan scan "${attr} \{$q\}"
         return
     }
-    set scanView [expr $scanView - 5]
     $w.top.list yview $scanView
 }
 
@@ -884,9 +1042,11 @@ proc title-press {y setno} {
 
 proc add-title-lines {setno no offset} {
     if {$offset == 1} {
+        .bot.a.set configure -text $setno
         .data.list delete 0 end
     }
     bind .data.list <Double-Button-1> [list title-press %y $setno]
+    bind .data.list <Button-2> [list title-press %y $setno]
     for {set i 0} {$i < $no} {incr i} {
         set o [expr $i + $offset]
         set type [z39.$setno type $o]
@@ -1016,32 +1176,32 @@ proc protocol-setup-action {target} {
     global CCLCheck
     global ResultSetCheck
 
-    set w .setup-${target}.top
-
-    #set w .protocol-setup.top
+    set wno [lindex $profile($target) 12]
+    set w .setup-${wno}
     
     set b {}
     set settingsChanged 1
-    set len [$w.databases.list size]
+    set len [$w.top.databases.list size]
     for {set i 0} {$i < $len} {incr i} {
-        lappend b [$w.databases.list get $i]
-    }
-    set profile($target) [list [$w.description.entry get] \
-            [$w.host.entry get] \
-            [$w.port.entry get] \
-            [$w.idAuthentication.entry get] \
-            [$w.maximumRecordSize.entry get] \
-            [$w.preferredMessageSize.entry get] \
+        lappend b [$w.top.databases.list get $i]
+    }
+    set profile($target) [list [$w.top.description.entry get] \
+            [$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 ]
+            $protocolRadioType \
+            $wno]
 
     cascade-target-list
     puts $profile($target)
-    destroy .setup-${target}
+    destroyG $w
 }
 
 proc place-force {window parent} {
@@ -1056,20 +1216,26 @@ proc place-force {window parent} {
 }
 
 proc add-database-action {target} {
-    set w .setup-${target}
-    
-    ${w}.top.databases.list insert end \
+    global profile
+
+    set wno [lindex $profile($target) 12]
+    set w .setup-${wno}
+
+    $w.top.databases.list insert end \
             [.database-select.top.database.entry get]
     destroy .database-select
 }
 
 proc add-database {target} {
+    global profile
+
     set w .database-select
 
     set oldFocus [focus]
     toplevel $w
-
-    place-force $w .setup-${target}
+ 
+    set wno [lindex $profile($target) 12]
+    place-force $w .setup-${wno}
 
     top-down-window $w
 
@@ -1086,8 +1252,11 @@ proc add-database {target} {
 }
 
 proc delete-database {target} {
-    set w .setup-${target}
-    
+    global profile
+
+    set wno [lindex $profile($target) 12]
+    set w .setup-${wno}
+
     foreach i [lsort -decreasing \
             [$w.top.databases.list curselection]] {
         $w.top.databases.list delete $i
@@ -1095,8 +1264,6 @@ proc delete-database {target} {
 }
 
 proc protocol-setup {target} {
-    set w .setup-$target
-
     global profile
     global csRadioType
     global protocolRadioType
@@ -1104,10 +1271,12 @@ proc protocol-setup {target} {
     global CCLCheck
     global ResultSetCheck
 
-    toplevel $w
+    set wno [lindex $profile($target) 12]
+    set w .setup-${wno}
+
+    toplevelG $w
 
     wm title $w "Setup $target"
-    place-force $w .
 
     top-down-window $w
     
@@ -1137,13 +1306,13 @@ proc protocol-setup {target} {
             maximumRecordSize preferredMessageSize} \
             {{Description:} {Host:} {Port:} {Id Authentication:} \
             {Maximum Record Size:} {Preferred Message Size:}} \
-            [list protocol-setup-action $target] [list destroy $w]
+            [list protocol-setup-action $target] [list destroyG $w]
     
     foreach sub {description host port idAuthentication \
             maximumRecordSize preferredMessageSize} {
         puts $sub
-        bind $w.top.$sub.entry <Control-a> "add-database $target"
-        bind $w.top.$sub.entry <Control-d> "delete-database $target"
+        bind $w.top.$sub.entry <Control-a> [list add-database $target]
+        bind $w.top.$sub.entry <Control-d> [list delete-database $target]
     }
     $w.top.description.entry insert 0 [lindex $profile($target) 0]
     $w.top.host.entry insert 0 [lindex $profile($target) 1]
@@ -1165,9 +1334,9 @@ proc protocol-setup {target} {
 
     label $w.top.databases.label -text "Databases"
     button $w.top.databases.add -text "Add" \
-            -command "add-database $target"
+            -command [list add-database $target]
     button $w.top.databases.delete -text "Delete" \
-            -command "delete-database $target"
+            -command [list delete-database $target]
     listbox $w.top.databases.list -geometry 20x6 \
             -yscrollcommand "$w.top.databases.scroll set"
     scrollbar $w.top.databases.scroll -orient vertical -border 1
@@ -1222,7 +1391,9 @@ proc protocol-setup {target} {
             -padx 4 -side top -fill x
 
     # Ok-cancel
-    top-down-ok-cancel $w [list protocol-setup-action $target] 0
+    bottom-buttons $w [list {Ok} [list protocol-setup-action $target] \
+            {Cancel} [list destroyG $w]] 0   
+#    top-down-ok-cancel $w [list protocol-setup-action $target] 0
 }
 
 proc database-select-action {} {
@@ -1287,11 +1458,11 @@ proc cascade-target-list {} {
                 menu .top.target.m.clist.$nl
                 foreach b [lindex $profile($n) 7] {
                     .top.target.m.clist.$nl add command -label $b \
-                            -command "reopen-target $n $b"
+                            -command [list reopen-target $n $b]
                 }
             } else {
                 .top.target.m.clist add command -label $n \
-                        -command "reopen-target $n {}"
+                        -command [list reopen-target $n {}]
             }
         }
     }
@@ -1299,7 +1470,7 @@ proc cascade-target-list {} {
     foreach n [array names profile] {
         if {$n != "Default"} {
             .top.target.m.slist add command -label $n \
-                    -command "protocol-setup $n"
+                    -command [list protocol-setup $n]
         }
     }
 }
@@ -1332,12 +1503,14 @@ proc save-settings {} {
     global queryButtons
     global queryInfo
 
+    destroyG .
+
     set f [open "clientrc.tcl" w]
     puts $f "# Setup file"
     puts $f "set hotTargets \{ $hotTargets \}"
 
     foreach n [array names profile] {
-        puts -nonewline $f "set profile($n) \{"
+        puts -nonewline $f "set \{profile($n)\} \{"
         puts -nonewline $f $profile($n)
         puts $f "\}"
     }
@@ -1770,6 +1943,13 @@ proc search-fields {w buttondefs} {
     $w.0 configure -background red
 }
 
+if {[info exists windowGeometry(.w)]} {
+    set g $windowGeometry(.w)
+    if {$g != ""} {
+        wm geometry .w $g
+    }
+}    
+
 frame .top  -border 1 -relief raised
 frame .lines  -border 1 -relief raised
 frame .mid  -border 1 -relief raised
@@ -1849,7 +2029,7 @@ index-lines .lines 1 $queryButtonsFind [lindex $queryInfo 0] activate-index
 button .mid.search -width 7 -text {Search} -command search-request \
         -state disabled
 button .mid.scan -width 7 -text {Scan} \
-        -command [list scan-request "@attr 1=4"] -state disabled 
+        -command [list scan-request "@attr 1=4 @attr 5=1 @attr 4=1"] -state disabled 
 button .mid.present -width 7 -text {Present} -command [list present-more 10] \
         -state disabled
 
@@ -1872,7 +2052,7 @@ 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.a.set -textvariable setNo -width 5 -relief \
+label .bot.a.set -text "" -width 5 -relief \
         sunken -anchor w -border 1
 label .bot.a.message -text "" -width 15 -relief \
         sunken -anchor w -border 1