Checked script with procheck and corrected some minor portability problems.

[ir-tcl-moved-to-github.git] / client2 / explain.tcl

diff --git a/client2/explain.tcl b/client2/explain.tcl
index 004f59a..21bcfed 100644 (file)
--- a/client2/explain.tcl
+++ b/client2/explain.tcl
@@ -1,21 +1,6 @@
-proc debug-window {} {
-       set w .debug-window
-    toplevel $w
-
-    wm title $w "Debug Window" 
-    
-    top-down-window $w
-       scrollbar $w.top.s -command [list $w.top.t yview]
-    text $w.top.t -width 60 -height 10 -wrap word -relief flat -borderwidth 0 \
-        -font fixed -yscroll [list $w.top.s set]
-    pack $w.top.s -side right -fill y
-    pack $w.top.t -expand yes -fill both -expand y
-}
-debug-window
-
 #Procedure get-attributeDetails
 #If the target supports explain the Attribute Details are extracted here.
-#The number 1.2.840.10003.3.1 is Bib1 and 1.2.840.10003.3.2 is Gils.
+#The number 1.2.840.10003.3.1 is Bib1, 1.2.840.10003.3.2 is Explain and 1.2.840.10003.3.5 is Gils.
 proc get-attributeDetails {target base} {
        global profile
        set index 1
@@ -37,10 +22,22 @@ proc get-attributeDetails {target base} {
                                                        }
                                                }                                               
                                        }
+                               } elseif {[lindex [lindex $tagset 0] 1] == "1.2.840.10003.3.5"} {
+#                                      .debug-window.top.t insert end Gils\n
+                                       foreach attributeType [lindex $tagset 1] {
+#                                      .debug-window.top.t insert end [lindex $tagset 1]
+                                               if {[lindex [lindex $attributeType 0] 1] == 1} {
+                                                       foreach attributeValues [lrange [lindex $attributeType 2] 1 end] {
+                                                               lappend profile($target,AttributeDetails,$db,Gils) [lindex [lindex [lindex $attributeValues 0] 1] 1]
+#                                                              .debug-window.top.t insert end [lindex [lindex [lindex $attributeValues 0] 1] 1]\n
+                                                       }
+                                               }                                               
+                                       }
                                }
                        }       
                        incr index
                }
+               rename z39.attributeDetails ""
        } else {
                .debug-window.top.t insert end "Ingen explain\n"
        }
@@ -199,7 +196,7 @@ proc prettyDumpR {x ind} {
 
 # Procedure explain-check-ok
 proc explain-check-ok {target zz category finish} {
-    global profile settingsChanged
+    global profile settingsChanged currentDb
 
     puts ""
     puts ""
@@ -210,7 +207,6 @@ proc explain-check-ok {target zz category finish} {
     puts $crec
 
     set rec [z39.targetInfo getExplain 1]
-
     set trec [z39.targetInfo getExplain 1 targetInfo]
     puts "--- targetInfo"
     puts $rec
@@ -259,6 +255,7 @@ proc explain-check-ok {target zz category finish} {
                [lindex [lindex [lindex [lindex [lindex $trec 10] 1] 1] 1] 1]
     
     set settingsChanged 1
+    get-attributeDetails $target $currentDb
 
     eval $finish [list $target]
 }
@@ -271,14 +268,14 @@ proc explain-refresh {target finish} {
 # Procedure explain-check
 #   Checks target for explain database.
 #   Evals "$finish $target" on finish.
-proc explain-check {target finish} {
+proc explain-check {target finish base} {
     global profile
     
     set refresh 0
     set time [clock seconds]
     set etime $profile($target,timeLastExplain)
     if {[string length $etime]} {
-        # Check last explain. If 1 day since last explain do explain egain.
+        # Check last explain. If 1 day since last explain do explain again.
         # 1 day = 86400
         if {$time > [expr 0 + $etime]} {
                set refresh 1