X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fsearch.egw;h=c25bfb93eef8ef02f30415161e29309c6751b282;hb=c6ea088406ba64e6ed5ea833e1c2ae516552e18e;hp=26fce8de8c2143e6af4747fb040db09807c841d5;hpb=cbf0ef7549f996f4d96f41c6dafa76dc17dd7782;p=egate.git diff --git a/www/search.egw b/www/search.egw index 26fce8d..c25bfb9 100644 --- a/www/search.egw +++ b/www/search.egw @@ -1,254 +1,192 @@ { -# $Id: search.egw,v 1.5 1995/10/31 16:56:24 adam Exp $ +# $Id: search.egw,v 1.18 1995/12/20 16:31:31 adam Exp $ -proc search-response {} { - global sessionWait - - set status [z39.1 responseStatus] - if {[lindex $status 0] == "NSD"} { - z39.1 nextResultSetPosition 0 - set code [lindex $status 1] - set msg [lindex $status 2] - set addinfo [lindex $status 3] - htmlr {Error} $code {: } $msg {: } $addinfo {
} - set sessionWait -2 - } else { - set sessionWait 1 - } -} - -proc ok-response {} { - global sessionWait - set sessionWait 1 -} - -proc fail-response {} { - global sessionWait - set sessionWait -1 -} - -proc display-brief {zset no} { - global env +proc buttons {setNo setMax startPos after} { global sessionId - - set type [$zset type $no] - if {$type == "SD"} { - set err [lindex [$zset diag $no] 1] - set add [lindex [$zset diag $no] 2] - if {$add != {}} { - set add " :${add}" + global useIcons + global env + global hist + + if {!$useIcons && $after && $setMax < [z39.$setNo resultCount]} { + html "

\n" + html "

\n" + html {} + html "
\n" + } + + html "

\n" + if {$useIcons} { + html {} + } + if {$setMax < [z39.$setNo resultCount]} { + html {} + } else { + html {">Next records} " | \n" } - htmlr "${no} Error ${err}${add}
" - return - } - if {$type != "DB"} { - return } - html "${no} " - set rtype [$zset recordType $no] - if {$rtype == "SUTRS"} { - html [join [$zset getSutrs $no]] - htmlr {
} - return - } - if {![catch { - set title [lindex [$zset getMarc $no field 245 * a] 0] - set year [lindex [$zset getMarc $no field 260 * c] 0] - } ] } { - html { } $title {} - html " ${year} " - } - htmlr {
} -} - -proc display-full {zset no} { - set type [$zset type $no] - if {$type == "SD"} { - set err [lindex [$zset diag $no] 1] - set add [lindex [$zset diag $no] 2] - if {$add != {}} { - set add " :${add}" + if {$startPos != "" && $startPos != "1"} { + html {} + } else { + html {">Previous records} " | \n" } - htmlr "

${no}
" - htmlr "Error ${err}${add}
" - return } - if {$type != "DB"} { - return + html {} + } else { + html {">New query} " | \n" } - htmlr "
${no}
" - set rtype [$zset recordType $no] - if {$rtype == "SUTRS"} { - htmlr [join [$zset getSutrs $no]] - return - } - if {[catch {set r [$zset getMarc $no line * * *]}]} { - htmlr "Unknown record type: $rtype" - return + + html {} + } else { + html {">New target} } - foreach line $r { - set tag [lindex $line 0] - set indicator [lindex $line 1] - set fields [lindex $line 2] - set l [string length $indicator] - html "$tag " - if {$l > 0} { - for {set i 0} {$i < $l} {incr i} { - if {[string index $tag $i] == " "} { - html "_" - } else { - html [string index $tag $i] - } - } - } - foreach field $fields { - set id [lindex $field 0] - set data [lindex $field 1] - if {$id != ""} { - html " \$$id " - } - html $data - } - htmlr {
} + html "

\n" + if {!$useIcons && !$after && $startPos != "" && $startPos != "1"} { + html "

\n" + html {} + html "

\n" } -} -proc display-rec {from to} { - while {$from <= $to} { - display-brief z39.1 $from - incr from - } } -proc build-query {} { - global targets - global t - - set op {} - set q {} - for {set i 1} {$i < 4} {incr i} { - set term [wform entry$i] - if {$term != ""} { - set field [wform menu$i] - foreach x [lindex $targets($t) 2] { - if {[lindex $x 0] == $field} { - set attr [lindex $x 1] - } - } - switch $op { - And - { set q "@and $q ${attr} ${term}" } - Or - { set q "@or $q ${attr} ${term}" } - {And not} - { set q "@not $q ${attr} ${term}" } - {} - { set q "${attr} ${term}" } - } - set op [wform logic$i] - } + if {[info commands saveState] == ""} { + source z39util.tcl } - return $q -} - global sessionWait - global host - - set newHost $sessionParms - set databases [lindex $targets($newHost) 1] - - htmlr { WWW/Z39.50 Gateway Search } $newHost { } - htmlr {} - wflush - - if {[catch {z39 callback ok-response}]} { - ir z39 - } - if {$newHost != $host} { - set host $newHost - z39 disconnect - z39 callback ok-response - z39 failback fail-response - - htmlr {Connecting to target } $host {
} - set sessionWait 0 - if {[catch {z39 connect $host}]} { - htmlr "Cannot connect to target ${host}
" - htmlr "" + global nextSetNo + global setNo + global hist + + set setNo [lindex $sessionParms 0] + if {[wform menu1] != ""} { + 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 - } elseif {$sessionWait == 0} { - zwait sessionWait - if {$sessionWait != 1} { - htmlr "Cannot connect to target ${host}
" - htmlr "" - wabort - } } - set sessionWait 0 - z39 init - zwait sessionWait - if {$sessionWait != "1"} { - htmlr "Cannot initialize with target ${host}
" - htmlr "" - wabort + set hist($setNo,query) $query + + 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,entry1) [wform entry1] + set hist($setNo,form,entry2) [wform entry2] + set hist($setNo,form,entry3) [wform entry3] + + set hist($setNo,form,logic1) [wform logic1] + set hist($setNo,form,logic2) [wform logic2] + + incr nextSetNo + + 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 + } else { + set hist($setNo,database) $b + } + set hist($setNo,maxPresent) [wform hits] + if {$hist($setNo,maxPresent) == ""} { + set hist($setNo,maxPresent) 30 } } - ir-set z39.1 z39 - set b [wform base] - if {$b == ""} { - z39.1 databaseNames [lindex $targets($host) 1] - } else { - z39.1 databaseNames [list $b] - htmlr {selected: } $b {
} - } - z39.1 preferredRecordSyntax USMARC + set host $hist($setNo,host) + set databases [lindex $targets($host) 1] - set query [build-query] + html " WWW/Z39.50 Gateway Search " $host " \n" + html "\n" - htmlr {

query: --} $query {--
} - htmlr {sessionId: } $sessionId {
} - htmlr {sessionParms: } $sessionParms {
} - htmlr {form: } [wform] {
} - htmlr {databases: } $databases {
} - htmlr {selected: } [wform base] {
} - - z39 callback search-response - set sessionWait 0 - z39.1 search $query - - zwait sessionWait - if {$sessionWait == 1} { - set r [z39.1 resultCount] - htmlr { } $r { hits

} + 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] + 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) + } } else { - htmlr {} - wabort - } - set setOffset [z39.1 numberOfRecordsReturned] - display-rec 1 $setOffset - wflush - incr setOffset - set setMax [z39.1 resultCount] - if {$setMax > 30} { - set setMax 30 - } - set toGet [expr 1 + $setMax - $setOffset] - while {$toGet > 0} { - set sessionWait 0 - z39.1 present $setOffset $toGet - zwait sessionWait - if {$sessionWait != "1"} { - break + if {[z39search $setNo 0 0 B] != "1"} { + return } - set got [z39.1 numberOfRecordsReturned] - display-rec $setOffset [expr $got + $setOffset - 1] - set setOffset [expr $got + $setOffset] - set toGet [expr 1 + $setMax - $setOffset] + set r [z39.$setNo resultCount] + html "

Search result $r hits

\n" wflush + set setOffset $startPos + set setMax [z39.$setNo resultCount] + if {$setMax > $endPos} { + set setMax $endPos + } + if {$setMax > 0} { + buttons $setNo $setMax $startPos 0 + } + } + if {$setMax > 0} { + z39present $setNo 0 $setOffset $setMax display-brief B } + + buttons $setNo $setMax $startPos 1 +} + +{ + 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 "query: --" $hist($setNo,query) "--
" + html "setNo: " $setNo "
\n" + html "nextSetNo: " $nextSetNo "
\n" } + -