X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fsearch.egw;h=738906bd5ea7c1762c8bd8154ed96cca339f0b4c;hb=4938d0c2e8f4e1eec397c2bfbbc7e23fd150c369;hp=7f1c0efcea807a4c80fc5e63c428e45256d617a5;hpb=2213843897f0bc54bc535935c56fe830648b171a;p=egate.git
diff --git a/www/search.egw b/www/search.egw
index 7f1c0ef..738906b 100644
--- a/www/search.egw
+++ b/www/search.egw
@@ -1,8 +1,8 @@
{
-# $Id: search.egw,v 1.20 1995/12/22 14:21:15 adam Exp $
+# $Id: search.egw,v 1.34 1996/03/07 12:46:09 adam Exp $
-proc perform-scan {} {
+proc start-scan {scanNo targetNo cache dir initSet} {
global sessionId
global sessionParms
global sessionWait
@@ -11,142 +11,162 @@ proc perform-scan {} {
global targets
global nextSetNo
global env
+ global useIcons
+ global debug
- set scanNo 1000
+ set host $hist($setNo,$targetNo,host)
- set termPlusAttr [build-scan $hist($setNo,host) 3]
+ html " WWW/Z39.50 Gateway Scan " [splitHostSpec $host]
+ html " \n"
+ html "\n"
- if {"$termPlusAttr" == ""} {
- html " WWW/Z39.50 Gateway Scan\n\n"
- displayError "Empty query" \
- "You must specify at least one search word"
- html "\n"
- wabort
- }
- 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) [wform menu2]
- set hist($setNo,form,menu3) [wform menu3]
+ set useIcons 1
+ button-europagate
- set hist($setNo,form,entry1) [wform entry1]
- set hist($setNo,form,entry2) [wform entry2]
- set hist($setNo,form,entry3) [wform entry3]
+ 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 {$hist($setNo,$scanNo,scanTerm) != ""} {
+ if {[z39scan $setNo $scanNo 0 $lines $pos $cache] != "1"} {
+ button-new-query 0 $setNo
+ egw_log debug "z39_scan failed"
+ return
+ }
+ html {}
+ if {$useIcons} {
+ html {
}
+ } else {
+ html {Previous Terms | }
+ }
- set hist($setNo,form,logic1) [wform logic1]
- set hist($setNo,form,logic2) [wform logic2]
+ html {}
+ if {$useIcons} {
+ html {
}
+ } else {
+ html {Next Terms | }
+ }
+ html {}
+ }
+ button-new-query 0 $setNo
- set host $hist($setNo,host)
set databases [lindex $targets($host) 1]
- set b [wform base]
- if {[wform baseall] != ""} {
- set hist($setNo,database) $databases
- } elseif {$b == ""} {
- set hist($setNo,database) $databases
+ if {$initSet == ""} {
+ set databaseDefault [lindex $databases 0]
+ set oSetNo 0
} else {
- set hist($setNo,database) $b
+ set oSetNo $initSet
+ set databaseDefault $hist($oSetNo,$targetNo,database)
}
- set hist($setNo,maxPresent) [wform hits]
- if {$hist($setNo,maxPresent) == ""} {
- set hist($setNo,maxPresent) 30
+
+ html {
}
- if {!$useIcons && $after && $setMax < [z39.$setNo resultCount]} {
- html "\n"
- html "
\n"
- html {
}
- html "\n"
+ set useIcons 0
+ if {$hist($setNo,$scanNo,scanTerm) == ""} {
+ button-europagate
+ button-new-query 0 $setNo
+ return
}
html "\n"
- if {$useIcons} {
- html {
}
- }
- if {$setMax < [z39.$setNo resultCount]} {
- html {
}
- } else {
- html {">Next records} " | \n"
- }
- }
- if {$startPos != "" && $startPos != "1"} {
- html {
}
- } else {
- html {">Previous records} " | \n"
- }
- }
+ display-scan $setNo $scanNo 0
+ html "
\n"
+
+ button-europagate
+
html {}
if {$useIcons} {
- html {">
}
+ html {}
} else {
- html {">New query} " | \n"
+ html {Previous Terms | }
}
html {}
if {$useIcons} {
- html {">
}
+ html {}
} else {
- html {">New target}
- }
- html "
\n"
- if {!$useIcons && !$after && $startPos != "" && $startPos != "1"} {
- html "
\n"
- html {
}
- html "\n"
+ 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: " [egw_form] "
\n"
+ html "target: " $host "
\n"
+ html "databases: " $hist($setNo,$targetNo,database) "
\n"
+ html "selected: " [egw_form base] "
\n"
+ html "setNo: " $setNo "
\n"
+ html "nextSetNo: " $nextSetNo "
\n"
}
if {[info commands saveState] == ""} {
@@ -158,10 +178,15 @@ proc buttons {setNo setMax startPos after} {
global hist
set setNo [lindex $sessionParms 0]
+ set targetNo [lindex $sessionParms 1]
+ set startPos [lindex $sessionParms 2]
+ set endPos [lindex $sessionParms 3]
- if {[wform menu1] != ""} {
- set hist($nextSetNo,idAuthentication) $hist($setNo,idAuthentication)
- set hist($nextSetNo,host) $hist($setNo,host)
+ if {[egw_form] != ""} {
+ set hist($nextSetNo,$targetNo,idAuthentication) \
+ $hist($setNo,$targetNo,idAuthentication)
+ set hist($nextSetNo,$targetNo,host) \
+ $hist($setNo,$targetNo,host)
if {$nextSetNo == $setNo} {
set setNo $nextSetNo
@@ -169,110 +194,130 @@ proc buttons {setNo setMax startPos after} {
} else {
catch {unset hist($setNo,hits)}
}
- 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
- }
- set hist($setNo,query) $query
+ set hist($setNo,scan) 0
- set hist($setNo,form,menu1) [wform menu1]
- set hist($setNo,form,menu2) [wform menu2]
- set hist($setNo,form,menu3) [wform menu3]
+ set hist($setNo,form,menu1) [egw_form menu1]
+ set hist($setNo,form,menu2) [egw_form menu2]
+ set hist($setNo,form,menu3) [egw_form menu3]
- set hist($setNo,form,entry1) [wform entry1]
- set hist($setNo,form,entry2) [wform entry2]
- set hist($setNo,form,entry3) [wform entry3]
+ set hist($setNo,form,entry1) [egw_form entry1]
+ set hist($setNo,form,entry2) [egw_form entry2]
+ set hist($setNo,form,entry3) [egw_form entry3]
- set hist($setNo,form,logic1) [wform logic1]
- set hist($setNo,form,logic2) [wform logic2]
-
- set host $hist($setNo,host)
+ set hist($setNo,form,logic1) [egw_form logic1]
+ set hist($setNo,form,logic2) [egw_form logic2]
+ set hist($setNo,form,logic3) {}
+
+ set host $hist($setNo,0,host)
set databases [lindex $targets($host) 1]
- set b [wform base]
- if {[wform baseall] != ""} {
- set hist($setNo,database) $databases
+ set b [egw_form base]
+ if {[egw_form baseall] != ""} {
+ 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) [wform hits]
+ set hist($setNo,maxPresent) [egw_form hits]
if {$hist($setNo,maxPresent) == ""} {
set hist($setNo,maxPresent) 30
}
- }
- set host $hist($setNo,host)
- set databases [lindex $targets($host) 1]
-
- html " WWW/Z39.50 Gateway Search " $host " \n"
- html "\n"
-
- set startPos [lindex $sessionParms 1]
- set endPos [lindex $sessionParms 2]
- set setMax 0
- set setOffset 0
- if {$startPos == ""} {
- if {[z39search $setNo 1 0 B] != "1"} {
- return
+ set i [lindex $sessionParms 2]
+ if {$i == ""} {
+ for {set j 1} {$j <= 3} {incr j} {
+ if {[egw_form scan$j] != ""} {
+ set i $j
+ break
+ }
+ }
}
- set r [z39.$setNo resultCount]
- html " Search result $r hits
\n"
- wflush
- set setOffset [z39.$setNo numberOfRecordsReturned]
- display-rec 1 $setOffset display-brief 0
- incr setOffset
- set setMax [z39.$setNo resultCount]
- if {$setMax > $hist($setNo,maxPresent)} {
- set setMax $hist($setNo,maxPresent)
+ if {$i != ""} {
+ set scanNo 1000
+ set hist($setNo,scan) $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 $targetNo 0 {} $setNo
+ html "\n"
+ egw_abort
+ return
}
- } else {
- if {[z39search $setNo 0 0 B] != "1"} {
- return
+ set query [build-query $hist($setNo,0,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"
+ egw_abort
}
- set r [z39.$setNo resultCount]
- set setOffset $startPos
- set setMax [z39.$setNo resultCount]
- if {$setMax > $endPos} {
- set setMax $endPos
+ set hist($setNo,0,query) $query
+ } elseif {[lindex $sessionParms 2] == "hyper"} {
+ egw_log debug "hyper search"
+ 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
+ incr nextSetNo
+ } else {
+ catch {unset hist($setNo,hits)}
}
- if {$setMax > 0} {
- buttons $setNo $setMax $startPos 0
+ set hist($setNo,scan) 0
+ 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 2] == "scan"} {
+ egw_log debug "star scan"
+ set scanNo 1000
+ set hist($setNo,$scanNo,scanTerm) {}
+ start-scan $scanNo $targetNo 0 {} {}
+ html "