<html>
{
-# $Id: search.egw,v 1.37 1996/03/12 16:30:28 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
}
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 {<a href="http:} $env(SCRIPT_NAME)
+ if {!$useIcons} {
+ html "\n | "
+ }
+ html {<a href="} $env(SCRIPT_NAME)
html / $sessionId {/search.egw/} $setNo + $targetNo +
html [expr $scanNo - 1] + b {">}
if {$useIcons} {
html {<img src="/egwgif/button-previous-terms.gif" }
html {alt="Next Terms" border=0></a>}
} else {
- html {Previous Terms</a> | }
+ html {Previous Terms</a>}
}
- html {<a href="http:} $env(SCRIPT_NAME)
+ if {!$useIcons} {
+ html "\n | "
+ }
+ html {<a href="} $env(SCRIPT_NAME)
html / $sessionId {/search.egw/} $setNo + $targetNo +
html [expr $scanNo + 1] + f {">}
if {$useIcons} {
html {<img src="/egwgif/button-next-terms.gif" }
html {alt="Next Terms" border=0></a>}
} else {
- html {Next Terms</a> | }
+ html {Next Terms</a>}
}
html {</a>}
}
- button-new-query 0 $setNo
+ button-new-query $setNo
set databases [splitDatabaseSpec $host]
set databaseDefault $hist($oSetNo,$targetNo,database)
}
- html {<form action="http:} $env(SCRIPT_NAME)
+ html {<form action="} $env(SCRIPT_NAME)
html / $sessionId {/search.egw/} $setNo + $targetNo {+1" method=get>} \n
set nodb [llength $databases]
if {$nodb > 1} {
set useIcons 0
if {$hist($setNo,$scanNo,scanTerm) == ""} {
button-main
- button-new-query 0 $setNo
+ button-new-query $setNo
return
}
button-main
- html {<a href="http:} $env(SCRIPT_NAME)
+ if {!$useIcons} {
+ html "\n | "
+ }
+ html {<a href="} $env(SCRIPT_NAME)
html / $sessionId {/search.egw/} $setNo + $targetNo +
html [expr $scanNo - 1] + b {">}
if {$useIcons} {
html {<img src="/egwgif/button-previous-terms.gif" }
html {alt="Next Terms" border=0></a>}
} else {
- html {Previous Terms</a> | }
+ html {Previous Terms</a>}
}
- html {<a href="http:} $env(SCRIPT_NAME)
+ if {!$useIcons} {
+ html "\n | "
+ }
+ html {<a href="} $env(SCRIPT_NAME)
html / $sessionId {/search.egw/} $setNo + $targetNo +
html [expr $scanNo + 1] + f {">}
if {$useIcons} {
html {<img src="/egwgif/button-next-terms.gif" }
html {alt="Next Terms" border=0></a>}
} else {
- html {Next Terms</a> | }
+ html {Next Terms</a>}
}
html {</a>}
- button-new-query 0 $setNo
+ button-new-query $setNo
if {!$debug} return
html "<hr>\n"
html $e {: } $env($e) {<br>} \n
}
html "form: " [egw_form] " <br>\n"
- html "target: " $host " <br>\n"
html "databases: " $hist($setNo,$targetNo,database) " <br>\n"
html "selected: " [egw_form base] " <br>\n"
html "setNo: " $setNo " <br>\n"
if {[info commands saveState] == ""} {
source z39util.tcl
+ if {![info exists debug]} {
+ session-lost
+ egw_abort
+ }
}
global sessionWait
global nextSetNo
set setNo $nextSetNo
incr nextSetNo
} else {
- catch {unset hist($setNo,hits)}
+ catch {unset hist($setNo,$targetNo,hits)}
}
set hist($setNo,scan) 0
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) == ""} {
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
}
}
}
- if {$i != ""} {
+ if {[string length $i] != 0} {
set scanNo 1000
set hist($setNo,scan) $i
set termPlusAttr [build-scan $hist($setNo,0,host) $i]
return
}
set query [build-query $hist($setNo,0,host) 3]
- if {"x$query" == "x"} {
+ if {[string length $query] == 0} {
html "<head><title> WWW/Z39.50 Gateway Search</title>\n<body>\n"
displayError "Empty query" \
"You must specify at least one search word"
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) \
html "env($n) = " $env($n) " <br>\n"
}
html "form: " [egw_form] " <br>\n"
- html "target: " $host " <br>\n"
html "databases: " $hist($setNo,$targetNo,database) " <br>\n"
html "selected: " [egw_form base] " <br>\n"
html "query: --" $hist($setNo,$targetNo,query) "-- <br>"