X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2Fsearch.egw;h=bfb64bd266767041c013b2634210a35754c0f41b;hb=150d836eb46d0dde8fedeb77fc7fd4ef6eafba4f;hp=71f4cb0bda01c3574195457a818d8d9286a2410e;hpb=4a4288c5b72d694c1ca2c1c08926d1e10f01cc48;p=egate.git
diff --git a/www/search.egw b/www/search.egw
index 71f4cb0..bfb64bd 100644
--- a/www/search.egw
+++ b/www/search.egw
@@ -1,6 +1,22 @@
{
-# $Id: search.egw,v 1.4 1995/10/31 10:03:53 adam Exp $
+# $Id: search.egw,v 1.7 1995/11/02 16:35:36 adam Exp $
+
+proc search-response {sno} {
+ global sessionWait
+
+ set status [z39.$sno responseStatus]
+ if {[lindex $status 0] == "NSD"} {
+ z39.$sno 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
@@ -12,15 +28,99 @@ proc fail-response {} {
set sessionWait -1
}
-proc display-rec {from to} {
- while {$from < $to} {
- htmlr {} $from {
}
- if {![catch {
- set title [lindex [z39.1 getMarc $from field 245 * a] 0]
- set year [lindex [z39.1 getMarc $from field 260 * c] 0]
- } ] } {
- htmlr $title { } $year {
}
+proc display-brief {zset no} {
+ global env
+ global setNo
+ 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}"
+ }
+ 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}"
+ }
+ htmlr "
${no}
"
+ htmlr "Error ${err}${add}
"
+ return
+ }
+ if {$type != "DB"} {
+ return
+ }
+ 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
+ }
+ 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 {
}
+ }
+}
+
+proc display-rec {from to} {
+ global setNo
+
+ while {$from <= $to} {
+ display-brief z39.$setNo $from
incr from
}
}
@@ -32,9 +132,9 @@ proc build-query {} {
set op {}
set q {}
for {set i 1} {$i < 4} {incr i} {
- set term [form entry$i]
+ set term [wform entry$i]
if {$term != ""} {
- set field [form menu$i]
+ set field [wform menu$i]
foreach x [lindex $targets($t) 2] {
if {[lindex $x 0] == $field} {
set attr [lindex $x 1]
@@ -50,62 +150,203 @@ proc build-query {} {
{}
{ set q "${attr} ${term}" }
}
- set op [form logic$i]
+ set op [wform logic$i]
}
}
return $q
}
+proc research {setNo oldHost piggy} {
+ global hist
global sessionWait
+
+ set host $hist($setNo,host)
+ if {[catch {z39 failback fail-response}]} {
+ ir z39
+ }
+ if {[catch {set oldHost [z39 connect]}]} {
+ set oldHost ""
+ }
z39 callback ok-response
z39 failback fail-response
+ if {$oldHost != $host} {
+ catch {z39 disconnect}
+
+ html "Connecting to target " $host "
\n"
+ set sessionWait 0
+ if {[catch {z39 connect $host}]} {
+ htmlr "Cannot connect to target ${host}
"
+ htmlr "