X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=formats%2Fmedium.tcl;h=cc22d03e425cac6e3af498a72c7f4ea9a0367ba1;hb=HEAD;hp=af10b317fb36a55042126af1c416d7040176320e;hpb=eaf7657a869339cc5e4b8523cfd431b035248c97;p=ir-tcl-moved-to-github.git

diff --git a/formats/medium.tcl b/formats/medium.tcl
index af10b31..cc22d03 100644
--- a/formats/medium.tcl
+++ b/formats/medium.tcl
@@ -4,7 +4,13 @@
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: medium.tcl,v $
-# Revision 1.13  1996-04-12 12:25:27  adam
+# Revision 1.15  1997-11-19 11:22:10  adam
+# Object identifiers can be accessed in GRS-1 records.
+#
+# 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 +54,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" {}
+            insertWithTags $w " \n" {}
+        }
+        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]
         }
-    }
-    if {[tk4]} {
-        $w tag configure indent$i \
-                -lmargin1 [expr $i * 10] \
-                -lmargin2 [expr $i * 10 + 5]
-        $w tag add indent$i $start insert
     }
 }
 
@@ -111,7 +120,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"
@@ -125,7 +133,7 @@ proc display-medium {sno no w hflag} {
         insertWithTags $w "Unknown record type: $rtype\n" marc-id
         return
     }
-    if {"x$i" != "x"} {
+    if {[llength $i]} {
         insertWithTags $w "Title " marc-pref
         insertWithTags $w [string trimright [lindex $i 0] /] marc-text
         set i [z39.$sno getMarc $no field 245 * b]
@@ -135,10 +143,10 @@ proc display-medium {sno no w hflag} {
         $w insert end "\n"
     }
     set i [z39.$sno getMarc $no field 700 * a]
-    if {"x$i" == "x"} {
+    if {![llength $i]} {
         set i [z39.$sno getMarc $no field 100 * a]
     }
-    if {"x$i" != "x"} {
+    if {[llength $i]} {
         if {[llength $i] > 1} {
             insertWithTags $w "Authors " marc-pref
         } else {
@@ -150,7 +158,7 @@ proc display-medium {sno no w hflag} {
         $w insert end "\n"
     }
     set i [z39.$sno getMarc $no field 110 * *]
-    if {"x$i" != "x"} {
+    if {[llength $i]} {
         insertWithTags $w "Co-Author " marc-pref
         foreach x $i {
             insertWithTags $w $x marc-text
@@ -159,7 +167,7 @@ proc display-medium {sno no w hflag} {
     }
 
     set i [z39.$sno getMarc $no field 650 * *]
-    if {"x$i" != "x"} {
+    if {[llength $i]} {
         set n 0
         insertWithTags $w "Keywords " marc-pref
         foreach x $i {
@@ -173,7 +181,7 @@ proc display-medium {sno no w hflag} {
     }
     set i [concat [z39.$sno getMarc $no field 260 * a] \
             [z39.$sno getMarc $no field 260 * b]]
-    if {"x$i" != "x"} {
+    if {[llength $i]} {
         insertWithTags $w "Publisher " marc-pref
         foreach x $i {
             insertWithTags $w $x marc-text
@@ -181,7 +189,7 @@ proc display-medium {sno no w hflag} {
         $w insert end "\n"
     }
     set i [z39.$sno getMarc $no field 020 * a]
-    if {"x$i" != "x"} {
+    if {[llength $i]} {
         insertWithTags $w "ISBN " marc-pref
         foreach x $i {
             insertWithTags $w $x marc-text
@@ -189,7 +197,7 @@ proc display-medium {sno no w hflag} {
         $w insert end "\n"
     }
     set i [z39.$sno getMarc $no field 022 * a]
-    if {"x$i" != "x"} {
+    if {[llength $i]} {
         insertWithTags $w "ISSN " marc-pref
         foreach x $i {
             insertWithTags $w $x marc-text
@@ -197,7 +205,7 @@ proc display-medium {sno no w hflag} {
         $w insert end "\n"
     }
     set i [z39.$sno getMarc $no field 030 * a]
-    if {"x$i" != "x"} {
+    if {[llength $i]} {
         insertWithTags $w "CODEN " marc-pref
         foreach x $i {
             insertWithTags $w $x marc-text
@@ -205,7 +213,7 @@ proc display-medium {sno no w hflag} {
         $w insert end "\n"
     }
     set i [z39.$sno getMarc $no field 015 * a]
-    if {"x$i" != "x"} {
+    if {[llength $i]} {
         insertWithTags $w "Ctl number " marc-pref
         foreach x $i {
             insertWithTags $w $x marc-text
@@ -213,7 +221,7 @@ proc display-medium {sno no w hflag} {
         $w insert end "\n"
     }
     set i [z39.$sno getMarc $no field 010 * a]
-    if {"x$i" != "x"} {
+    if {[llength $i]} {
         insertWithTags $w "LC number " marc-pref
         foreach x $i {
             insertWithTags $w $x marc-text
@@ -221,7 +229,7 @@ proc display-medium {sno no w hflag} {
         $w insert end "\n"
     }
     set i [z39.$sno getMarc $no field 710 * a]
-    if {"x$i" != "x"} {
+    if {[llength $i]} {
         insertWithTags $w "Corporate name " marc-pref
         foreach x $i {
             insertWithTags $w $x marc-text