X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2Fsearch.egw;h=0feff70ee1a3acb30efa7173faada002d3673cd4;hb=df7b985601de6c729147a6fd6588adba6f905480;hp=c25bfb93eef8ef02f30415161e29309c6751b282;hpb=c6ea088406ba64e6ed5ea833e1c2ae516552e18e;p=egate.git
diff --git a/www/search.egw b/www/search.egw
index c25bfb9..0feff70 100644
--- a/www/search.egw
+++ b/www/search.egw
@@ -1,6 +1,57 @@
{
-# $Id: search.egw,v 1.18 1995/12/20 16:31:31 adam Exp $
+# $Id: search.egw,v 1.21 1996/01/02 10:52:28 adam Exp $
+
+proc perform-scan {} {
+ global sessionId
+ global sessionParms
+ global sessionWait
+ global setNo
+ global hist
+ global targets
+ global nextSetNo
+ global env
+
+ set scanNo 1000
+
+ set termPlusAttr [build-scan $hist($setNo,host) 3]
+
+ if {"$termPlusAttr" == ""} {
+ html " WWW/Z39.50 Gateway Scan\n\n"
+ displayError "Empty query" \
+ "You must specify at least one search word"
+ html "\n"
+ wabort
+ }
+ set hist($setNo,scanAttr) [lindex $termPlusAttr 1]
+ set hist($setNo,$scanNo,scanTerm) [lindex $termPlusAttr 0]
+
+ set host $hist($setNo,host)
+
+ html " WWW/Z39.50 Gateway Scan " $host " \n"
+ html "\n"
+
+ if {[z39scan $setNo $scanNo 0 20 10] != "1"} {
+ return
+ }
+ display-scan $setNo $scanNo 0
+
+ html "
\n"
+ html "Debug information
\n"
+ html "sessionId: $sessionId
\n"
+ html "sessionParms: $sessionParms
\n"
+ foreach e {SERVER_NAME PATH_INFO SCRIPT_NAME} {
+ html $e {: } $env($e) {
} \n
+ }
+ html "form: " [wform] "
\n"
+ html "target: " $host "
\n"
+ html "databases: " $hist($setNo,database) "
\n"
+ html "selected: " [wform base] "
\n"
+ html "setNo: " $setNo "
\n"
+ html "nextSetNo: " $nextSetNo "
\n"
+
+ html "\n"
+}
proc buttons {setNo setMax startPos after} {
global sessionId
@@ -20,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"} {
@@ -38,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"} {
@@ -80,21 +135,17 @@ proc buttons {setNo setMax startPos after} {
global hist
set setNo [lindex $sessionParms 0]
+
if {[wform menu1] != ""} {
set hist($nextSetNo,idAuthentication) $hist($setNo,idAuthentication)
set hist($nextSetNo,host) $hist($setNo,host)
- set setNo $nextSetNo
- set query [build-query $hist($setNo,host)]
- 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
+ if {$nextSetNo == $setNo} {
+ set setNo $nextSetNo
+ incr nextSetNo
+ } else {
+ catch {unset hist($setNo,hits)}
}
- 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]
@@ -105,9 +156,7 @@ proc buttons {setNo setMax startPos after} {
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]
@@ -123,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"
@@ -139,7 +201,7 @@ proc buttons {setNo setMax startPos after} {
return
}
set r [z39.$setNo resultCount]
- html " Search result $r hits
\n"
+ html " Search result $r hits
\n"
wflush
set setOffset [z39.$setNo numberOfRecordsReturned]
display-rec 1 $setOffset display-brief 0
@@ -153,8 +215,6 @@ proc buttons {setNo setMax startPos after} {
return
}
set r [z39.$setNo resultCount]
- html " Search result $r hits
\n"
- wflush
set setOffset $startPos
set setMax [z39.$setNo resultCount]
if {$setMax > $endPos} {
@@ -163,6 +223,8 @@ proc buttons {setNo setMax startPos after} {
if {$setMax > 0} {
buttons $setNo $setMax $startPos 0
}
+ html " Search result $r hits
\n"
+ wflush
}
if {$setMax > 0} {
z39present $setNo 0 $setOffset $setMax display-brief B