From 4938d0c2e8f4e1eec397c2bfbbc7e23fd150c369 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 7 Mar 1996 12:46:07 +0000 Subject: [PATCH] Lots of changes. They aren't visible though. --- www/Makefile | 4 +- www/msearch.egw | 6 +- www/query.egw | 44 +++++----- www/sameas.egw | 46 +++++++++++ www/search.egw | 180 ++++++++++++----------------------------- www/showfull.egw | 18 ++--- www/z39util.tcl | 234 ++++++++++++++++++++++++++++++++++++----------------- www/ztargets.conf | 25 +++++- 8 files changed, 310 insertions(+), 247 deletions(-) create mode 100644 www/sameas.egw diff --git a/www/Makefile b/www/Makefile index 0017069..000302e 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1,7 +1,7 @@ # Makefile for www gateway utility # Europagate, 1995 # -# $Id: Makefile,v 1.33 1996/03/05 18:50:24 adam Exp $ +# $Id: Makefile,v 1.34 1996/03/07 12:46:07 adam Exp $ # SHELL=/bin/sh @@ -19,7 +19,7 @@ TCLLIB=/usr/local/lib/libtcl7.5.a TCLINC= WSCRIPTS=egwscript targets.egw query.egw search.egw showfull.egw z39util.tcl \ - mtargets.egw mquery.egw msearch.egw history.egw tform.egw tdefine.egw + mtargets.egw mquery.egw msearch.egw history.egw tform.egw tdefine.egw sameas.egw HSCRIPTS=egwindex.html CONFFILES=egw.res ztargets.conf TPROG1=egwcgi diff --git a/www/msearch.egw b/www/msearch.egw index a86d918..ee8add3 100644 --- a/www/msearch.egw +++ b/www/msearch.egw @@ -1,6 +1,6 @@ { -# $Id: msearch.egw,v 1.15 1996/02/29 15:41:38 adam Exp $ +# $Id: msearch.egw,v 1.16 1996/03/07 12:46:08 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl @@ -61,9 +61,9 @@ html "$r hits\n
\n" } diff --git a/www/query.egw b/www/query.egw index fec5af1..d2280ab 100644 --- a/www/query.egw +++ b/www/query.egw @@ -4,7 +4,7 @@ { -# $Id: query.egw,v 1.34 1996/02/29 15:41:39 adam Exp $ +# $Id: query.egw,v 1.35 1996/03/07 12:46:08 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl @@ -33,44 +33,44 @@ proc ok-response {} { 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] - mkAssoc z39 $host + mkAssoc z390 $host - z39 callback ok-response - z39 failback fail-response + z390 callback ok-response + z390 failback fail-response set thisHost [splitHostSpec $host] if {[string compare $thisHost $oldHost]} { - catch {z39 disconnect} + catch {z390 disconnect} set sessionWait 0 - if {[catch {z39 connect $thisHost}]} { + if {[catch {z390 connect $thisHost}]} { displayError "Cannot connect to target ${thisHost}" {} html "\n" - z39 disconnect + z390 disconnect egw_abort } elseif {$sessionWait == 0} { if {[catch {egw_wait sessionWait 35}]} { displayError "Cannot connect to target ${thisHost}" {} html "\n" - z39 disconnect + z390 disconnect egw_abort } if {$sessionWait != 1} { displayError "Cannot connect to target ${thisHost}" {} html "\n" - z39 disconnect + z390 disconnect egw_abort } } set sessionWait 0 - z39 idAuthentication $hist($setNo,idAuthentication) - if {[catch {z39 init}]} { + z390 idAuthentication $hist($setNo,0,idAuthentication) + if {[catch {z390 init}]} { displayError "Cannot initialize target ${thisHost}" {} html "\n" egw_abort @@ -85,10 +85,10 @@ proc ok-response {} { html "\n" egw_abort } - if {![z39 initResult]} { + if {![z390 initResult]} { displayError "Connection rejected by target ${thisHost}" \ - [z39 userInformationField] - z39 disconnect + [z390 userInformationField] + z390 disconnect html "\n" egw_abort } @@ -97,7 +97,7 @@ proc ok-response {} { set useIcons 1 button-europagate 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 @@ -113,11 +113,11 @@ proc ok-response {} { set oSetNo 0 } else { set oSetNo $initSet - set databaseDefault $hist($oSetNo,database) + set databaseDefault $hist($oSetNo,0,database) } html {
} \n + html / $sessionId {/search.egw/} $setNo + 0 {" method=get>} \n set nodb [llength $databases] if {$nodb > 1} { if {$nodb > 2} { @@ -168,7 +168,7 @@ proc ok-response {} { html { value="} $template {"} } html { size=43> } - if {0 && [lsearch [z39 options] scan] >= 0} { + if {0 && [lsearch [z390 options] scan] >= 0} { html {} } if {$no < 3} { @@ -208,7 +208,7 @@ proc ok-response {} { set useIcons 0 button-europagate 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 diff --git a/www/sameas.egw b/www/sameas.egw new file mode 100644 index 0000000..8209d48 --- /dev/null +++ b/www/sameas.egw @@ -0,0 +1,46 @@ + +{ +# $Id: sameas.egw,v 1.1 1996/03/07 12:46:08 adam Exp $ + if {[info commands saveState] == ""} { + source z39util.tcl + } + global nextSetNo + + set setNo [lindex $sessionParms 0] + set targetNo [lindex $sessionParms 1] + set startPos [lindex $sessionParms 2] + set endPos [lindex $sessionParms 3] + set docId [lindex $sessionParms 4] + + if {[info exists hist(setNoT,docId$docId)]} { + set setNo $hist(setNoT,docId$docId) + } else { + set hist($nextSetNo,$targetNo,idAuthentication) \ + $hist($setNo,$targetNo,idAuthentication) + set hist($nextSetNo,$targetNo,host) \ + $hist($setNo,$targetNo,host) + set hist($nextSetNo,$targetNo,database) \ + $hist($setNo,$targetNo,database) + set setNo $nextSetNo + incr nextSetNo + } + set hist($setNo,scan) 0 + + for {set i 1} {$i <= 3} {incr i} { + set hist($setNo,form,menu$i) {} + set hist($setNo,form,entry$i) {} + set hist($setNo,form,logic$i) {} + } + set host $hist($setNo,$targetNo,host) + + html " WWW/Z39.50 Gateway Search Feedback " + html [splitHostSpec $host] + html " \n" + html "\n" + + set hist($setNo,$targetNo,query) {} + set hist($setNo,$targetNo,queryId) $docId + egw_log debug "In sameas: got docID $docId" + display-result-set-s $setNo $targetNo $startPos $endPos +} + \ No newline at end of file diff --git a/www/search.egw b/www/search.egw index 9263dfa..738906b 100644 --- a/www/search.egw +++ b/www/search.egw @@ -1,8 +1,8 @@ { -# $Id: search.egw,v 1.33 1996/02/29 15:41:39 adam Exp $ +# $Id: search.egw,v 1.34 1996/03/07 12:46:09 adam Exp $ -proc start-scan {scanNo cache dir initSet} { +proc start-scan {scanNo targetNo cache dir initSet} { global sessionId global sessionParms global sessionWait @@ -14,7 +14,7 @@ proc start-scan {scanNo cache dir initSet} { global useIcons global debug - set host $hist($setNo,host) + set host $hist($setNo,$targetNo,host) html " WWW/Z39.50 Gateway Scan " [splitHostSpec $host] html " \n" @@ -40,7 +40,8 @@ proc start-scan {scanNo cache dir initSet} { return } html {} + html / $sessionId {/search.egw/} $setNo + $targetNo + + html [expr $scanNo - 1] + b {">} if {$useIcons} { html {} @@ -49,7 +50,8 @@ proc start-scan {scanNo cache dir initSet} { } html {} + html / $sessionId {/search.egw/} $setNo + $targetNo + + html [expr $scanNo + 1] + f {">} if {$useIcons} { html {} @@ -67,11 +69,11 @@ proc start-scan {scanNo cache dir initSet} { set oSetNo 0 } else { set oSetNo $initSet - set databaseDefault $hist($oSetNo,database) + set databaseDefault $hist($oSetNo,$targetNo,database) } html {} \n + html / $sessionId {/search.egw/} $setNo + $targetNo {+1" method=get>} \n set nodb [llength $databases] if {$nodb > 1} { if {$nodb > 2} { @@ -130,7 +132,8 @@ proc start-scan {scanNo cache dir initSet} { button-europagate html {} + html / $sessionId {/search.egw/} $setNo + $targetNo + + html [expr $scanNo - 1] + b {">} if {$useIcons} { html {} @@ -139,7 +142,8 @@ proc start-scan {scanNo cache dir initSet} { } html {} + html / $sessionId {/search.egw/} $setNo + $targetNo + + html [expr $scanNo + 1] + f {">} if {$useIcons} { html {} @@ -159,50 +163,12 @@ proc start-scan {scanNo cache dir initSet} { } html "form: " [egw_form] "
\n" html "target: " $host "
\n" - html "databases: " $hist($setNo,database) "
\n" + html "databases: " $hist($setNo,$targetNo,database) "
\n" html "selected: " [egw_form base] "
\n" html "setNo: " $setNo "
\n" html "nextSetNo: " $nextSetNo "
\n" } -proc buttons {setNo setMax startPos after} { - global sessionId - global useIcons - global env - global hist - - html "

\n" - button-europagate - if {$setMax > 0 && $setMax < [z39.$setNo resultCount]} { - html {Next Records} - } else { - html {">Next Records} " | \n" - } - } - if {$setMax > 0 && $startPos != "" && $startPos != "1"} { - html {} - } else { - html {">Previous Records} " | \n" - } - } - button-new-query 1 $setNo - button-new-target 1 - button-view-history 0 - - html "

\n" -} - if {[info commands saveState] == ""} { source z39util.tcl } @@ -212,12 +178,15 @@ proc buttons {setNo setMax startPos after} { global hist set setNo [lindex $sessionParms 0] - set startPos [lindex $sessionParms 1] - set endPos [lindex $sessionParms 2] + set targetNo [lindex $sessionParms 1] + set startPos [lindex $sessionParms 2] + set endPos [lindex $sessionParms 3] if {[egw_form] != ""} { - set hist($nextSetNo,idAuthentication) $hist($setNo,idAuthentication) - set hist($nextSetNo,host) $hist($setNo,host) + set hist($nextSetNo,$targetNo,idAuthentication) \ + $hist($setNo,$targetNo,idAuthentication) + set hist($nextSetNo,$targetNo,host) \ + $hist($setNo,$targetNo,host) if {$nextSetNo == $setNo} { set setNo $nextSetNo @@ -239,22 +208,22 @@ proc buttons {setNo setMax startPos after} { 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 [egw_form base] if {[egw_form baseall] != ""} { - set hist($setNo,database) $databases + 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) [egw_form hits] if {$hist($setNo,maxPresent) == ""} { set hist($setNo,maxPresent) 30 } - set i [lindex $sessionParms 1] + set i [lindex $sessionParms 2] if {$i == ""} { for {set j 1} {$j <= 3} {incr j} { if {[egw_form scan$j] != ""} { @@ -266,15 +235,15 @@ proc buttons {setNo setMax startPos after} { if {$i != ""} { set scanNo 1000 set hist($setNo,scan) $i - set termPlusAttr [build-scan $hist($setNo,host) $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 0 {} $setNo + start-scan $scanNo $targetNo 0 {} $setNo html "\n" egw_abort return } - set query [build-query $hist($setNo,host) 3] + set query [build-query $hist($setNo,0,host) 3] if {"x$query" == "x"} { html " WWW/Z39.50 Gateway Search\n\n" displayError "Empty query" \ @@ -282,12 +251,15 @@ proc buttons {setNo setMax startPos after} { html "\n" egw_abort } - set hist($setNo,query) $query - } elseif {[lindex $sessionParms 1] == "hyper"} { + set hist($setNo,0,query) $query + } elseif {[lindex $sessionParms 2] == "hyper"} { egw_log debug "hyper search" - set hist($nextSetNo,idAuthentication) $hist($setNo,idAuthentication) - set hist($nextSetNo,host) $hist($setNo,host) - set hist($nextSetNo,database) $hist($setNo,database) + set hist($nextSetNo,$targetNo,idAuthentication) \ + $hist($setNo,$targetNo,idAuthentication) + set hist($nextSetNo,$targetNo,host) \ + $hist($setNo,$targetNo,host) + set hist($nextSetNo,$targetNo,database) \ + $hist($setNo,$targetNo,database) if {$nextSetNo == $setNo} { set setNo $nextSetNo @@ -296,90 +268,39 @@ proc buttons {setNo setMax startPos after} { catch {unset hist($setNo,hits)} } set hist($setNo,scan) 0 - set hist($setNo,query) \ - "$hist($setNo,scanAttr) \"[lindex $sessionParms 2]\"" - egw_log debug "hyper databases: $hist($setNo,database)" - set hist($setNo,form,entry1) [lindex $sessionParms 2] + set hist($setNo,$targetNo,query) \ + "$hist($setNo,scanAttr) \"[lindex $sessionParms 3]\"" + egw_log debug "hyper databases: $hist($setNo,$targetNo,database)" + set hist($setNo,form,entry1) [lindex $sessionParms 3] set startPos "" - } elseif {[lindex $sessionParms 1] == "scan"} { + } elseif {[lindex $sessionParms 2] == "scan"} { egw_log debug "star scan" set scanNo 1000 set hist($setNo,$scanNo,scanTerm) {} - start-scan $scanNo 0 {} {} + start-scan $scanNo $targetNo 0 {} {} html "\n" egw_abort } else { if {![info exists hist($setNo,scan)]} return if {$hist($setNo,scan) > 0} { - set scanNo [lindex $sessionParms 1] - set dir [lindex $sessionParms 2] + set scanNo [lindex $sessionParms 2] + set dir [lindex $sessionParms 3] if {$scanNo == ""} { set scanNo 1000 } - start-scan $scanNo 1 $dir $setNo + start-scan $scanNo $targetNo 1 $dir $setNo html "\n" egw_abort } } - set host $hist($setNo,host) + set host $hist($setNo,$targetNo,host) html " WWW/Z39.50 Gateway Search " [splitHostSpec $host] html " \n" html "\n" - set setMax 0 - set setOffset 0 - set useIcons 1 - if {$startPos == ""} { - if {[z39search $setNo 1 0 B] != "1"} { - return - } - set r [z39.$setNo resultCount] - - set setMax [z39.$setNo resultCount] - if {$setMax > $hist($setNo,maxPresent)} { - set setMax $hist($setNo,maxPresent) - } - buttons $setNo $setMax $startPos 0 - - set setOffset [z39.$setNo numberOfRecordsReturned] - if {$setMax > 0} { - html {

Records 1-} $setMax " out of $r

\n" - } else { - html "

No hits

\n" - } - egw_flush - html "