X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fsearch.egw;h=d6d871754f9b3ae88475637061cc9b5154bd5c45;hb=dc96146a41b92065d4fbb398dd1c66afd338f0c7;hp=c25bfb93eef8ef02f30415161e29309c6751b282;hpb=c6ea088406ba64e6ed5ea833e1c2ae516552e18e;p=egate.git
diff --git a/www/search.egw b/www/search.egw
index c25bfb9..d6d8717 100644
--- a/www/search.egw
+++ b/www/search.egw
@@ -1,35 +1,179 @@
{
-# $Id: search.egw,v 1.18 1995/12/20 16:31:31 adam Exp $
+# $Id: search.egw,v 1.29 1996/01/12 13:39:22 adam Exp $
-proc buttons {setNo setMax startPos after} {
+proc start-scan {scanNo cache dir initSet} {
global sessionId
- global useIcons
- global env
+ global sessionParms
+ global sessionWait
+ global setNo
global hist
+ global targets
+ global nextSetNo
+ global env
+ global useIcons
+ global debug
- if {!$useIcons && $after && $setMax < [z39.$setNo resultCount]} {
- html "\n"
- html "
\n"
- html {
}
- html "\n"
+ set host $hist($setNo,host)
+
+ html " WWW/Z39.50 Gateway Scan " $host " \n"
+ html "\n"
+
+ set databases [lindex $targets($host) 1]
+
+ if {$initSet == ""} {
+ set databaseDefault [lindex $databases 0]
+ set oSetNo 0
+ } else {
+ set oSetNo $initSet
+ set databaseDefault $hist($oSetNo,database)
+ }
+
+ html {
}
+
+ button-europagate
+
+ if {$hist($setNo,$scanNo,scanTerm) == ""} {
+ button-new-query 0 $setNo
+ wabort
+ return
+ }
+ 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
+ }
+
+ html {}
+ if {$useIcons} {
+ html {
}
+ } else {
+ html {Previous Terms | }
+ }
+
+ html {}
+ if {$useIcons} {
+ html {
}
+ } else {
+ html {Next Terms | }
}
+ html {}
+ button-new-query 0 $setNo
html "\n"
+ display-scan $setNo $scanNo 0
+ html "
\n"
+
+ button-europagate
+
+ html {}
if {$useIcons} {
- html {
}
+ html {}
+ } else {
+ html {Previous Terms | }
}
+
+ html {}
+ if {$useIcons} {
+ html {}
+ } else {
+ html {Next Terms | }
+ }
+ html {}
+ button-new-query 0 $setNo
+
+ if {!$debug} return
+ html "
\n"
+ html "Debug information
\n"
+ html "sessionId: $sessionId
\n"
+ html "sessionParms: $sessionParms
\n"
+ foreach e {SERVER_NAME PATH_INFO SCRIPT_NAME} {
+ html $e {: } $env($e) {
} \n
+ }
+ html "form: " [wform] "
\n"
+ html "target: " $host "
\n"
+ html "databases: " $hist($setNo,database) "
\n"
+ html "selected: " [wform 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 < [z39.$setNo resultCount]} {
html {
}
+ html {">
}
} else {
- html {">Next records} " | \n"
+ html {">Next Records} " | \n"
}
}
if {$startPos != "" && $startPos != "1"} {
@@ -38,37 +182,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] == ""} {
@@ -80,20 +204,18 @@ proc buttons {setNo setMax startPos after} {
global hist
set setNo [lindex $sessionParms 0]
- if {[wform menu1] != ""} {
+
+ if {[wform] != ""} {
set hist($nextSetNo,idAuthentication) $hist($setNo,idAuthentication)
set hist($nextSetNo,host) $hist($setNo,host)
- set setNo $nextSetNo
- set query [build-query $hist($setNo,host)]
- 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 {$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]
@@ -105,9 +227,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]
@@ -123,9 +244,56 @@ proc buttons {setNo setMax startPos after} {
if {$hist($setNo,maxPresent) == ""} {
set hist($setNo,maxPresent) 30
}
+ set i [lindex $sessionParms 1]
+ if {$i == ""} {
+ for {set j 1} {$j <= 3} {incr j} {
+ if {[wform scan$j] != ""} {
+ set i $j
+ break
+ }
+ }
+ }
+ if {$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 {[lindex $sessionParms 1] == "scan"} {
+ set scanNo 1000
+ set hist($setNo,$scanNo,scanTerm) {}
+ start-scan $scanNo 0 {} {}
+ html "