X-Git-Url: http://git.indexdata.com/?p=egate.git;a=blobdiff_plain;f=www%2Fmsearch.egw;h=ef43804369058af7f7d56989d0f34fc3fbe45659;hp=c1c825a95bd71a97d09b571e8b1d3e470458972f;hb=a61ad0378b93e99e362a1d92c33d701dbf103eba;hpb=3d4b6045b8875099666b99edbf1457c91b5da928
diff --git a/www/msearch.egw b/www/msearch.egw
index c1c825a..ef43804 100644
--- a/www/msearch.egw
+++ b/www/msearch.egw
@@ -1,6 +1,6 @@
{
-# $Id: msearch.egw,v 1.3 1995/11/08 18:07:22 adam Exp $
+# $Id: msearch.egw,v 1.20 1996/03/13 14:07:29 adam Exp $
if {[info commands saveState] == ""} {
source z39util.tcl
@@ -13,62 +13,86 @@
html " WWW/Z39.50 Gateway Search \n"
html "\n"
- if {[wform menu1] == ""} {
- set setNo [lindex $sessionParms 0]
- } else {
- if {![info exists hist($nextSetNo,0,host)]} {
- set hist($nextSetNo,0,host) $hist($setNo,0,host)
- for {set i 1} {$i <= $hist($setNo,0,host)} {incr i} {
- set hist($nextSetNo,$i,host) $hist($setNo,$i,host)
- set hist($nextSetNo,$i,database) $hist($setNo,$i,database)
+
+ set setNo [lindex $sessionParms 0]
+
+ if {[llength [egw_form]] > 0} {
+ if {[string length [egw_form host]] > 0} {
+ set hist($setNo,0,host) [llength [egw_form host]]
+ set i 1
+ foreach t [egw_form host] {
+ set hist($setNo,$i,host) $t
+ set hist($setNo,$i,database) [splitDatabaseSpec $t]
+ set hist($setNo,$i,idAuthentication) {}
+ incr i
}
}
+ if {![info exists hist($setNo,0,host)]} {
+ displayError {No servers selected} {}
+ egw_abort
+ }
+ set hist($nextSetNo,0,host) $hist($setNo,0,host)
+ for {set i 1} {$i <= $hist($setNo,0,host)} {incr i} {
+ set hist($nextSetNo,$i,host) $hist($setNo,$i,host)
+ set hist($nextSetNo,$i,database) $hist($setNo,$i,database)
+ set hist($nextSetNo,$i,idAuthentication) \
+ $hist($setNo,$i,idAuthentication)
+ }
set setNo $nextSetNo
incr nextSetNo
for {set i 1} {$i <= $hist($setNo,0,host)} {incr i} {
- set hist($setNo,$i,query) [build-query $hist($setNo,$i,host)]
+ set hist($setNo,$i,query) [build-query $hist($setNo,$i,host) 3]
}
- set hist($setNo,maxPresent) [wform hits]
+
+ set hist($setNo,scan) 0
+
+ set hist($setNo,form,menu1) [egw_form menu1]
+ set hist($setNo,form,menu2) [egw_form menu2]
+ set hist($setNo,form,menu3) [egw_form menu3]
+
+ set hist($setNo,form,entry1) [egw_form entry1]
+ set hist($setNo,form,entry2) [egw_form entry2]
+ set hist($setNo,form,entry3) [egw_form entry3]
+
+ set hist($setNo,form,logic1) [egw_form logic1]
+ set hist($setNo,form,logic2) [egw_form logic2]
+ set hist($setNo,form,logic3) {}
+
+ set hist($setNo,maxPresent) [egw_form hits]
if {$hist($setNo,maxPresent) == ""} {
- set hist($setNo,maxPresent) 30
+ set hist($setNo,maxPresent) 20
+ }
+ set hist($setNo,format) [egw_form format]
+ if {![string length $hist($setNo,format)]} {
+ set hist($setNo,format) brief
+ }
+ set hist($setNo,sort) [egw_form sort]
+ if {![string length $hist($setNo,sort)]} {
+ set hist($setNo,sort) server
}
}
- z39msearch $setNo 1
- html "\n"
- set not $hist($setNo,0,host)
- for {set i 1} {$i <= $not} {incr i} {
- if {$zstatus($i) != 2} continue
- html "- " $hist($setNo,$i,host) ": "
- set status [z39$i.$setNo responseStatus]
- if {[lindex $status 0] == "NSD"} {
- z39$i.$setNo nextResultSetPosition 0
- set code [lindex $status 1]
- set msg [lindex $status 2]
- set addinfo [lindex $status 3]
- html "Error\n
- NSD$code: $msg: $addinfo"
- } else {
- set r [z39$i.$setNo resultCount]
- html "$r hits\n
- \n"
+ set useIcons 1
+ button-main
+ button-new-query $setNo
+ button-view-history
+ button-new-target
- display-rec 1 $hist($setNo,$i,offset) display-brief z39$i
- }
- html "\n"
- }
- html "
\n"
-}
+ html "
\n"
+ z39msearch $setNo B 1 $hist($setNo,maxPresent) 1
+ display-result-set-m $setNo
-
-{
- html { New target } " | \n"
- html { New query }
+ set useIcons 0
+ button-main
+ button-new-query $setNo
+ button-view-history
+ button-new-target
}
{
+ if {!$debug} return
html "
\n"
html "Debug information
\n"
html "sessionId: $sessionId
\n"
@@ -76,10 +100,11 @@
foreach e {SERVER_NAME PATH_INFO SCRIPT_NAME} {
html $e {: } $env($e) {
} \n
}
- html "form: " [wform] "
\n"
- html "target: " $host "
\n"
+ html "form: " [egw_form] "
\n"
html "query: --" $hist($setNo,1,query) "--
\n"
html "database: " $hist($setNo,1,database) "
\n"
+ html "sort: " $hist($setNo,sort) "
\n"
+ html "format: " $hist($setNo,format) "
\n"
html "setNo: " $setNo "
\n"
html "nextSetNo: " $nextSetNo "
\n"
}