X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fmsearch.egw;h=a86d918f9c1f25bec09ae1bbd3aa3074cdc52d4b;hb=25db261b6bbbfcc7bc26f679f195b51d31b9d7d7;hp=dfc71e9d55a4e11869ced70745db1cf7f1a00ea8;hpb=2213843897f0bc54bc535935c56fe830648b171a;p=egate.git
diff --git a/www/msearch.egw b/www/msearch.egw
index dfc71e9..a86d918 100644
--- a/www/msearch.egw
+++ b/www/msearch.egw
@@ -1,6 +1,6 @@
{
-# $Id: msearch.egw,v 1.7 1995/12/22 14:21:15 adam Exp $
+# $Id: msearch.egw,v 1.15 1996/02/29 15:41:38 adam Exp $
if {[info commands saveState] == ""} {
source z39util.tcl
@@ -13,9 +13,10 @@
html "
WWW/Z39.50 Gateway Search \n"
html "\n"
+
set setNo [lindex $sessionParms 0]
- if {[wform menu1] != ""} {
+ 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)
@@ -29,12 +30,19 @@
for {set i 1} {$i <= $hist($setNo,0,host)} {incr i} {
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
}
}
- z39msearch $setNo 1 B
+
+ 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)
@@ -50,38 +58,27 @@
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 $i
+ if {$hist($setNo,$i,offset) > $hist($setNo,maxPresent)} {
+ display-rec 1 $hist($setNo,maxPresent) display-brief $i
+ } else {
+ display-rec 1 $hist($setNo,$i,offset) display-brief $i
+ }
+ html "
"
}
html "\n"
}
html "
\n"
-}
-{
- global useIcons
-
- if {$useIcons} {
- html {}
- }
- html {}
- } else {
- html {"> New target } " | \n"
- }
- html {}
- } else {
- 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"
@@ -89,7 +86,7 @@
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) "--
\n"
html "database: " $hist($setNo,1,database) "
\n"