X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fsearch.egw;h=fd25d08ff8236d9404a0774351ee919a70b0e604;hb=a61ad0378b93e99e362a1d92c33d701dbf103eba;hp=587e94d392dd9aac820ff5684ff9e5a41d951f31;hpb=71ad5b6272d0bc6320bea6c1ec10f5e10bbfe8ef;p=egate.git diff --git a/www/search.egw b/www/search.egw index 587e94d..fd25d08 100644 --- a/www/search.egw +++ b/www/search.egw @@ -1,8 +1,8 @@ { -# $Id: search.egw,v 1.25 1996/01/08 08:42:17 adam Exp $ +# $Id: search.egw,v 1.38 1996/03/13 14:07:31 adam Exp $ -proc start-scan {scanNo cache dir} { +proc start-scan {scanNo targetNo cache dir initSet} { global sessionId global sessionParms global sessionWait @@ -14,17 +14,15 @@ proc start-scan {scanNo cache dir} { global useIcons global debug - set host $hist($setNo,host) + set host $hist($setNo,$targetNo,host) - html " WWW/Z39.50 Gateway Scan " $host " \n" + html " WWW/Z39.50 Gateway Scan " [splitHostSpec $host] + html " \n" html "\n" - - if {$hist($setNo,$scanNo,scanTerm) == ""} { - displayError "Empty query" \ - "You must specify at least one search word" - wabort - return - } + + set useIcons 1 + button-main + if {$dir == "b"} { set lines 20 set pos 20 @@ -35,56 +33,125 @@ proc start-scan {scanNo cache dir} { set lines 20 set pos 10 } - if {[z39scan $setNo $scanNo 0 $lines $pos $cache] != "1"} { - return + if {$hist($setNo,$scanNo,scanTerm) != ""} { + if {[z39scan $setNo $scanNo 0 $lines $pos $cache] != "1"} { + button-new-query $setNo + egw_log debug "z39_scan failed" + return + } + html {} + if {$useIcons} { + html {} + } else { + html {Previous Terms | } + } + + html {} + if {$useIcons} { + html {} + } else { + html {Next Terms | } + } + html {} } - button-europagate + button-new-query $setNo - html {} - if {$useIcons} { - html {} + set databases [splitDatabaseSpec $host] + + if {$initSet == ""} { + set databaseDefault [lindex $databases 0] + set oSetNo 0 } else { - html {Previous Terms | } + set oSetNo $initSet + set databaseDefault $hist($oSetNo,$targetNo,database) } + + html {
} \n + set nodb [llength $databases] + if {$nodb > 1} { + if {$nodb > 2} { + html "Databases:
\n" + } + set i 0 + foreach d $databases { + html { } $d \n + } else { + html {" checked> } $d \n + } + } + html "
\n" + if {$nodb > 2} { + html { All
} \n + } + } + html "Input your scan criteria:
\n" + set fields [lindex $targets($host) 2] + set no 1 + html {\n" + html { } + html {} + html "\n" + html {

} - html {} - if {$useIcons} { - html {} - } else { - html {Next Terms | } + set useIcons 0 + if {$hist($setNo,$scanNo,scanTerm) == ""} { + button-main + button-new-query $setNo + return } - html {} - button-new-query 0 $setNo - html "

\n" + html "

\n" display-scan $setNo $scanNo 0 html "

\n" - button-europagate + button-main html {} + html / $sessionId {/search.egw/} $setNo + $targetNo + + html [expr $scanNo - 1] + b {">} if {$useIcons} { - html {} } else { html {Previous Terms | } } html {} + html / $sessionId {/search.egw/} $setNo + $targetNo + + html [expr $scanNo + 1] + f {">} if {$useIcons} { - html {} } else { html {Next Terms | } } html {} - button-new-query 0 $setNo + button-new-query $setNo if {!$debug} return html "

\n" @@ -94,52 +161,13 @@ proc start-scan {scanNo cache dir} { 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 "form: " [egw_form] "
\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 < [z39.$setNo resultCount]} { - html {Next Records} - } else { - html {">Next Records} " | \n" - } - } - if {$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 } @@ -149,137 +177,133 @@ 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] != ""} { - 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 incr nextSetNo } else { - catch {unset hist($setNo,hits)} + catch {unset hist($setNo,$targetNo,hits)} } 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 hist($setNo,form,logic1) [egw_form logic1] + set hist($setNo,form,logic2) [egw_form logic2] set hist($setNo,form,logic3) {} - set host $hist($setNo,host) - set databases [lindex $targets($host) 1] + set host $hist($setNo,0,host) + + set databases [splitDatabaseSpec $host] - set b [wform base] - if {[wform baseall] != ""} { - set hist($setNo,database) $databases + set b [egw_form base] + if {[egw_form baseall] != ""} { + set hist($setNo,$targetNo,database) $databases } elseif {$b == ""} { - set hist($setNo,database) $databases + set hist($setNo,$targetNo,database) $databases } else { - set hist($setNo,database) $b + set hist($setNo,$targetNo,database) $b } - set hist($setNo,maxPresent) [wform hits] + set hist($setNo,maxPresent) [egw_form hits] 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 hist($setNo,format) brief + set hist($setNo,sort) server + + set i [lindex $sessionParms 2] + if {[string length $i] == 0} { + for {set j 1} {$j <= 3} {incr j} { + if {[egw_form scan$j] != ""} { + set i $j + break + } } } - set query [build-query $hist($setNo,host) 3] - if {"x$query" == "x"} { + if {[string length $i] != 0} { + 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 + } + set query [build-query $hist($setNo,0,host) 3] + if {[string length $query] == 0} { html " WWW/Z39.50 Gateway Search\n\n" displayError "Empty query" \ "You must specify at least one search word" html "\n" - wabort + egw_abort } - set hist($setNo,query) $query + 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,$targetNo,hits)} + } + 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 "\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 + start-scan $scanNo $targetNo 1 $dir $setNo html "\n" - wabort + egw_abort } } - set host $hist($setNo,host) + set host $hist($setNo,$targetNo,host) - html " WWW/Z39.50 Gateway Search " $host " \n" + html " WWW/Z39.50 Gateway Search " [splitHostSpec $host] + html " \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 r [z39.$setNo resultCount] - set setOffset [z39.$setNo numberOfRecordsReturned] - if {$setOffset > 0} { - html {

Records 1-} $setOffset " out of $r

\n" - } else { - html "

No hits

\n" - } - wflush - html "