From a61ad0378b93e99e362a1d92c33d701dbf103eba Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 13 Mar 1996 14:07:28 +0000 Subject: [PATCH] Major revision. Single-target result set can be reached from the multiple-targets result set. History incorporated in multiple-targets -- it doesn't look good though. --- www/egwindex.html | 7 +- www/history.egw | 6 +- www/mquery.egw | 81 ++++++++++++--- www/msearch.egw | 14 ++- www/mtargets.egw | 32 +++--- www/nwi.egw | 13 ++- www/query.egw | 16 +-- www/search.egw | 28 +++--- www/showfull.egw | 24 +---- www/targets.egw | 12 +-- www/tdefine.egw | 10 +- www/tform.egw | 6 +- www/z39util.tcl | 281 +++++++++++++++++++++++++++++++++++------------------ www/ztargets.conf | 68 ++++++++++--- 14 files changed, 386 insertions(+), 212 deletions(-) diff --git a/www/egwindex.html b/www/egwindex.html index 33b94d0..5ec6763 100644 --- a/www/egwindex.html +++ b/www/egwindex.html @@ -3,7 +3,7 @@ Europagate WWW index -

Europagate WWW index, $Id: egwindex.html,v 1.11 1996/03/11 17:40:47 adam Exp $

+

Europagate WWW index, $Id: egwindex.html,v 1.12 1996/03/13 14:07:28 adam Exp $

diff --git a/www/history.egw b/www/history.egw index fe8e872..4c18e79 100644 --- a/www/history.egw +++ b/www/history.egw @@ -4,7 +4,7 @@ { -# $Id: history.egw,v 1.6 1996/03/12 16:30:26 adam Exp $ +# $Id: history.egw,v 1.7 1996/03/13 14:07:29 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl @@ -12,13 +12,13 @@ set useIcons 1 button-main - button-new-target 0 + button-new-target z39history set useIcons 0 button-main - button-new-target 0 + button-new-target } { catch maintenance diff --git a/www/mquery.egw b/www/mquery.egw index fa2c809..364a8cd 100644 --- a/www/mquery.egw +++ b/www/mquery.egw @@ -4,7 +4,7 @@ { -# $Id: mquery.egw,v 1.14 1996/03/12 16:30:26 adam Exp $ +# $Id: mquery.egw,v 1.15 1996/03/13 14:07:29 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl @@ -22,7 +22,7 @@ set useIcons 1 button-main - button-new-target 0 + button-new-target html {
} \n @@ -41,7 +41,10 @@ lappend hist($setNo,$i,database) $base } set oSetNo [lindex $sessionParms 0] - if {$i == 0 && [info exists hist($oSetNo,0,host)]} { + if {$oSetNo < 0} { + set oSetNo 0 + } + if {$i == 0 && $oSetNo && [info exists hist($oSetNo,0,host)]} { for {set i 1} {$i <= $hist($oSetNo,0,host)} {incr i} { set hist($setNo,$i,host) $hist($oSetNo,$i,host) set hist($setNo,$i,idAuthentication) \ @@ -54,40 +57,86 @@ html "

No targets specified

" egw_abort 1 } + + set curSort server + set curFormat brief + if {$oSetNo} { + set curSort $hist($oSetNo,sort) + set curFormat $hist($oSetNo,format) + } + set hist($setNo,0,host) $i - html "Input your search criteria:
\n" + html "Fill-in this search form:
\n" set fields [lindex $targets($host) 2] for {set no 1} {$no < 4} {incr no} { + html {\n" - html {} \n + + html {} \n if {$no < 3} { html {\n" } html "
\n" } + html {} html "
\n" - html {Display each record in } + if {![string compare $curFormat brief]} { + html "
} \n html "

\n" set useIcons 0 button-main - button-define-target 0 + button-define-target } { diff --git a/www/nwi.egw b/www/nwi.egw index ef66aec..a42ac74 100644 --- a/www/nwi.egw +++ b/www/nwi.egw @@ -1,6 +1,6 @@ { -# $Id: nwi.egw,v 1.2 1996/03/12 16:30:27 adam Exp $ +# $Id: nwi.egw,v 1.3 1996/03/13 14:07:30 adam Exp $ source ztargets.conf set scriptQuery nwi.egw @@ -10,8 +10,6 @@ if {[info commands saveState] == ""} { source z39util.tcl } - set mMode 1 - if {![info exists debug]} { if {[lindex $sessionParms 1] == "1"} { set debug 1 @@ -50,12 +48,17 @@ set useIcons 1 button-main - set initSet [lindex $sessionParms 0] set curSort score set curFormat brief set curEntry {} + + set initSet 0 catch { - if {$initSet > 0} { + set initSet [lindex $sessionParms 0] + if {$initSet < 0} { + set initSet 0 + } + if {$initSet} { for {set i 1} {$i <= $hist($initSet,0,host)} {incr i} { lappend curTargets $hist($initSet,$i,host) } diff --git a/www/query.egw b/www/query.egw index 5c5e033..f17cc58 100644 --- a/www/query.egw +++ b/www/query.egw @@ -4,7 +4,7 @@ { -# $Id: query.egw,v 1.37 1996/03/12 16:30:27 adam Exp $ +# $Id: query.egw,v 1.38 1996/03/13 14:07:30 adam Exp $ if {[info commands saveState] == ""} { source z39util.tcl @@ -96,11 +96,11 @@ proc ok-response {} { set useIcons 1 button-main - button-new-target 1 + button-new-target if {[lsearch [z390 options] scan] >= 0} { - button-scan-window 1 $setNo + button-scan-window $setNo } - button-view-history 0 + button-view-history html "

" [lindex $targets($host) 0] "


\n" @@ -139,7 +139,7 @@ proc ok-response {} { html [concat $databases] {"> All
} \n } } - html "Input your search criteria:
\n" + html "Fill-in this search form:
\n" set fields [lindex $targets($host) 2] for {set no 1} {$no < 4} {incr no} { html {