X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2Fsearch.egw;h=587e94d392dd9aac820ff5684ff9e5a41d951f31;hb=71ad5b6272d0bc6320bea6c1ec10f5e10bbfe8ef;hp=c72263edcde47c9b3b71ba8cb1aa663315b54ad0;hpb=09f416a26c1c7e35ead317106f985774ec0c97bd;p=egate.git
diff --git a/www/search.egw b/www/search.egw
index c72263e..587e94d 100644
--- a/www/search.egw
+++ b/www/search.egw
@@ -1,8 +1,8 @@
{
-# $Id: search.egw,v 1.19 1995/12/21 15:49:52 adam Exp $
+# $Id: search.egw,v 1.25 1996/01/08 08:42:17 adam Exp $
-proc perform-scan {} {
+proc start-scan {scanNo cache dir} {
global sessionId
global sessionParms
global sessionWait
@@ -11,60 +11,82 @@ proc perform-scan {} {
global targets
global nextSetNo
global env
+ global useIcons
+ global debug
- set scanNo 1000
-
- set termPlusAttr [build-scan $hist($setNo,host) 3]
+ set host $hist($setNo,host)
- if {"$termPlusAttr" == ""} {
- html " WWW/Z39.50 Gateway Scan\n\n"
+ html " WWW/Z39.50 Gateway Scan " $host " \n"
+ html "\n"
+
+ if {$hist($setNo,$scanNo,scanTerm) == ""} {
displayError "Empty query" \
- "You must specify at least one search word"
- html "\n"
+ "You must specify at least one search word"
wabort
+ return
}
- set hist($setNo,scanAttr) [lindex $termPlusAttr 1]
- set hist($setNo,$scanNo,scanTerm) [lindex $termPlusAttr 0]
-
- set hist($setNo,form,menu1) [wform menu1]
- set hist($setNo,form,menu2) ""
- set hist($setNo,form,menu3) ""
+ if {$dir == "b"} {
+ set lines 20
+ set pos 20
+ } elseif {$dir == "f"} {
+ set lines 20
+ set pos 1
+ } else {
+ set lines 20
+ set pos 10
+ }
+ if {[z39scan $setNo $scanNo 0 $lines $pos $cache] != "1"} {
+ return
+ }
+ button-europagate
- set hist($setNo,form,entry1) [wform entry1]
- set hist($setNo,form,entry2) ""
- set hist($setNo,form,entry3) ""
+ html {}
+ if {$useIcons} {
+ html {
}
+ } else {
+ html {Previous Terms | }
+ }
- set hist($setNo,form,logic1) ""
- set hist($setNo,form,logic2) ""
+ html {}
+ if {$useIcons} {
+ html {
}
+ } else {
+ html {Next Terms | }
+ }
+ html {}
+ button-new-query 0 $setNo
- incr nextSetNo
+ html "
\n"
+ display-scan $setNo $scanNo 0
+ html "
\n"
- set host $hist($setNo,host)
- set databases [lindex $targets($host) 1]
+ button-europagate
- set b [wform base]
- if {[wform baseall] != ""} {
- set hist($setNo,database) $databases
- } elseif {$b == ""} {
- set hist($setNo,database) $databases
+ html {}
+ if {$useIcons} {
+ html {}
} else {
- set hist($setNo,database) $b
- }
- set hist($setNo,maxPresent) [wform hits]
- if {$hist($setNo,maxPresent) == ""} {
- set hist($setNo,maxPresent) 30
+ html {Previous Terms | }
}
- set host $hist($setNo,host)
- set databases [lindex $targets($host) 1]
-
- html "
WWW/Z39.50 Gateway Scan " $host " \n"
- html "\n"
- if {[z39scan $setNo $scanNo 0 20 10] != "1"} {
- return
+ html {}
+ if {$useIcons} {
+ html {}
+ } else {
+ html {Next Terms | }
}
- display-scan $setNo $scanNo 0
+ html {}
+ button-new-query 0 $setNo
+ if {!$debug} return
html "
\n"
html "Debug information
\n"
html "sessionId: $sessionId
\n"
@@ -77,9 +99,7 @@ proc perform-scan {} {
html "databases: " $hist($setNo,database) "
\n"
html "selected: " [wform base] "
\n"
html "setNo: " $setNo "
\n"
- html "nextSetNo: " $nextSetNo "
\n"
-
- html "\n"
+ html "nextSetNo: " $nextSetNo "
\n"
}
proc buttons {setNo setMax startPos after} {
@@ -88,28 +108,17 @@ proc buttons {setNo setMax startPos after} {
global env
global hist
- if {!$useIcons && $after && $setMax < [z39.$setNo resultCount]} {
- html "\n"
- html "
\n"
- html {
}
- html "\n"
- }
-
html "\n"
- if {$useIcons} {
- html {
}
- }
+ button-europagate
if {$setMax < [z39.$setNo resultCount]} {
html {
}
+ html {">}
} else {
- html {">Next records} " | \n"
+ html {">Next Records} " | \n"
}
}
if {$startPos != "" && $startPos != "1"} {
@@ -118,37 +127,17 @@ proc buttons {setNo setMax startPos after} {
html + [expr $startPos - $hist($setNo,maxPresent)]
html + [expr $startPos - 1]
if {$useIcons} {
- html {">
}
+ html {">}
} else {
- html {">Previous records} " | \n"
+ html {">Previous Records} " | \n"
}
}
- html {
}
- } else {
- html {">New query} " | \n"
- }
+ button-new-query 1 $setNo
+ button-new-target 1
+ button-view-history 0
- html {
}
- } else {
- html {">New target}
- }
html "
\n"
- if {!$useIcons && !$after && $startPos != "" && $startPos != "1"} {
- html "
\n"
- html {
}
- html "\n"
- }
-
}
if {[info commands saveState] == ""} {
@@ -160,20 +149,18 @@ proc buttons {setNo setMax startPos after} {
global hist
set setNo [lindex $sessionParms 0]
- if {[wform menu1] != ""} {
- if {[wform submit] == "Scan"} {
- perform-scan
- wabort
- }
- set query [build-query $hist($setNo,host) 3]
- if {"x$query" == "x"} {
- html "
WWW/Z39.50 Gateway Search\n\n"
- displayError "Empty query" \
- "You must specify at least one search word"
- html "\n"
- wabort
+
+ if {[wform] != ""} {
+ set hist($nextSetNo,idAuthentication) $hist($setNo,idAuthentication)
+ set hist($nextSetNo,host) $hist($setNo,host)
+
+ if {$nextSetNo == $setNo} {
+ set setNo $nextSetNo
+ incr nextSetNo
+ } else {
+ catch {unset hist($setNo,hits)}
}
- set hist($setNo,query) $query
+ set hist($setNo,scan) 0
set hist($setNo,form,menu1) [wform menu1]
set hist($setNo,form,menu2) [wform menu2]
@@ -185,9 +172,8 @@ proc buttons {setNo setMax startPos after} {
set hist($setNo,form,logic1) [wform logic1]
set hist($setNo,form,logic2) [wform logic2]
-
- incr nextSetNo
-
+ set hist($setNo,form,logic3) {}
+
set host $hist($setNo,host)
set databases [lindex $targets($host) 1]
@@ -203,9 +189,42 @@ proc buttons {setNo setMax startPos after} {
if {$hist($setNo,maxPresent) == ""} {
set hist($setNo,maxPresent) 30
}
+ for {set i 1} {$i <= 3} {incr i} {
+ if {[wform scan$i] != ""} {
+ set scanNo 1000
+ set hist($setNo,scan) $i
+ set termPlusAttr [build-scan $hist($setNo,host) $i]
+ set hist($setNo,$scanNo,scanTerm) [lindex $termPlusAttr 0]
+ set hist($setNo,scanAttr) [lindex $termPlusAttr 1]
+ start-scan $scanNo 0 {}
+ html "\n"
+ wabort
+ return
+ }
+ }
+ set query [build-query $hist($setNo,host) 3]
+ if {"x$query" == "x"} {
+ html " WWW/Z39.50 Gateway Search\n\n"
+ displayError "Empty query" \
+ "You must specify at least one search word"
+ html "\n"
+ wabort
+ }
+ set hist($setNo,query) $query
+ } else {
+ if {![info exists hist($setNo,scan)]} return
+ if {$hist($setNo,scan) > 0} {
+ set scanNo [lindex $sessionParms 1]
+ set dir [lindex $sessionParms 2]
+ if {$scanNo == ""} {
+ set scanNo 1000
+ }
+ start-scan $scanNo 1 $dir
+ html "