Work on scan.

[egate.git] / www / z39util.tcl

diff --git a/www/z39util.tcl b/www/z39util.tcl
index e2dca2f..737ca46 100644 (file)
--- a/www/z39util.tcl
+++ b/www/z39util.tcl
@@ -1,5 +1,5 @@
 #
-# $Id: z39util.tcl,v 1.19 1996/01/09 16:16:49 adam Exp $
+# $Id: z39util.tcl,v 1.21 1996/01/12 13:08:30 adam Exp $
 #
 proc saveState {} {
     uplevel #0 {
@@ -384,7 +384,8 @@ proc build-scan {t i} {
 
     set term [wform entry$i]
     if {$term != ""} {
-        set field [wform menu$i]
+        set field [join [wform menu$i]]
+        set attr {Title}
         foreach x [lindex $targets($t) 2] {
             if {[lindex $x 0] == $field} {
                 set attr [lindex $x 1]
@@ -401,9 +402,9 @@ proc build-query {t ilines} {
     set op {}
     set q {}
     for {set i 1} {$i <= $ilines} {incr i} {
-        set term [wform entry$i]
+        set term [join [wform entry$i]]
         if {[string length $term] > 0} {
-            set field [wform menu$i]
+            set field [join [wform menu$i]]
             foreach x [lindex $targets($t) 2] {
                 if {[lindex $x 0] == $field} {
                     set attr [lindex $x 1]
@@ -512,7 +513,7 @@ proc z39scan {setNo scanNo tno scanLines scanPos cache} {
     set sessionWait 0
     $zs scan "${scanAttr} ${scanTerm}"
 
-    if {[catch {zwait sessionWait 600}]} {
+    if {[catch {zwait sessionWait 60}]} {
         wlog debug "timeout/cancel in scan"
         displayError "Timeout in scan" {}
         html "</body></html>\n"
@@ -971,9 +972,11 @@ proc button-view-history {more} {
     global useIcons
     global env
     global sessionId
+    global nextSetNo
 
     html {<a href="http:} $env(SCRIPT_NAME)
-    html / $sessionId {/history.egw}
+    html / $sessionId {/history.egw;}
+    catch { html "/" $nextSetNo}
     if {$useIcons} {
         html {"><img src="/egwgif/button-view-history.gif" alt="View History" }
         html {border=0></a>}
@@ -1008,6 +1011,27 @@ proc button-new-query {more setNo} {
     }
 }
 
+proc button-scan-window {more setNo} {
+    global useIcons
+    global env
+    global sessionId
+    global hist
+
+    html {<a href="http:} $env(SCRIPT_NAME)
+    html / $sessionId {/search.egw/} $setNo + {scan} {">}
+    if {$useIcons} {
+        html {<img src="/egwgif/button-scan-window.gif" }
+       html {alt="Scan" border=0></a>}
+    } else {
+        html {Scan</a>}
+        if {$more} {
+            html " | \n"
+        } else {
+            html "\n"
+        }
+    }
+}
+
 proc maintenance {} {
     html {<hr>This page is maintained by }
     html {<a href="mailto:pwh@dtv.dk"> Peter Wad Hansen </a>.}