From c609a41570639d99b7498d27df619dcf8bccfcb4 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 12 Apr 1996 13:45:49 +0000 Subject: [PATCH] Minor changes. --- formats/medium.tcl | 35 ++++++++++++++++++++--------------- formats/raw.tcl | 7 +++++-- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/formats/medium.tcl b/formats/medium.tcl index af10b31..5f3aa33 100644 --- a/formats/medium.tcl +++ b/formats/medium.tcl @@ -4,7 +4,10 @@ # Sebastian Hammer, Adam Dickmeiss # # $Log: medium.tcl,v $ -# Revision 1.13 1996-04-12 12:25:27 adam +# Revision 1.14 1996-04-12 13:45:49 adam +# Minor changes. +# +# Revision 1.13 1996/04/12 12:25:27 adam # Modified display of GRS-1 records to include headings for standard # tag sets. # @@ -48,38 +51,41 @@ proc display-grs-medium {w r i} { global tagSet - if {[tk4]} { - set start [$w index insert] - } foreach e $r { - if {![tk4]} { + if {[tk4]} { + set start [$w index insert] + } else { for {set j 0} {$j < $i} {incr j} { insertWithTags $w " " marc-tag } } set ttype [lindex $e 0] set tval [lindex $e 2] - if {[info exists tagSet($ttype,$tval)]} { + if {$ttype == 3} { + insertWithTags $w "$tval " marc-pref + } elseif {[info exists tagSet($ttype,$tval)]} { insertWithTags $w "$tagSet($ttype,$tval) " marc-pref } else { - insertWithTags $w "$tval " marc-pref + insertWithTags $w "($ttype,$tval) " marc-tag } if {[lindex $e 3] == "string"} { insertWithTags $w [lindex $e 4] marc-text insertWithTags $w "\n" } elseif {[lindex $e 3] == "subtree"} { insertWithTags $w "\n" - display-grs-medium $w [lindex $e 4] [expr $i+1] } else { insertWithTags $w [lindex $e 4] {} insertWithTags $w " ?\n" {} } - } - if {[tk4]} { - $w tag configure indent$i \ - -lmargin1 [expr $i * 10] \ - -lmargin2 [expr $i * 10 + 5] - $w tag add indent$i $start insert + if {[tk4]} { + $w tag configure indent$i \ + -lmargin1 [expr $i * 16] \ + -lmargin2 [expr $i * 16 + 8] + $w tag add indent$i $start insert + } + if {[lindex $e 3] == "subtree"} { + display-grs-medium $w [lindex $e 4] [expr $i+1] + } } } @@ -111,7 +117,6 @@ proc display-medium {sno no w hflag} { return } set rtype [z39.$sno recordType $no] - puts $rtype if {$rtype == "SUTRS"} { insertWithTags $w [join [z39.$sno getSutrs $no]] {} $w insert end "\n" diff --git a/formats/raw.tcl b/formats/raw.tcl index e9e4edc..cf688e6 100644 --- a/formats/raw.tcl +++ b/formats/raw.tcl @@ -4,7 +4,10 @@ # Sebastian Hammer, Adam Dickmeiss # # $Log: raw.tcl,v $ -# Revision 1.11 1996-03-29 16:05:37 adam +# Revision 1.12 1996-04-12 13:45:50 adam +# Minor changes. +# +# Revision 1.11 1996/03/29 16:05:37 adam # Bug fix: GRS records wasn't recognized. # # Revision 1.10 1996/01/23 15:24:24 adam @@ -42,7 +45,7 @@ proc display-grs-raw {w r i} { for {set j 0} {$j < $i} {incr j} { insertWithTags $w " " {} } - insertWithTags $w "([lindex $e 0]:[lindex $e 2])" marc-tag + insertWithTags $w "([lindex $e 0],[lindex $e 2])" marc-tag if {[lindex $e 3] == "string"} { insertWithTags $w [lindex $e 4] {} insertWithTags $w "\n" {} -- 1.7.10.4