X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=formats%2Fraw.tcl;h=eefc5e7145f5b29dd9e4f501d88ab31d322cd334;hb=3fa224fe60438ccdc1465d548673d2692467fdee;hp=30a8ae8dfb13776460d80d8c0f33b28a95518a0a;hpb=006a42c7b0c5ef29e970b0b983e8975e3993460c;p=ir-tcl-moved-to-github.git

diff --git a/formats/raw.tcl b/formats/raw.tcl
index 30a8ae8..eefc5e7 100644
--- a/formats/raw.tcl
+++ b/formats/raw.tcl
@@ -4,7 +4,20 @@
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: raw.tcl,v $
-# Revision 1.3  1995-06-14 12:16:42  adam
+# Revision 1.7  1995-10-12 14:46:58  adam
+# The record position in the raw format is much more visible.
+#
+# Revision 1.6  1995/09/20  11:37:07  adam
+# Work on GRS.
+#
+# 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
@@ -12,13 +25,58 @@
 # as popup windows.
 #
 #
+proc display-grs-raw {w r i} {
+    foreach e $r {
+        for {set j 0} {$j < $i} {incr j} {
+            insertWithTags $w "  " {}
+        }
+        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-raw $w [lindex $e 4] [expr $i+1]
+        } else {
+            insertWithTags [lindex $e 4] {}
+            insertWithTags $w " ?\n" {}
+        }
+    }
+}
+
 proc display-raw {sno no w hflag} {
     if {$hflag} {
-        insertWithTags $w "\n$no\n" {}
+        insertWithTags $w "$no\n" marc-head
     } 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 {$rtype == "GRS1"} {
+        display-grs-raw $w [z39.$sno getGrs $no] 0
+        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]
@@ -35,7 +93,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"