</head>
<body>
{
-# $Id: query.egw,v 1.28 1996/01/12 13:08:28 adam Exp $
+# $Id: query.egw,v 1.37 1996/03/12 16:30:27 adam Exp $
if {[info commands saveState] == ""} {
source z39util.tcl
global nextSetNo
global hist
- set host [lindex $sessionParms 0]
- set initSet [lindex $sessionParms 1]
+ set initSet [lindex $sessionParms 0]
+ set host [lindex $sessionParms 1]
set scanLine [lindex $sessionParms 2]
set scanTerm [lrange $sessionParms 3 end]
set nextSetNo 1
set setNo 1
}
- if {[catch {set oldHost [z39 connect]}]} {
+ if {[catch {set oldHost [z390 connect]}]} {
set oldHost ""
}
- set hist($setNo,host) $host
- set hist($setNo,idAuthentication) [lindex $targets($host) 3]
+ set hist($setNo,0,host) $host
+ set hist($setNo,0,idAuthentication) [lindex $targets($host) 3]
- if {[catch {z39 failback fail-response}]} {
- ir z39
- }
+ mkAssoc z390 $host
- html "<h2>Search in " [lindex $targets($host) 0] "</h2>\n"
- z39 callback ok-response
- z39 failback fail-response
- if {$host != $oldHost} {
- catch {z39 disconnect}
+ z390 callback ok-response
+ z390 failback fail-response
+ set thisHost [splitHostSpec $host]
+ if {[string compare $thisHost $oldHost]} {
+ catch {z390 disconnect}
set sessionWait 0
- if {[catch {z39 connect $host}]} {
- displayError "Cannot connect to target ${host}" {}
+ if {[catch {z390 connect $thisHost}]} {
+ displayError "Cannot connect to target ${thisHost}" {}
html "</body></html>\n"
- z39 disconnect
- wabort
+ z390 disconnect
+ egw_abort
} elseif {$sessionWait == 0} {
- if {[catch {zwait sessionWait 35}]} {
- displayError "Cannot connect to target ${host}" {}
+ if {[catch {egw_wait sessionWait 35}]} {
+ displayError "Cannot connect to target ${thisHost}" {}
html "</body></html>\n"
- z39 disconnect
- wabort
+ z390 disconnect
+ egw_abort
}
if {$sessionWait != 1} {
- displayError "Cannot connect to target ${host}" {}
+ displayError "Cannot connect to target ${thisHost}" {}
html "</body></html>\n"
- z39 disconnect
- wabort
+ z390 disconnect
+ egw_abort
}
}
set sessionWait 0
- z39 idAuthentication $hist($setNo,idAuthentication)
- if {[catch {z39 init}]} {
- displayError "Cannot initialize target ${host}" {}
+ z390 idAuthentication $hist($setNo,0,idAuthentication)
+ if {[catch {z390 init}]} {
+ displayError "Cannot initialize target ${thisHost}" {}
html "</body></html>\n"
- wabort
+ egw_abort
}
- if {[catch {zwait sessionWait 60}]} {
- displayError "Cannot initialize target ${host}" {}
+ if {$sessionWait == 0 && [catch {egw_wait sessionWait 60}]} {
+ displayError "Cannot initialize target ${thisHost}" {}
html "</body></html>\n"
- wabort
+ egw_abort
}
if {$sessionWait != "1"} {
- displayError "Cannot initialize target ${host}" {}
- htmlr "</body></html>\n"
- wabort
+ displayError "Cannot initialize target ${thisHost}" {}
+ html "</body></html>\n"
+ egw_abort
}
- if {![z39 initResult]} {
- displayError "Connection rejected by target ${host}" \
- [z39 userInformationField]
- z39 disconnect
- htmlr "</body></html>"
- wabort
+ if {![z390 initResult]} {
+ displayError "Connection rejected by target ${thisHost}" \
+ [z390 userInformationField]
+ z390 disconnect
+ html "</body></html>\n"
+ egw_abort
}
}
- set databases [lindex $targets($host) 1]
- if {$initSet == ""} {
+ set useIcons 1
+ button-main
+ button-new-target 1
+ if {[lsearch [z390 options] scan] >= 0} {
+ button-scan-window 1 $setNo
+ }
+ button-view-history 0
+
+ html "<h2>" [lindex $targets($host) 0] "</h2><br>\n"
+
+ html [lindex $targets($host) 4] "<br>\n"
+
+ set databases [splitDatabaseSpec $host]
+ if {$initSet == -1} {
set databaseDefault [lindex $databases 0]
set oSetNo 0
} else {
set oSetNo $initSet
- set databaseDefault $hist($oSetNo,database)
+ set databaseDefault $hist($oSetNo,0,database)
}
html {<form action="http:} $env(SCRIPT_NAME)
- html / $sessionId {/search.egw/} $setNo {" method=get>} \n
+ html / $sessionId {/search.egw/} $setNo + 0 {" method=get>} \n
set nodb [llength $databases]
if {$nodb > 1} {
if {$nodb > 2} {
html {<input type="checkbox" name="baseall" value="}
html [concat $databases] {"> All <br>} \n
}
- html "Input your search criteria:<br>\n"
}
+ html "Input your search criteria:<br>\n"
set fields [lindex $targets($host) 2]
for {set no 1} {$no < 4} {incr no} {
html {<select name="menu} $no {">} \n
if {[string length $template] > 0} {
html { value="} $template {"}
}
- html { size=45> }
- if {0 && [lsearch [z39 options] scan] >= 0} {
- html {<input type="checkbox" name="scan} $no {" value="1" scan>}
+ html { size=35> }
+ if {0 && [lsearch [z390 options] scan] >= 0} {
+ html {<input type="checkbox" name="scan} $no {" value="1" scan>}
}
- html "<br>\n"
if {$no < 3} {
- html {<center><select name="logic} $no {">} \n
+ html {<select name="logic} $no {">} \n
set template {}
if {$oSetNo > 0} {
set template [join $hist($oSetNo,form,logic$no) " "]
if {$template == $op} continue
html "<option> " [join $op " "] \n
}
- html "</select></center>\n"
+ html "</select>\n"
}
html "<br>\n"
}
html 20
}
html {" size=4>}
-}
-</form>
-<p>
-
-{
- button-europagate
+ html "</form>\n"
+ html "<p>\n"
+ set useIcons 0
+ button-main
button-new-target 1
-
- if {[lsearch [z39 options] scan] >= 0} {
+ if {[lsearch [z390 options] scan] >= 0} {
button-scan-window 1 $setNo
}
button-view-history 0
foreach e {SERVER_NAME PATH_INFO SCRIPT_NAME} {
html $e {: } $env($e) {<br>} \n
}
- html "form: " [wform] " <br>\n"
+ html "form: " [egw_form] " <br>\n"
html "target: " $host " <br>\n"
html "databases: " $databases " <br>\n"
html "setNo: " $setNo " <br>\n"
html "scanTerm: " $scanTerm " <br>\n"
}
</body></html>
-
-