X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fsearch.egw;h=e526ebd9a65f9995a10f27bea193955875de1d88;hb=7f332a840baf336e34d612cdee0ef27901f0dd11;hp=5c901707cc18787670bbbf0ec6b3c6b90f621aba;hpb=02d3e042a063e539acce998f74b00a09df000cd0;p=egate.git diff --git a/www/search.egw b/www/search.egw index 5c90170..e526ebd 100644 --- a/www/search.egw +++ b/www/search.egw @@ -1,6 +1,6 @@ { -# $Id: search.egw,v 1.36 1996/03/11 17:40:48 adam Exp $ +# $Id: search.egw,v 1.41 2001/02/26 14:32:36 adam Exp $ proc start-scan {scanNo targetNo cache dir initSet} { global sessionId @@ -21,7 +21,7 @@ proc start-scan {scanNo targetNo cache dir initSet} { html "\n" set useIcons 1 - button-europagate + button-main if {$dir == "b"} { set lines 20 @@ -35,32 +35,38 @@ proc start-scan {scanNo targetNo cache dir initSet} { } if {$hist($setNo,$scanNo,scanTerm) != ""} { if {[z39scan $setNo $scanNo 0 $lines $pos $cache] != "1"} { - button-new-query 0 $setNo + button-new-query $setNo egw_log debug "z39_scan failed" return } - html {} if {$useIcons} { html {} } else { - html {Previous Terms | } + html {Previous Terms} } - html {} if {$useIcons} { html {} } else { - html {Next Terms | } + html {Next Terms} } html {} } - button-new-query 0 $setNo + button-new-query $setNo set databases [splitDatabaseSpec $host] @@ -72,7 +78,7 @@ proc start-scan {scanNo targetNo cache dir initSet} { set databaseDefault $hist($oSetNo,$targetNo,database) } - html {
} \n set nodb [llength $databases] if {$nodb > 1} { @@ -120,8 +126,8 @@ proc start-scan {scanNo targetNo cache dir initSet} { set useIcons 0 if {$hist($setNo,$scanNo,scanTerm) == ""} { - button-europagate - button-new-query 0 $setNo + button-main + button-new-query $setNo return } @@ -129,29 +135,35 @@ proc start-scan {scanNo targetNo cache dir initSet} { display-scan $setNo $scanNo 0 html "

\n" - button-europagate + button-main - html {} if {$useIcons} { html {} } else { - html {Previous Terms | } + html {Previous Terms} } - html {} if {$useIcons} { html {} } else { - html {Next Terms | } + html {Next Terms} } html {} - button-new-query 0 $setNo + button-new-query $setNo if {!$debug} return html "

\n" @@ -162,7 +174,6 @@ proc start-scan {scanNo targetNo cache dir initSet} { 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" @@ -171,6 +182,10 @@ proc start-scan {scanNo targetNo cache dir initSet} { if {[info commands saveState] == ""} { source z39util.tcl + if {![info exists debug]} { + session-lost + egw_abort + } } global sessionWait global nextSetNo @@ -192,7 +207,7 @@ proc start-scan {scanNo targetNo cache dir initSet} { set setNo $nextSetNo incr nextSetNo } else { - catch {unset hist($setNo,hits)} + catch {unset hist($setNo,$targetNo,hits)} } set hist($setNo,scan) 0 @@ -214,11 +229,11 @@ proc start-scan {scanNo targetNo cache dir initSet} { set b [egw_form base] if {[egw_form baseall] != ""} { - set hist($setNo,0,database) $databases + set hist($setNo,$targetNo,database) $databases } elseif {$b == ""} { - set hist($setNo,0,database) $databases + set hist($setNo,$targetNo,database) $databases } else { - set hist($setNo,0,database) $b + set hist($setNo,$targetNo,database) $b } set hist($setNo,maxPresent) [egw_form hits] if {$hist($setNo,maxPresent) == ""} { @@ -228,7 +243,7 @@ proc start-scan {scanNo targetNo cache dir initSet} { set hist($setNo,sort) server set i [lindex $sessionParms 2] - if {$i == ""} { + if {[string length $i] == 0} { for {set j 1} {$j <= 3} {incr j} { if {[egw_form scan$j] != ""} { set i $j @@ -236,7 +251,7 @@ proc start-scan {scanNo targetNo cache dir initSet} { } } } - if {$i != ""} { + if {[string length $i] != 0} { set scanNo 1000 set hist($setNo,scan) $i set termPlusAttr [build-scan $hist($setNo,0,host) $i] @@ -248,7 +263,7 @@ proc start-scan {scanNo targetNo cache dir initSet} { return } set query [build-query $hist($setNo,0,host) 3] - if {"x$query" == "x"} { + if {[string length $query] == 0} { html " WWW/Z39.50 Gateway Search\n\n" displayError "Empty query" \ "You must specify at least one search word" @@ -269,7 +284,7 @@ proc start-scan {scanNo targetNo cache dir initSet} { set setNo $nextSetNo incr nextSetNo } else { - catch {unset hist($setNo,hits)} + catch {unset hist($setNo,$targetNo,hits)} } set hist($setNo,scan) 0 set hist($setNo,$targetNo,query) \ @@ -316,7 +331,6 @@ proc start-scan {scanNo targetNo cache dir initSet} { html "env($n) = " $env($n) "
\n" } html "form: " [egw_form] "
\n" - html "target: " $host "
\n" html "databases: " $hist($setNo,$targetNo,database) "
\n" html "selected: " [egw_form base] "
\n" html "query: --" $hist($setNo,$targetNo,query) "--
"