projects / egate.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Major revision. Single-target result set can be reached from the
[egate.git] / www / search.egw
diff --git a/www/search.egw b/www/search.egw
index 3e66629..fd25d08 100644 (file)
--- a/www/search.egw
+++ b/www/search.egw
@@ -1,6 +1,6 @@
 <html>
 {
-# $Id: search.egw,v 1.37 1996/03/12 16:30:28 adam Exp $
+# $Id: search.egw,v 1.38 1996/03/13 14:07:31 adam Exp $
 
 proc start-scan {scanNo targetNo cache dir initSet} {
     global sessionId
@@ -35,7 +35,7 @@ proc start-scan {scanNo targetNo cache dir initSet} {
     }
     if {$hist($setNo,$scanNo,scanTerm) != ""} {
         if {[z39scan $setNo $scanNo 0 $lines $pos $cache] != "1"} {
-            button-new-query 0 $setNo
+            button-new-query $setNo
             egw_log debug "z39_scan failed"
             return
         }
@@ -60,7 +60,7 @@ proc start-scan {scanNo targetNo cache dir initSet} {
         }
         html {</a>}
     }
-    button-new-query 0 $setNo
+    button-new-query $setNo
 
     set databases [splitDatabaseSpec $host]
 
@@ -121,7 +121,7 @@ proc start-scan {scanNo targetNo cache dir initSet} {
     set useIcons 0
     if {$hist($setNo,$scanNo,scanTerm) == ""} {
         button-main
-        button-new-query 0 $setNo        
+        button-new-query $setNo        
         return
     }
 
@@ -151,7 +151,7 @@ proc start-scan {scanNo targetNo cache dir initSet} {
         html {Next Terms</a> | }
     }
     html {</a>}
-    button-new-query 0 $setNo
+    button-new-query $setNo
 
     if {!$debug} return
     html "<hr>\n"
@@ -162,7 +162,6 @@ proc start-scan {scanNo targetNo cache dir initSet} {
         html $e {: } $env($e) {<br>} \n
     }
     html "form: " [egw_form] " <br>\n"
-    html "target: " $host " <br>\n"
     html "databases: " $hist($setNo,$targetNo,database) " <br>\n"
     html "selected: " [egw_form base] " <br>\n"
     html "setNo: " $setNo " <br>\n"
@@ -192,7 +191,7 @@ proc start-scan {scanNo targetNo cache dir initSet} {
             set setNo $nextSetNo
             incr nextSetNo
         } else {
-            catch {unset hist($setNo,hits)}
+            catch {unset hist($setNo,$targetNo,hits)}
         }
         set hist($setNo,scan) 0
 
@@ -214,11 +213,11 @@ proc start-scan {scanNo targetNo cache dir initSet} {
 
         set b [egw_form base]
        if {[egw_form baseall] != ""} {
-           set hist($setNo,0,database) $databases
+           set hist($setNo,$targetNo,database) $databases
         } elseif {$b == ""} {
-            set hist($setNo,0,database) $databases
+            set hist($setNo,$targetNo,database) $databases
         } else {
-            set hist($setNo,0,database) $b
+            set hist($setNo,$targetNo,database) $b
         }
         set hist($setNo,maxPresent) [egw_form hits]
         if {$hist($setNo,maxPresent) == ""} {
@@ -228,7 +227,7 @@ proc start-scan {scanNo targetNo cache dir initSet} {
         set hist($setNo,sort) server
 
         set i [lindex $sessionParms 2]
-        if {$i == ""} {
+        if {[string length $i] == 0} {
             for {set j 1} {$j <= 3} {incr j} {
                 if {[egw_form scan$j] != ""} {
                     set i $j
@@ -236,7 +235,7 @@ proc start-scan {scanNo targetNo cache dir initSet} {
                 }
             }
         }
-        if {$i != ""} {
+        if {[string length $i] != 0} {
             set scanNo 1000
             set hist($setNo,scan) $i
             set termPlusAttr [build-scan $hist($setNo,0,host) $i]
@@ -248,7 +247,7 @@ proc start-scan {scanNo targetNo cache dir initSet} {
             return
         }
         set query [build-query $hist($setNo,0,host) 3]
-        if {"x$query" == "x"} {
+        if {[string length $query] == 0} {
             html "<head><title> WWW/Z39.50 Gateway Search</title>\n<body>\n"
             displayError "Empty query" \
                 "You must specify at least one search word"
@@ -269,7 +268,7 @@ proc start-scan {scanNo targetNo cache dir initSet} {
             set setNo $nextSetNo
             incr nextSetNo
         } else {
-            catch {unset hist($setNo,hits)}
+            catch {unset hist($setNo,$targetNo,hits)}
         }
         set hist($setNo,scan) 0
         set hist($setNo,$targetNo,query) \
@@ -316,7 +315,6 @@ proc start-scan {scanNo targetNo cache dir initSet} {
         html "env($n) = " $env($n) " <br>\n"
     }
     html "form: " [egw_form] " <br>\n"
-    html "target: " $host " <br>\n"
     html "databases: " $hist($setNo,$targetNo,database) " <br>\n"
     html "selected: " [egw_form base] " <br>\n"
     html "query: --" $hist($setNo,$targetNo,query) "-- <br>"
Europgate