X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=www%2Fsearch.egw;h=a249f6cdaeb40274b0c3cf81a554d5989f75db83;hb=a6e5ecf2a6d6dedf266c5f9d6bc2447a528b199e;hp=3091a5a888ce491d5c0f5e0643d40f91f6b11de2;hpb=705b88300e427db47dd933f2ee615e73bf3c3754;p=egate.git
diff --git a/www/search.egw b/www/search.egw
index 3091a5a..a249f6c 100644
--- a/www/search.egw
+++ b/www/search.egw
@@ -1,12 +1,22 @@
{
-# $Id: search.egw,v 1.13 1995/11/10 10:20:24 adam Exp $
+# $Id: search.egw,v 1.17 1995/11/14 16:01:51 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,11 +64,37 @@ 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 host $hist($setNo,host)
+ set databases [lindex $targets($host) 1]
- set hist($setNo,query) [build-query $hist($setNo,host)]
set b [wform base]
- if {$b == ""} {
+ if {[wform baseall] != ""} {
+ set hist($setNo,database) $databases
+ } elseif {$b == ""} {
set hist($setNo,database) $databases
} else {
set hist($setNo,database) $b
@@ -69,21 +115,21 @@ proc buttons {setNo setMax startPos} {
set setMax 0
set setOffset 0
if {$startPos == ""} {
- if {[z39search $setNo 1] != "1"} {
+ if {[z39search $setNo 1 0 B] != "1"} {
return
}
set r [z39.$setNo resultCount]
html " Search result $r hits
\n"
wflush
set setOffset [z39.$setNo numberOfRecordsReturned]
- display-rec 1 $setOffset display-brief z39
+ display-rec 1 $setOffset display-brief 0
incr setOffset
set setMax [z39.$setNo resultCount]
if {$setMax > $hist($setNo,maxPresent)} {
set setMax $hist($setNo,maxPresent)
}
} else {
- if {[z39search $setNo 0] != "1"} {
+ if {[z39search $setNo 0 0 B] != "1"} {
return
}
set r [z39.$setNo resultCount]
@@ -95,14 +141,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 $setOffset $setMax display-brief
+ z39present $setNo 0 $setOffset $setMax display-brief B
}
- buttons $setNo $setMax $startPos
+ buttons $setNo $setMax $startPos 1
}
{