Bug fix: didn't use correct database(s) when 'all' checkbox was selected.

[egate.git] / www / z39util.tcl

diff --git a/www/z39util.tcl b/www/z39util.tcl
index 476673b..216784c 100644 (file)
--- a/www/z39util.tcl
+++ b/www/z39util.tcl
@@ -1,5 +1,5 @@
 #
-# $Id: z39util.tcl,v 1.9 1995/11/13 18:17:48 adam Exp $
+# $Id: z39util.tcl,v 1.11 1995/11/14 16:01:52 adam Exp $
 #
 proc saveState {} {
     uplevel #0 {
@@ -26,12 +26,12 @@ proc saveState {} {
     }
 }
 
-proc search-response {sno} {
+proc search-response {zz} {
     global sessionWait
 
-    set status [z39.$sno responseStatus]
+    set status [$zz responseStatus]
     if {[lindex $status 0] == "NSD"} {
-        z39.$sno nextResultSetPosition 0
+        $zz nextResultSetPosition 0
         set code [lindex $status 1]
         set msg [lindex $status 2]
         set addinfo [lindex $status 3]
@@ -364,13 +364,13 @@ proc build-query {t} {
             }
             switch $op {
             And
-                { set q "@and $q ${attr} \{${term}\}" }
+                { set q "@and $q ${attr} ${term}" }
             Or
-                { set q "@or $q ${attr} \{${term}\}" }
+                { set q "@or $q ${attr} ${term}" }
             {And not}
-                { set q "@not $q ${attr} \{${term}\}" }
+                { set q "@not $q ${attr} ${term}" }
             {}
-                { set q "${attr} \{${term}\}" }
+                { set q "${attr} ${term}" }
             }
             set op [wform logic$i]
         }
@@ -381,6 +381,7 @@ proc build-query {t} {
 proc z39search {setNo piggy tno elements} {
     global hist
     global sessionWait
+    global targets
 
     if {$tno > 0} {
         set zz z39$tno
@@ -411,7 +412,11 @@ proc z39search {setNo piggy tno elements} {
             displayError "Cannot connect to target" $host
             return 0
         } elseif {$sessionWait == 0} {
-            zwait sessionWait
+            if {[catch {zwait sessionWait 300}]} {
+               $zz disconnect
+                displayError "Cannot connect to target" $host
+                return 0
+            }
             if {$sessionWait != 1} {
                 displayError "Cannot connect to target" $host
                 return 0
@@ -421,6 +426,7 @@ proc z39search {setNo piggy tno elements} {
         set sessionWait 0
         if {[catch {$zz init}]} {
             displayError "Cannot initialize target" $host
+           $zz disconnect
             return 0
         }
         if {[catch {zwait sessionWait 60}]} {
@@ -439,19 +445,26 @@ proc z39search {setNo piggy tno elements} {
             displayError "Cannot initialize target $host" $u
             return 0
         }
-    }
-    if {![catch [list $zz.$setNo smallSetUpperBound 0]]} {
-        return 1
+    } else {
+        if {![catch [list $zz.$setNo smallSetUpperBound 0]]} {
+            return 1
+        }
     }
     ir-set $zz.$setNo $zz
+    
+    if {![lindex $targets($host) 5]} {
+        set elements {}
+    }
     $zz.$setNo smallSetElementSetNames $elements
     $zz.$setNo mediumSetElementSetNames $elements
     $zz.$setNo recordElements $elements
+
+    wlog debug "database=$database"
     eval $zz.$setNo databaseNames $database
 
     $zz.$setNo preferredRecordSyntax USMARC
 
-    $zz callback search-response $setNo
+    $zz callback [list search-response $zz.$setNo]
     if {$piggy} {
         $zz.$setNo largeSetLowerBound 999999
         $zz.$setNo smallSetUpperBound 0
@@ -465,26 +478,20 @@ proc z39search {setNo piggy tno elements} {
     $zz.$setNo search $query
 
     if {[catch {zwait sessionWait 600}]} {
+        wlog debug "timeout/cancel in search"
         displayError "Timeout in search" {}
         html "</body></html>\n"
         $zz disconnect
         return 0
     }
         
-    if {$sessionWait != 1} {
+    if {$sessionWait == -1} {
         displayError "Search fail" "Connection closed"
         html "</body></html>\n"
         $zz disconnect
-        return 0
     }
-    set status [$zz.$setNo responseStatus]
-    if {[lindex $status 0] == "NSD"} {
-        set code [lindex $status 1]
-        set msg [lindex $status 2]
-        set addinfo [lindex $status 3]
-        displayError "Diagnostic message" \
-                "$msg: $addinfo\n<br>(error code $code)"
-        return 0
+    if {$sessionWait != 1} {
+       return 0
     }
     set hist($setNo,hits) [$zz.$setNo resultCount]
     return 1
@@ -533,6 +540,7 @@ proc z39msearch {setNo piggy elements} {
     global zleft
     global zstatus
     global hist
+    global targets
 
     set not $hist($setNo,0,host)
 
@@ -580,9 +588,14 @@ proc z39msearch {setNo piggy elements} {
             set hist($setNo,$i,offset) 0
             eval z39$i.$setNo databaseNames $hist($setNo,$i,database)
 
-            z39$i.$setNo smallSetElementSetNames $elements
-            z39$i.$setNo mediumSetElementSetNames $elements
-            z39$i.$setNo recordElements $elements
+            if {![lindex $targets($hist($setNo,$i,host)) 5]} {
+                set thisElements {}
+            } else {
+                set thisElements $elements
+            }
+            z39$i.$setNo smallSetElementSetNames $thisElements
+            z39$i.$setNo mediumSetElementSetNames $thisElements
+            z39$i.$setNo recordElements $thisElements
 
             z39$i.$setNo preferredRecordSyntax USMARC
             z39$i callback [list search-m-response $setNo $i]
@@ -622,16 +635,26 @@ proc z39msearch {setNo piggy elements} {
 proc z39present {setNo tno setOffset setMax dfunc elements} {
     global hist
     global sessionWait
+    global targets
 
     if {$tno > 0} {
         set zz z39$tno
+        set host $hist($setNo,$tno,host)
     } else {
         set zz z39
+        set host $hist($setNo,host)
+    }
+
+    if {![lindex $targets($host) 5]} {
+        set elements {}
     }
 
     $zz.$setNo elementSetNames $elements
     $zz.$setNo recordElements $elements
     set toGet [expr 1 + $setMax - $setOffset]
+
+    $zz callback [list search-response $zz.$setNo]
+
     while {$setMax > 0 && $toGet > 0} {
         for {set got 0} {$got < $toGet} {incr got} {
             if {[$zz.$setNo type [expr $setOffset + $got]] == ""} {
@@ -642,6 +665,7 @@ proc z39present {setNo tno setOffset setMax dfunc elements} {
             set sessionWait 0
             $zz.$setNo present $setOffset $toGet
             if {[catch {zwait sessionWait 300}]} {
+                wlog debug "timeout/cancel in present"
                $zz disconnect
                 break
            }