X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fmsearch.egw;h=ee8add3c445a8a911ca5b501c72dc001fc1e8278;hb=4938d0c2e8f4e1eec397c2bfbbc7e23fd150c369;hp=7f41697c9863731c3580e709bab278abca43644f;hpb=b443634fbd412cea15ea527188c3e241bb1edf21;p=egate.git
diff --git a/www/msearch.egw b/www/msearch.egw
index 7f41697..ee8add3 100644
--- a/www/msearch.egw
+++ b/www/msearch.egw
@@ -1,6 +1,6 @@
{
-# $Id: msearch.egw,v 1.2 1995/11/08 16:14:33 adam Exp $
+# $Id: msearch.egw,v 1.16 1996/03/07 12:46:08 adam Exp $
if {[info commands saveState] == ""} {
source z39util.tcl
@@ -11,65 +11,74 @@
global hist
global zstatus
- 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)
- }
+ html " WWW/Z39.50 Gateway Search \n"
+ html "\n"
+
+ set setNo [lindex $sessionParms 0]
+
+ if {[egw_form menu1] != ""} {
+ 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,maxPresent) [egw_form hits]
if {$hist($setNo,maxPresent) == ""} {
- set hist($setNo,maxPresent) 30
+ set hist($setNo,maxPresent) 20
}
}
- html " WWW/Z39.50 Gateway Search \n"
- html "\n"
- z39msearch $setNo 1
+ set useIcons 1
+ button-europagate
+ button-new-query 1 $setNo
+ button-new-target 0
+
+ html "
\n"
+ z39msearch $setNo B 1 $hist($setNo,maxPresent) 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) ": "
+ html "
" [lindex $targets($hist($setNo,$i,host)) 0] ": "
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"
+ html "Error
\n - NSD$code: $msg: $addinfo"
} else {
set r [z39$i.$setNo resultCount]
- html "$r hits\n
- \n"
+ html "$r hits\n
- \n
\n"
- display-rec 1 $hist($setNo,$i,offset) display-brief z39$i
+ if {$hist($setNo,$i,offset) > $hist($setNo,maxPresent)} {
+ display-rec 1 $hist($setNo,maxPresent) display-brief $setNo $i
+ } else {
+ display-rec 1 $hist($setNo,$i,offset) display-brief $setNo $i
+ }
+ html "
"
}
html "\n"
}
html "
\n"
-}
-
-
-{
- html { New target } " | \n"
- html { New query }
+ set useIcons 0
+ button-europagate
+ button-new-query 1 $setNo
+ button-new-target 0
}
{
+ if {!$debug} return
html "
\n"
html "Debug information
\n"
html "sessionId: $sessionId
\n"
@@ -77,9 +86,10 @@
foreach e {SERVER_NAME PATH_INFO SCRIPT_NAME} {
html $e {: } $env($e) {
} \n
}
- html "form: " [wform] "
\n"
+ html "form: " [egw_form] "
\n"
html "target: " $host "
\n"
- html "query: --" $hist($setNo,1,query) "--
"
+ html "query: --" $hist($setNo,1,query) "--
\n"
+ html "database: " $hist($setNo,1,database) "
\n"
html "setNo: " $setNo "
\n"
html "nextSetNo: " $nextSetNo "
\n"
}