X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2Fsearch.egw;h=0feff70ee1a3acb30efa7173faada002d3673cd4;hb=df7b985601de6c729147a6fd6588adba6f905480;hp=7f1c0efcea807a4c80fc5e63c428e45256d617a5;hpb=2213843897f0bc54bc535935c56fe830648b171a;p=egate.git
diff --git a/www/search.egw b/www/search.egw
index 7f1c0ef..0feff70 100644
--- a/www/search.egw
+++ b/www/search.egw
@@ -1,6 +1,6 @@
{
-# $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 " WWW/Z39.50 Gateway Scan " $host " \n"
html "\n"
@@ -98,16 +71,17 @@ proc buttons {setNo setMax startPos after} {
html "\n"
if {$useIcons} {
- html {
}
+ html {}
}
if {$setMax < [z39.$setNo resultCount]} {
html {
}
+ html {">}
} else {
- html {">Next records} " | \n"
+ html {">Next Records} " | \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 {">
}
+ html {">}
} else {
- html {">Previous records} " | \n"
+ html {">Previous Records} " | \n"
}
}
html {
}
+ html {">}
} else {
- html {">New query} " | \n"
+ html {">New Query} " | \n"
}
html {
}
+ html {">}
} else {
- html {">New target}
+ html {">New Target}
}
html "
\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 "
WWW/Z39.50 Gateway Search\n\n"
- displayError "Empty query" \
- "You must specify at least one search word"
- 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 " WWW/Z39.50 Gateway Search\n\n"
+ displayError "Empty query" \
+ "You must specify at least one search word"
+ html "\n"
+ wabort
+ }
+ set hist($setNo,query) $query
}
set host $hist($setNo,host)
- set databases [lindex $targets($host) 1]
html " WWW/Z39.50 Gateway Search " $host " \n"
html "\n"