Feature: SUTRS. Setting getSutrs implemented.

Work on display formats.

diff --git a/formats/line.tcl b/formats/line.tcl
index 4274de1..810b5fa 100644 (file)
--- a/formats/line.tcl
+++ b/formats/line.tcl
@@ -4,7 +4,11 @@
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: line.tcl,v $
-# Revision 1.4  1995-06-19 08:10:21  adam
+# Revision 1.5  1995-06-22 13:16:28  adam
+# Feature: SUTRS. Setting getSutrs implemented.
+# Work on display formats.
+#
+# Revision 1.4  1995/06/19  08:10:21  adam
 # Inverse highligt colours in monochrome mode.
 #
 # Revision 1.3  1995/06/16  12:29:00  adam
@@ -37,23 +41,29 @@ proc display-line {sno no w hflag} {
     } else {
         $w delete 0.0 end
     }
+    if {$hflag} {
+        set nostr [format "%5d " $no]
+        insertWithTags $w $nostr marc-tag
+    }
     if {$type == "DB"} {
-        if {$hflag} {
-            set nostr [format "%5d " $no]
-            insertWithTags $w $nostr marc-tag
+        set rtype [z39.$sno recordType $no]
+        if {$rtype == "SUTRS"} {
+            insertWithTags $w [join [z39.$sno getSutrs $no]]
+        } else {
+            if {[catch {
+                set title [lindex [z39.$sno getMarc $no field 245 * a] 0]
+                set year  [lindex [z39.$sno getMarc $no field 260 * c] 0]
+                insertWithTags $w "$title - $year\n" marc-data
+            }]} {
+                insertWithTags $w "Unknown record type: $rtype\n" marc-id
+            }
         }
-        set title [lindex [z39.$sno getMarc $no field 245 * a] 0]
-        set year  [lindex [z39.$sno getMarc $no field 260 * c] 0]
-        insertWithTags $w "$title - $year\n" marc-data
-        $w tag bind marc-data 
     } elseif {$type == "SD"} {
         set err [lindex [z39.$sno diag $no] 1]
         set add [lindex [z39.$sno diag $no] 2]
         if {$add != {}} {
             set add " :${add}"
         }
-        insertWithTags $w "Error ${err}${add}\n" marc-data
-    } elseif {$type == ""} {
-        return
-    }
+        insertWithTags $w "Error ${err}${add}\n" marc-id
+    } 
 }

diff --git a/formats/medium.tcl b/formats/medium.tcl
index 075eb7f..52ea4af 100644 (file)
--- a/formats/medium.tcl
+++ b/formats/medium.tcl
@@ -4,7 +4,11 @@
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: medium.tcl,v $
-# Revision 1.4  1995-06-14 12:16:42  adam
+# Revision 1.5  1995-06-22 13:16:29  adam
+# Feature: SUTRS. Setting getSutrs implemented.
+# Work on display formats.
+#
+# Revision 1.4  1995/06/14  12:16:42  adam
 # Minor presentation format changes.
 #
 # Revision 1.3  1995/06/13  14:39:06  adam
@@ -23,7 +27,29 @@ proc display-medium {sno no w hflag} {
     } else {
         $w delete 0.0 end
     }
-    set i [z39.$sno getMarc $no field 245 * a]
+    set type [z39.$sno type $no]
+    if {$type == "SD"} {
+        set err [lindex [z39.$sno diag $no] 1]
+        set add [lindex [z39.$sno diag $no] 2]
+        if {$add != {}} {
+            set add " :${add}"
+        }
+        insertWithTags $w "Error ${err}${add}\n" marc-id
+        return
+    }
+    if {$type != "DB"} {
+        return
+    }
+    set rtype [z39.$sno recordType $no]
+    if {$rtype == "SUTRS"} {
+        insertWithTags $w [join [z39.$sno getSutrs $no]] {}
+        $w insert end "\n"
+        return
+    } 
+    if {[catch {set i [z39.$sno getMarc $no field 245 * a]}]} {
+        insertWithTags $w "Unknown record type: $rtype\n" marc-id
+        return
+    }
     if {"x$i" != "x"} {
         insertWithTags $w "Title:      " marc-tag
         insertWithTags $w [string trimright [lindex $i 0] /] marc-data

diff --git a/formats/raw.tcl b/formats/raw.tcl
index 30a8ae8..453115a 100644 (file)
--- a/formats/raw.tcl
+++ b/formats/raw.tcl
@@ -4,7 +4,11 @@
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: raw.tcl,v $
-# Revision 1.3  1995-06-14 12:16:42  adam
+# Revision 1.4  1995-06-22 13:16:29  adam
+# Feature: SUTRS. Setting getSutrs implemented.
+# Work on display formats.
+#
+# Revision 1.3  1995/06/14  12:16:42  adam
 # Minor presentation format changes.
 #
 # Revision 1.2  1995/06/12  15:18:10  adam
@@ -18,7 +22,29 @@ proc display-raw {sno no w hflag} {
     } else {
         $w delete 0.0 end
     }
-    set r [z39.$sno getMarc $no list * * *]
+    set type [z39.$sno type $no]
+    if {$type == "SD"} {
+        set err [lindex [z39.$sno diag $no] 1]
+        set add [lindex [z39.$sno diag $no] 2]
+        if {$add != {}} {
+            set add " :${add}"
+        }
+        insertWithTags $w "Error ${err}${add}\n" marc-id
+        return
+    }
+    if {$type != "DB"} {
+        return
+    }
+    set rtype [z39.$sno recordType $no]
+    if {$rtype == "SUTRS"} {
+        insertWithTags $w [join [z39.$sno getSutrs $no]] {}
+        $w insert end "\n"
+        return
+    } 
+    if {[catch {set r [z39.$sno getMarc $no list * * *]}]} {
+        insertWithTags $w "Unknown record type: $rtype\n" marc-id
+        return
+    }
     foreach line $r {
         set tag [lindex $line 0]
         set indicator [lindex $line 1]
@@ -35,7 +61,6 @@ proc display-raw {sno no w hflag} {
             if {$id != ""} {
                 insertWithTags $w " $id " marc-id
             }
-            set start [$w index insert]
             insertWithTags $w $data {}
         }
         $w insert end "\n"