X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=explain.tcl;h=b827274ff5de63c17ae877ca15e2617680284495;hb=4ccc8ab7a1f708af5fd89c71771040eaf6e6da4a;hp=fce1604cd9406e620b23112a98f3574bf4aca225;hpb=82eb3636954f41a598430ddafcc21d168006d4a3;p=ir-tcl-moved-to-github.git

diff --git a/explain.tcl b/explain.tcl
index fce1604..b827274 100644
--- a/explain.tcl
+++ b/explain.tcl
@@ -6,7 +6,13 @@
 # Explain Driver
 #
 # $Log: explain.tcl,v $
-# Revision 1.4  1998-04-02 14:32:00  adam
+# Revision 1.6  1999-11-30 14:05:58  adam
+# Updated for new location of YAZ headers.
+#
+# Revision 1.5  1998/05/20 12:27:43  adam
+# Better Explain support.
+#
+# Revision 1.4  1998/04/02 14:32:00  adam
 # Minor changes to EXPLAIN driver.
 #
 # Revision 1.3  1998/02/12 13:32:42  adam
@@ -99,9 +105,6 @@ proc explain-check-5 {target zz category finish} {
     show-status Explaining 1 0
     show-message TargetInfo
 
-    if {![catch {set rec [z39.categoryList getExplain $no databaseInfo]}]} {
-	dputs $rec
-    }
     explain-search-request $target z39.targetInfo TargetInfo $finish \
             explain-check-10 explain-check-fail
 }
@@ -111,8 +114,17 @@ proc explain-check-5 {target zz category finish} {
 proc explain-check-10 {target zz category finish} {
     show-status Explaining 1 0
     show-message DatabaseInfo
-    explain-search-request $target z39.databaseInfo DatabaseInfo $finish \
-            explain-check-ok explain-check-fail
+    explain-search-request $target z39.databaseInfo DatabaseInfo \
+	$finish explain-check-15 explain-check-fail
+}
+
+# Procedure explain-check-15
+#  AttributeDetails
+proc explain-check-15 {target zz category finish} {
+    show-status Explaining 1 0
+    show-message AttributeDetails
+    explain-search-request $target z39.attributeDetails AttributeDetails \
+	$finish explain-check-ok explain-check-ok
 }
 
 # Proedure explain-check-fail
@@ -121,25 +133,51 @@ proc explain-check-fail {target zz category finish} {
     eval $finish [list $target]
 }
 
+proc prettyDump {x} {
+    foreach y $x {
+	prettyDumpR $y 0
+    }
+}
+
+proc prettyDumpR {x ind} {
+    for {set i 0} {$i < $ind} {incr i} {
+	puts -nonewline " "
+    }
+    set i 0
+    foreach y $x {
+	if {$i == 0} {
+	    if {![string compare $y text]} {
+		puts $x
+		return
+	    }
+	    puts $y
+	} else {
+	    prettyDumpR $y [expr $ind + 2]
+	}
+	incr i
+    }
+}
 
 # Procedure explain-check-ok
 proc explain-check-ok {target zz category finish} {
     global profile settingsChanged
 
-    set trec [z39.categoryList getExplain 1 categoryList]
-    puts "--- categoryList"
-    puts $trec
+    set crec [z39.categoryList getExplain 1 categoryList]
+    dputs "--- categoryList"
+    dputs $crec
+
+    set rec [z39.targetInfo getExplain 1]
 
     set trec [z39.targetInfo getExplain 1 targetInfo]
-    puts "--- targetInfo"
-    puts $trec
+    dputs "--- targetInfo"
+    dputs $rec
 
     set no 1
     while {1} {
         if {[catch {set rec \
                 [z39.databaseInfo getExplain $no databaseInfo]}]} break
-        puts "--- databaseInfo $no"
-        puts $rec
+        dputs "--- databaseInfo $no"
+	dputs $rec
 
         lappend dbRecs $rec
         set db [lindex [lindex $rec 1] 1]
@@ -151,7 +189,16 @@ proc explain-check-ok {target zz category finish} {
         set profile($target,databases) $dbList
     }
     cascade-target-list
-    
+
+
+    set no 1
+    while {1} {
+        if {[catch {set rec \
+                [z39.attributeDetails getExplain $no attributeDetails]}]} break
+        dputs "--- attributeDetails $no"
+	dputs $rec
+        incr no
+    }
     set data [lindex [lindex [lindex [lindex [lindex $trec 12] 1] 1] 1] 1]
     if {[string length $data]} {
         set profile($target,descripton) $data