X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2Fsearch.egw;h=dd7162d93599f1d5f813cdaefd0be5917363c820;hb=5bbe4c302d2d105aea7806317e9f31d5773a9536;hp=d1046ba7bdd561592b52af4266598838e701415e;hpb=74a4580ba9945fc86b47654230865a68089245b6;p=egate.git
diff --git a/www/search.egw b/www/search.egw
index d1046ba..dd7162d 100644
--- a/www/search.egw
+++ b/www/search.egw
@@ -1,12 +1,22 @@
{
-# $Id: search.egw,v 1.14 1995/11/10 14:47:32 adam Exp $
+# $Id: search.egw,v 1.16 1995/11/13 18:17:48 adam Exp $
-proc buttons {setNo setMax startPos} {
+proc buttons {setNo setMax startPos after} {
global sessionId
global env
global hist
+ if {$after && $setMax < [z39.$setNo resultCount]} {
+ html "\n"
+ html "
\n"
+ html {
}
+ html "\n"
+ }
+
html "\n"
if {$setMax < [z39.$setNo resultCount]} {
html {Previous records} " | \n"
}
html {New target} " | \n"
- html {New query} "\n
\n"
+ html {">New query} " | \n"
+
+ html {New target} "
\n"
+
+ if {!$after && $startPos != "" && $startPos != "1"} {
+ html "
\n"
+ html {
}
+ html "\n"
+ }
+
}
if {[info commands saveState] == ""} {
@@ -44,9 +64,29 @@ proc buttons {setNo setMax startPos} {
set hist($nextSetNo,host) $hist($setNo,host)
set setNo $nextSetNo
html "using host " $hist($setNo,host) " 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]
+
+ 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]
+
+ incr nextSetNo
set b [wform base]
if {$b == ""} {
set hist($setNo,database) $databases
@@ -69,7 +109,7 @@ proc buttons {setNo setMax startPos} {
set setMax 0
set setOffset 0
if {$startPos == ""} {
- if {[z39search $setNo 1 0] != "1"} {
+ if {[z39search $setNo 1 0 B] != "1"} {
return
}
set r [z39.$setNo resultCount]
@@ -83,7 +123,7 @@ proc buttons {setNo setMax startPos} {
set setMax $hist($setNo,maxPresent)
}
} else {
- if {[z39search $setNo 0 0] != "1"} {
+ if {[z39search $setNo 0 0 B] != "1"} {
return
}
set r [z39.$setNo resultCount]
@@ -95,14 +135,14 @@ proc buttons {setNo setMax startPos} {
set setMax $endPos
}
if {$setMax > 0} {
- buttons $setNo $setMax $startPos
+ buttons $setNo $setMax $startPos 0
}
}
if {$setMax > 0} {
- z39present $setNo 0 $setOffset $setMax display-brief
+ z39present $setNo 0 $setOffset $setMax display-brief B
}
- buttons $setNo $setMax $startPos
+ buttons $setNo $setMax $startPos 1
}
{