projects / egate.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
In images Alt=... are defined.
[egate.git] / www / search.egw
diff --git a/www/search.egw b/www/search.egw
index 7f1c0ef..0feff70 100644 (file)
--- a/www/search.egw
+++ b/www/search.egw
@@ -1,6 +1,6 @@
 <html>
 {
-# $Id: search.egw,v 1.20 1995/12/22 14:21:15 adam Exp $
+# $Id: search.egw,v 1.21 1996/01/02 10:52:28 adam Exp $
 
 proc perform-scan {} {
     global sessionId
@@ -26,34 +26,7 @@ proc perform-scan {} {
     set hist($setNo,scanAttr) [lindex $termPlusAttr 1]
     set hist($setNo,$scanNo,scanTerm) [lindex $termPlusAttr 0]
     
-    set hist($setNo,form,menu1) [wform menu1]
-    set hist($setNo,form,menu2) [wform menu2]
-    set hist($setNo,form,menu3) [wform menu3]
-
-    set hist($setNo,form,entry1) [wform entry1]
-    set hist($setNo,form,entry2) [wform entry2]
-    set hist($setNo,form,entry3) [wform entry3]
-
-    set hist($setNo,form,logic1) [wform logic1]
-    set hist($setNo,form,logic2) [wform logic2]
-
-    set host $hist($setNo,host)
-    set databases [lindex $targets($host) 1]
-
-    set b [wform base]
-    if {[wform baseall] != ""} {
-       set hist($setNo,database) $databases
-    } elseif {$b == ""} {
-        set hist($setNo,database) $databases
-    } else {
-        set hist($setNo,database) $b
-    }
-    set hist($setNo,maxPresent) [wform hits]
-    if {$hist($setNo,maxPresent) == ""} {
-        set hist($setNo,maxPresent) 30
-    }
     set host $hist($setNo,host)
-    set databases [lindex $targets($host) 1]
 
     html "<head><title> WWW/Z39.50 Gateway Scan " $host " </title>\n"
     html "</head><body>\n"
@@ -98,16 +71,17 @@ proc buttons {setNo setMax startPos after} {
 
     html "<p>\n"
     if {$useIcons} {
-        html {<img src="/gif/button-egw.gif">}
+        html {<img src="/gif/button-egw.gif" alt="Europagate" border=0>}
     }
     if {$setMax < [z39.$setNo resultCount]} {
         html {<a href="http:} $env(SCRIPT_NAME)
         html / $sessionId {/search.egw/} $setNo + [expr $setMax + 1]
         html + [expr $setMax + $hist($setNo,maxPresent)]
         if {$useIcons} {
-            html {"><img src="/gif/button-next-records.gif" border=0></a>}
+            html {"><img src="/gif/button-next-records.gif" alt="Next Records"}
+           html { border=0></a>}
         } else {
-            html {">Next records</a>} " | \n"
+            html {">Next Records</a>} " | \n"
         }
     }
     if {$startPos != "" && $startPos != "1"} {
@@ -116,25 +90,28 @@ proc buttons {setNo setMax startPos after} {
         html + [expr $startPos - $hist($setNo,maxPresent)]
         html + [expr $startPos - 1]
         if {$useIcons} {
-            html {"><img src="/gif/button-previous-records.gif" border=0></a>}
+            html {"><img src="/gif/button-previous-records.gif" }
+           html {alt="Previous Records" border=0></a>}
         } else {
-            html {">Previous records</a>} " | \n"
+            html {">Previous Records</a>} " | \n"
         }
     }
     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" border=0></a>}
+        html {"><img src="/gif/button-new-query.gif" }
+       html {alt="New Query" border=0></a>}
     } else {
-        html {">New query</a>} " | \n"
+        html {">New Query</a>} " | \n"
     }
 
     html {<a href="http:} $env(SCRIPT_NAME)
     html / $sessionId {/targets.egw}
     if {$useIcons} {
-        html {"><img src="/gif/button-new-target.gif" border=0></a>}
+        html {"><img src="/gif/button-new-target.gif" }
+       html {alt="New Target" border=0></a>}
     } else {
-        html {">New target</a>}
+        html {">New Target</a>}
     }
     html "<p>\n"
     if {!$useIcons && !$after && $startPos != "" && $startPos != "1"} {
@@ -169,20 +146,6 @@ proc buttons {setNo setMax startPos after} {
         } else {
             catch {unset hist($setNo,hits)}
         }
-        if {[wform submit] == "Scan"} {
-            perform-scan
-            wabort
-        }
-        set query [build-query $hist($setNo,host) 3]
-        if {"x$query" == "x"} {
-            html "<head><title> WWW/Z39.50 Gateway Search</title>\n<body>\n"
-            displayError "Empty query" \
-                "You must specify at least one search word"
-            html "</body></html>\n"
-            wabort
-        }
-        set hist($setNo,query) $query
-
         set hist($setNo,form,menu1) [wform menu1]
         set hist($setNo,form,menu2) [wform menu2]
         set hist($setNo,form,menu3) [wform menu3]
@@ -193,7 +156,7 @@ proc buttons {setNo setMax startPos after} {
 
         set hist($setNo,form,logic1) [wform logic1]
         set hist($setNo,form,logic2) [wform logic2]
-
+        
         set host $hist($setNo,host)
         set databases [lindex $targets($host) 1]
 
@@ -209,9 +172,22 @@ proc buttons {setNo setMax startPos after} {
         if {$hist($setNo,maxPresent) == ""} {
             set hist($setNo,maxPresent) 30
         }
+
+        if {[wform submit] == "Scan"} {
+            perform-scan
+            wabort
+        }
+        set query [build-query $hist($setNo,host) 3]
+        if {"x$query" == "x"} {
+            html "<head><title> WWW/Z39.50 Gateway Search</title>\n<body>\n"
+            displayError "Empty query" \
+                "You must specify at least one search word"
+            html "</body></html>\n"
+            wabort
+        }
+        set hist($setNo,query) $query
     }
     set host $hist($setNo,host)
-    set databases [lindex $targets($host) 1]
 
     html "<head><title> WWW/Z39.50 Gateway Search " $host " </title>\n"
     html "</head><body>\n"
Europgate