Use 'line' instead of 'list' in MARC extraction.

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

diff --git a/formats/raw.tcl b/formats/raw.tcl
index 29534db..52fe8a7 100644 (file)
--- a/formats/raw.tcl
+++ b/formats/raw.tcl
@@ -4,19 +4,50 @@
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: raw.tcl,v $
-# Revision 1.2  1995-06-12 15:18:10  adam
+# Revision 1.5  1995-08-28 12:22:09  adam
+# Use 'line' instead of 'list' in MARC extraction.
+#
+# 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
 # Work on presentation formats. These are used in the main window as well
 # as popup windows.
 #
 #
-
 proc display-raw {sno no w hflag} {
     if {$hflag} {
         insertWithTags $w "\n$no\n" {}
     } 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 line * * *]}]} {
+        insertWithTags $w "Unknown record type: $rtype\n" marc-id
+        return
+    }
     foreach line $r {
         set tag [lindex $line 0]
         set indicator [lindex $line 1]
@@ -33,7 +64,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"