Minor changes.

[ir-tcl-moved-to-github.git] / formats / line.tcl

diff --git a/formats/line.tcl b/formats/line.tcl
index a8f86b7..9c4b553 100644 (file)
--- a/formats/line.tcl
+++ b/formats/line.tcl
@@ -4,7 +4,17 @@
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: line.tcl,v $
-# Revision 1.10  1995-10-17 17:39:46  adam
+# Revision 1.13  1996-04-12 12:25:27  adam
+# Modified display of GRS-1 records to include headings for standard
+# tag sets.
+#
+# 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
 # Minor bug fix in call to display-grs-line.
 #
 # Revision 1.9  1995/10/17  14:18:09  adam
@@ -39,24 +49,45 @@
 #
 #
 proc display-grs-line {w r i} {
+    global tagSet
+    
+    if {[tk4]} {
+        set start [$w index insert]
+    }
     foreach e $r {
-        for {set j 0} {$j < $i} {incr j} {
-            insertWithTags $w "  " {}
+        if {![tk4]} {
+            for {set j 0} {$j < $i} {incr j} {
+                insertWithTags $w "  " 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" {}
-        } elseif {[lindex $e 3] == "subtree"} {
-            insertWithTags $w "\n" {}
-            display-grs-line $w [lindex $e 4] [expr $i+1]
+        set ttype [lindex $e 0]
+        set tval [lindex $e 2]
+        if {[info exists tagSet($ttype,$tval)]} {
+            insertWithTags $w "$tagSet($ttype,$tval) " marc-pref
         } else {
-            insertWithTags $w [lindex $e 4] {}
-            insertWithTags $w " ?\n" {}
+            insertWithTags $w "$tval " marc-pref
+        }
+        if {[lindex $e 3] == "string"} {
+            insertWithTags $w [lindex $e 4] marc-text
+            insertWithTags $w "\n"
+            break
         }
     }
+    if {[tk4]} {
+        $w tag configure indent$i \
+                -lmargin1 [expr $i * 10] \
+                -lmargin2 [expr $i * 10 + 5]
+        $w tag add indent$i $start insert
+    }
 }
 
+# Procedure display-line {sno no w hflag}
+#  sno    result set number (integer)
+#  no     record position (integer)
+#  w      text widget in which the record should be displayed.
+#  hflag  header flag. If true a header showing the record position
+#         should be displayed.
+# This procedure attempts to display records in a line-per-line format.
 proc display-line {sno no w hflag} {
     global monoFlag
     set type [z39.$sno type $no] 
@@ -83,7 +114,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 {