Work on scan window.

[egate.git] / www / z39util.tcl

diff --git a/www/z39util.tcl b/www/z39util.tcl
index 1de9d26..a7d06d4 100644 (file)
--- a/www/z39util.tcl
+++ b/www/z39util.tcl
@@ -1,5 +1,5 @@
 #
-# $Id: z39util.tcl,v 1.17 1996/01/03 15:19:52 adam Exp $
+# $Id: z39util.tcl,v 1.20 1996/01/12 10:05:42 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]
@@ -894,23 +895,28 @@ proc z39history {} {
     html "<h2>History</h2><dl><br>\n"
     for {set setNo 1} {$setNo < $nextSetNo} {incr setNo} {
         if {$hist($setNo,scan) > 0} continue
-        html {<dt> <a href="http:} $env(SCRIPT_NAME)
-        html / $sessionId {/search.egw/} $setNo + 1
-        html + $hist($setNo,maxPresent)
-        html {"> } [lindex $targets($hist($setNo,host)) 0]
-        if {[llength $hist($setNo,database)] > 1} {
+        set host $hist($setNo,host)
+        html {<dt> } [lindex $targets($host) 0]
+        if {[llength [lindex $targets($host) 1]] > 1} {
             html ": "
             foreach b $hist($setNo,database) {
                 html " $b"
             }
         }
-        html "</a> -- "
+        html {. }
+
         if {[info exists hist($setNo,hits)]} {
-            html $hist($setNo,hits) " hits"
+            html { <a href="http:} $env(SCRIPT_NAME)
+            html / $sessionId {/search.egw/} $setNo + 1
+            html + $hist($setNo,maxPresent)
+            html {">Result</a>: } $hist($setNo,hits) { hits.}
         } else {
-            html failed
+            html {Search failed.}
         }
         html "<dd>\n"
+        html { <a href="http:} $env(SCRIPT_NAME)
+        html / $sessionId {/query.egw/} $host + $setNo 
+        html {">Query</a>: }
         set op {}
         for {set i 1} {$i <= 3} {incr i} {
             if {[string length $hist($setNo,form,entry$i)] > 0} {
@@ -925,7 +931,7 @@ proc z39history {} {
 
 proc displayError {msga msgb} {
     html "<p><center>\n"
-    html {<img src="/gif/noway.gif" alt="Error">}
+    html {<img src="/egwgif/noway.gif" alt="Error">}
     html "<h2>" $msga "</h2>\n"
     if {$msgb != ""} {
         html "<h3>" $msgb "</h3>\n"
@@ -936,7 +942,7 @@ proc displayError {msga msgb} {
 proc button-europagate {} {
     global useIcons
     if {$useIcons} {
-        html {<img src="/gif/button-egw.gif" alt="Europagate" border=0></a>}
+        html {<img src="/egwgif/button-egw.gif" alt="Europagate" border=0></a>}
     } else {
         html {Europagate | }
     }
@@ -950,7 +956,7 @@ proc button-new-target {more} {
     html {<a href="http:} $env(SCRIPT_NAME)
     html / $sessionId {/targets.egw}
     if {$useIcons} {
-        html {"><img src="/gif/button-new-target.gif" }
+        html {"><img src="/egwgif/button-new-target.gif" }
        html {alt="New Target" border=0></a>}
     } else {
         html {">New Target</a>}
@@ -966,11 +972,13 @@ 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="/gif/button-view-history.gif" alt="View History" }
+        html {"><img src="/egwgif/button-view-history.gif" alt="View History" }
         html {border=0></a>}
     } else {
         html {">View History</a>}
@@ -991,7 +999,7 @@ proc button-new-query {more setNo} {
     html {<a href="http:} $env(SCRIPT_NAME)
     html / $sessionId {/query.egw/} $hist($setNo,host) + $setNo {">}
     if {$useIcons} {
-        html {<img src="/gif/button-new-query.gif" }
+        html {<img src="/egwgif/button-new-query.gif" }
        html {alt="New Query" border=0></a>}
     } else {
         html {New Query</a>}
@@ -1006,7 +1014,7 @@ proc button-new-query {more setNo} {
 proc maintenance {} {
     html {<hr>This page is maintained by }
     html {<a href="mailto:pwh@dtv.dk"> Peter Wad Hansen </a>.}
-    html {Last modified 3. january 1996. <br>}
+    html {Last modified 9. january 1996. <br>}
     html {<em> This and the following pages are under construction and }
     html {will continue to be so until the end of January 1996.</em>}
-}
\ No newline at end of file
+}