X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=www%2Fsearch.egw;h=738906bd5ea7c1762c8bd8154ed96cca339f0b4c;hb=4938d0c2e8f4e1eec397c2bfbbc7e23fd150c369;hp=daaf3b7fb70e32b74e0b4e700bfb6bb58e4fdeb5;hpb=6ceeaa167e3ef2970b6ef0ce2b6c7d9c362eda0a;p=egate.git
diff --git a/www/search.egw b/www/search.egw
index daaf3b7..738906b 100644
--- a/www/search.egw
+++ b/www/search.egw
@@ -1,8 +1,8 @@
{
-# $Id: search.egw,v 1.22 1996/01/03 08:59:43 adam Exp $
+# $Id: search.egw,v 1.34 1996/03/07 12:46:09 adam Exp $
-proc start-scan {scanNo cache dir} {
+proc start-scan {scanNo targetNo cache dir initSet} {
global sessionId
global sessionParms
global sessionWait
@@ -11,19 +11,18 @@ proc start-scan {scanNo cache dir} {
global targets
global nextSetNo
global env
+ global useIcons
+ global debug
- set host $hist($setNo,host)
+ set host $hist($setNo,$targetNo,host)
- html "
WWW/Z39.50 Gateway Scan " $host " \n"
+ html " WWW/Z39.50 Gateway Scan " [splitHostSpec $host]
+ html " \n"
html "\n"
-
- if {$hist($setNo,$scanNo,scanTerm) == ""} {
- displayError "Empty query" \
- "You must specify at least one search word"
- html "\n"
- wabort
- return
- }
+
+ set useIcons 1
+ button-europagate
+
if {$dir == "b"} {
set lines 20
set pos 20
@@ -34,115 +33,140 @@ proc start-scan {scanNo cache dir} {
set lines 20
set pos 10
}
- if {[z39scan $setNo $scanNo 0 $lines $pos $cache] != "1"} {
- return
- }
- html {Backward} "\n"
-
- html {Forward
}
-
- display-scan $setNo $scanNo 0
-
- html {Backward} "\n"
-
- html {Forward
}
-
- 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
- global useIcons
- global env
- global hist
-
- if {!$useIcons && $after && $setMax < [z39.$setNo resultCount]} {
- html "\n"
- html "
\n"
- html {}
- html "\n"
- }
-
- html "\n"
- if {$useIcons} {
- html {}
- }
- if {$setMax < [z39.$setNo resultCount]} {
+ if {$hist($setNo,$scanNo,scanTerm) != ""} {
+ if {[z39scan $setNo $scanNo 0 $lines $pos $cache] != "1"} {
+ button-new-query 0 $setNo
+ egw_log debug "z39_scan failed"
+ return
+ }
html {}
if {$useIcons} {
- html {">}
+ html {}
} else {
- html {">Next Records} " | \n"
+ html {Previous Terms | }
}
- }
- if {$startPos != "" && $startPos != "1"} {
+
html {}
if {$useIcons} {
- html {">}
+ html {}
} else {
- html {">Previous Records} " | \n"
+ html {Next Terms | }
+ }
+ html {}
+ }
+ button-new-query 0 $setNo
+
+ set databases [lindex $targets($host) 1]
+
+ if {$initSet == ""} {
+ set databaseDefault [lindex $databases 0]
+ set oSetNo 0
+ } else {
+ set oSetNo $initSet
+ set databaseDefault $hist($oSetNo,$targetNo,database)
+ }
+
+ html {
}
+
+ set useIcons 0
+ if {$hist($setNo,$scanNo,scanTerm) == ""} {
+ button-europagate
+ button-new-query 0 $setNo
+ return
+ }
+
+ html "\n"
+ display-scan $setNo $scanNo 0
+ html "
\n"
+
+ button-europagate
+
html {}
if {$useIcons} {
- html {">}
+ html {}
} else {
- html {">New Query} " | \n"
+ html {Previous Terms | }
}
html {}
if {$useIcons} {
- html {">}
+ html {}
} else {
- html {">New Target}
- }
- html "
\n"
- if {!$useIcons && !$after && $startPos != "" && $startPos != "1"} {
- html "
\n"
- html {}
- html "\n"
+ html {Next Terms | }
}
+ html {}
+ button-new-query 0 $setNo
+ if {!$debug} return
+ 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: " [egw_form] "
\n"
+ html "target: " $host "
\n"
+ html "databases: " $hist($setNo,$targetNo,database) "
\n"
+ html "selected: " [egw_form base] "
\n"
+ html "setNo: " $setNo "
\n"
+ html "nextSetNo: " $nextSetNo "
\n"
}
if {[info commands saveState] == ""} {
@@ -154,10 +178,15 @@ proc buttons {setNo setMax startPos after} {
global hist
set setNo [lindex $sessionParms 0]
+ set targetNo [lindex $sessionParms 1]
+ set startPos [lindex $sessionParms 2]
+ set endPos [lindex $sessionParms 3]
- if {[wform] != ""} {
- set hist($nextSetNo,idAuthentication) $hist($setNo,idAuthentication)
- set hist($nextSetNo,host) $hist($setNo,host)
+ if {[egw_form] != ""} {
+ set hist($nextSetNo,$targetNo,idAuthentication) \
+ $hist($setNo,$targetNo,idAuthentication)
+ set hist($nextSetNo,$targetNo,host) \
+ $hist($setNo,$targetNo,host)
if {$nextSetNo == $setNo} {
set setNo $nextSetNo
@@ -165,127 +194,130 @@ proc buttons {setNo setMax startPos after} {
} else {
catch {unset hist($setNo,hits)}
}
- set hist($setNo,form,menu1) [wform menu1]
- set hist($setNo,form,menu2) [wform menu2]
- set hist($setNo,form,menu3) [wform menu3]
+ 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) [wform entry1]
- set hist($setNo,form,entry2) [wform entry2]
- set hist($setNo,form,entry3) [wform entry3]
+ 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) [wform logic1]
- set hist($setNo,form,logic2) [wform logic2]
+ set hist($setNo,form,logic1) [egw_form logic1]
+ set hist($setNo,form,logic2) [egw_form logic2]
+ set hist($setNo,form,logic3) {}
- set host $hist($setNo,host)
+ set host $hist($setNo,0,host)
set databases [lindex $targets($host) 1]
- set b [wform base]
- if {[wform baseall] != ""} {
- set hist($setNo,database) $databases
+ set b [egw_form base]
+ if {[egw_form baseall] != ""} {
+ set hist($setNo,0,database) $databases
} elseif {$b == ""} {
- set hist($setNo,database) $databases
+ set hist($setNo,0,database) $databases
} else {
- set hist($setNo,database) $b
+ set hist($setNo,0,database) $b
}
- set hist($setNo,maxPresent) [wform hits]
+ set hist($setNo,maxPresent) [egw_form hits]
if {$hist($setNo,maxPresent) == ""} {
set hist($setNo,maxPresent) 30
}
- for {set i 1} {$i <= 3} {incr i} {
- if {[wform scan$i] != ""} {
- set scanNo 1000
- set hist($setNo,scan) $i
- set termPlusAttr [build-scan $hist($setNo,host) $i]
- set hist($setNo,$scanNo,scanTerm) [lindex $termPlusAttr 0]
- set hist($setNo,scanAttr) [lindex $termPlusAttr 1]
- start-scan $scanNo 0 {}
- wabort
- return
+ set i [lindex $sessionParms 2]
+ if {$i == ""} {
+ for {set j 1} {$j <= 3} {incr j} {
+ if {[egw_form scan$j] != ""} {
+ set i $j
+ break
+ }
}
}
- set hist($setNo,scan) 0
- set query [build-query $hist($setNo,host) 3]
+ if {$i != ""} {
+ set scanNo 1000
+ set hist($setNo,scan) $i
+ set termPlusAttr [build-scan $hist($setNo,0,host) $i]
+ set hist($setNo,$scanNo,scanTerm) [lindex $termPlusAttr 0]
+ set hist($setNo,scanAttr) [lindex $termPlusAttr 1]
+ start-scan $scanNo $targetNo 0 {} $setNo
+ html "