From 4196c86ac7f87f85aa20ca83dd1557ca2961fd39 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 29 Mar 1996 16:05:36 +0000 Subject: [PATCH] Bug fix: GRS records wasn't recognized. --- formats/line.tcl | 7 +++++-- formats/medium.tcl | 18 +++++++++++++++--- formats/raw.tcl | 7 +++++-- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/formats/line.tcl b/formats/line.tcl index 05bf2a5..21a4c2a 100644 --- a/formats/line.tcl +++ b/formats/line.tcl @@ -4,7 +4,10 @@ # Sebastian Hammer, Adam Dickmeiss # # $Log: line.tcl,v $ -# Revision 1.11 1996-01-23 15:24:21 adam +# Revision 1.12 1996-03-29 16:05:36 adam +# Bug fix: GRS records wasn't recognized. +# +# Revision 1.11 1996/01/23 15:24:21 adam # Wrore more comments. # # Revision 1.10 1995/10/17 17:39:46 adam @@ -94,7 +97,7 @@ proc display-line {sno no w hflag} { set rtype [z39.$sno recordType $no] if {$rtype == "SUTRS"} { insertWithTags $w [join [z39.$sno getSutrs $no]] - } elseif {$rtype == "GRS1"} { + } elseif {$rtype == "GRS-1"} { display-grs-line $w [z39.$sno getGrs $no] 0 } else { if {[catch { diff --git a/formats/medium.tcl b/formats/medium.tcl index 8170214..e2e3248 100644 --- a/formats/medium.tcl +++ b/formats/medium.tcl @@ -4,7 +4,10 @@ # Sebastian Hammer, Adam Dickmeiss # # $Log: medium.tcl,v $ -# Revision 1.11 1996-01-23 15:24:23 adam +# Revision 1.12 1996-03-29 16:05:36 adam +# Bug fix: GRS records wasn't recognized. +# +# Revision 1.11 1996/01/23 15:24:23 adam # Wrore more comments. # # Revision 1.10 1996/01/11 09:31:05 quinn @@ -39,11 +42,19 @@ # # proc display-grs-medium {w r i} { + global tagSet + foreach e $r { for {set j 0} {$j < $i} {incr j} { insertWithTags $w " " marc-tag } - insertWithTags $w "([lindex $e 0]:[lindex $e 2]) " marc-tag + set ttype [lindex $e 0] + set tval [lindex $e 2] + if {[info exists tagSet($ttype,$tval)]} { + insertWithTags $w "$tagSet($ttype,$tval) " marc-tag + } else { + insertWithTags $w "$tval " marc-tag + } if {[lindex $e 3] == "string"} { insertWithTags $w [lindex $e 4] {} insertWithTags $w "\n" @@ -85,12 +96,13 @@ 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" return } - if {$rtype == "GRS1"} { + if {$rtype == "GRS-1"} { display-grs-medium $w [z39.$sno getGrs $no] 0 return } diff --git a/formats/raw.tcl b/formats/raw.tcl index 33164ec..e9e4edc 100644 --- a/formats/raw.tcl +++ b/formats/raw.tcl @@ -4,7 +4,10 @@ # Sebastian Hammer, Adam Dickmeiss # # $Log: raw.tcl,v $ -# Revision 1.10 1996-01-23 15:24:24 adam +# 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 # Wrore more comments. # # Revision 1.9 1995/10/17 14:18:10 adam @@ -86,7 +89,7 @@ proc display-raw {sno no w hflag} { $w insert end "\n" return } - if {$rtype == "GRS1"} { + if {$rtype == "GRS-1"} { display-grs-raw $w [z39.$sno getGrs $no] 0 return } -- 1.7.10.4