#
-# $Id: z39util.tcl,v 1.6 1995/11/09 15:24:37 adam Exp $
+# $Id: z39util.tcl,v 1.7 1995/11/10 14:47:32 adam Exp $
#
proc saveState {} {
uplevel #0 {
set sessionWait -1
}
-proc display-brief {zset no} {
+proc display-brief {zset no tno} {
global env
global setNo
global sessionId
if {$type != "DB"} {
return
}
- html "${no} "
+ html "${no}"
set rtype [$zset recordType $no]
if {$rtype == "SUTRS"} {
html [join [$zset getSutrs $no]]
set year [lindex [$zset getMarc $no field 260 * c] 0]
} ] } {
html {<a href="http:} $env(SCRIPT_NAME) /
- html $sessionId {/showfull.egw/} $setNo + $no + full
+ html $sessionId {/showfull.egw/} $setNo + $tno + $no + full
html {"> } $title {</a>} " <i> ${year} </i>"
}
html "<br>\n"
}
-proc display-raw {zset no} {
+proc display-raw {zset no tno} {
set type [$zset type $no]
if {$type == "SD"} {
set err [lindex [$zset diag $no] 1]
}
}
-proc display-full {zset no} {
+proc display-full {zset no tno} {
set type [$zset type $no]
if {$type == "SD"} {
set err [lindex [$zset diag $no] 1]
dl-marc-field $zset $no 260 * "Publisher" {} " "
dl-marc-field $zset $no 300 * "Physical Description" {} " "
- dl-marc-field $zset $no 500 a "Notes" {} ", "
+ dl-marc-field-rec $zset $no 500 "Notes" "" "<br>\n" "a" ", "
dl-marc-field-rec $zset $no 510 "References" "" "<br>\n" "a" ", "
+ dl-marc-field-rec $zset $no 511 "Participant note" "" "<br>\n" "a" ", "
+
+ dl-marc-field $zset $no 513 a "Report type" {} ", "
+ dl-marc-field $zset $no 513 b "Period covered" {} ", "
+ dl-marc-field-rec $zset $no 515 "Numbering notes" "" "<br>\n" "a" ", "
+ dl-marc-field-rec $zset $no 516 "Data notes" "" "<br>\n" "a" ", "
+ dl-marc-field-rec $zset $no 518 "Date/time notes" "" "<br>\n" "a" ", "
+
dl-marc-field $zset $no 350 a "Price" {} ", "
dl-marc-field $zset $no 362 a "Dates of publication" {} ", "
dl-marc-field $zset $no 850 a "Holdings" {} ", "
+ dl-marc-field-rec $zset $no 270 "Contact name" "" "<br>\n" p ", "
+ if {0} {
+ set n [dl-marc-field $zset $no 270 p "Contact name" {} ", "]
+ if {$n > 0} {
+ html "\n<dl>\n"
+
+ if {0} {
+ dl-marc-field $zset $no 270 a "Street" {} ", "
+ dl-marc-field $zset $no 270 b "City" {} ", "
+ dl-marc-field $zset $no 270 c "State" {} ", "
+ dl-marc-field $zset $no 270 e "Zip code" {} ", "
+ dl-marc-field $zset $no 270 d "Country" {} ", "
+ dl-marc-field $zset $no 270 m "Network address" {} ", "
+ dl-marc-field $zset $no 301 a "Service hours" {} ", "
+ dl-marc-field $zset $no 270 k "Phone" {} ", "
+ dl-marc-field $zset $no 270 l "Fax" {} ", "
+ } else {
+ dl-marc-field $zset $no 270 {[abcedmakl]} "Address" {} "<br>\n"
+ }
+
+ html "\n</dl>\n"
+ }
+ }
dl-marc-field $zset $no 010 a "LC control number" {} ", "
dl-marc-field $zset $no 010 b "NUCMC control number" {} ", "
dl-marc-field $zset $no 020 a "ISBN" {} ", "
}
html {<dd><a href="} $url {">} [join $sp] "</a>\n"
}
- dl-marc-field $zset $no 037 * "Acquisition" {} "<br>\n"
+ dl-marc-field $zset $no 037 {[abc]} "Acquisition" {} "<br>\n"
+ dl-marc-field $zset $no 037 {[f6]} "Form of issue" {} "<br>\n"
+ dl-marc-field $zset $no 537 * "Source of data" {} "<br>\n"
+ dl-marc-field $zset $no 538 * "System details" {} "<br>\n"
dl-marc-field $zset $no 787 {[rstw6]} "Related information" {} "<br>\n"
dl-marc-field $zset $no 001 * "Local control number" {} ", "
html "</dl>\n"
}
-proc display-rec {from to dfunc zz} {
+proc display-rec {from to dfunc tno} {
global setNo
- while {$from <= $to} {
- eval "$dfunc $zz.$setNo $from"
- incr from
+ if {$tno > 0} {
+ while {$from <= $to} {
+ eval "$dfunc z39${tno}.${setNo} $from $tno"
+ incr from
+ }
+ } else {
+ while {$from <= $to} {
+ eval "$dfunc z39.${setNo} $from 0"
+ incr from
+ }
}
}
set op {}
set q {}
for {set i 1} {$i < 4} {incr i} {
- set term1 [wform entry$i]
- regsub {\+} $term1 " " term
+ set term [wform entry$i]
if {$term != ""} {
set field [wform menu$i]
foreach x [lindex $targets($t) 2] {
return $q
}
-proc z39search {setNo piggy} {
+proc z39search {setNo piggy tno} {
global hist
global sessionWait
- set host $hist($setNo,host)
- if {[catch {z39 failback fail-response}]} {
- ir z39
+ if {$tno > 0} {
+ set zz z39$tno
+ set host $hist($setNo,$tno,host)
+ set idAuth $hist($setNo,$tno,idAuthentication)
+ set database $hist($setNo,$tno,database)
+ set query $hist($setNo,$tno,query)
+ } else {
+ set zz z39
+ set host $hist($setNo,host)
+ set idAuth $hist($setNo,idAuthentication)
+ set database $hist($setNo,database)
+ set query $hist($setNo,query)
}
- if {[catch {set oldHost [z39 connect]}]} {
+ if {[catch [list $zz failback fail-response]]} {
+ ir $zz
+ }
+ if {[catch [list set oldHost [$zz connect]]]} {
set oldHost ""
}
- z39 callback ok-response
- z39 failback fail-response
+ $zz callback ok-response
+ $zz failback fail-response
if {$oldHost != $host} {
- catch {z39 disconnect}
+ catch [list $zz disconnect]
html "Connecting to target " $host " <br>\n"
set sessionWait 0
- if {[catch {z39 connect $host}]} {
+ if {[catch [list $zz connect $host]]} {
html "Cannot connect to target ${host} <br>\n"
return 0
} elseif {$sessionWait == 0} {
return 0
}
}
- z39 idAuthentication $hist($setNo,idAuthentication)
+ $zz idAuthentication $idAuth
set sessionWait 0
- if {[catch {z39 init}]} {
+ if {[catch [list $zz init]]} {
html "Cannot initialize with target ${host} <br>\n"
return 0
}
if {[catch {zwait sessionWait 60}]} {
html "Cannot initialize with target ${host} <br>\n"
- z39 disconnect
+ $zz disconnect
return 0
}
if {$sessionWait != "1"} {
html "Cannot initialize with target ${host} <br>\n"
- z39 disconnect
+ $zz disconnect
+ return 0
+ }
+ if {![$zz initResult]} {
+ set u [$zz userInformationField]
+ $zz disconnect
+ html "Connection rejected by target: $u <br>\n"
return 0
}
}
- if {![catch {z39.$setNo smallSetUpperBound 0}]} {
+ if {![catch [list $zz.$setNo smallSetUpperBound 0]]} {
return 1
}
- ir-set z39.$setNo z39
- eval z39.$setNo databaseNames $hist($setNo,database)
+ ir-set $zz.$setNo $zz
+ eval $zz.$setNo databaseNames $database
- z39.$setNo preferredRecordSyntax USMARC
+ $zz.$setNo preferredRecordSyntax USMARC
- z39 callback search-response $setNo
+ $zz callback search-response $setNo
if {$piggy} {
- z39.$setNo largeSetLowerBound 999999
- z39.$setNo smallSetUpperBound 0
- z39.$setNo mediumSetPresentNumber $hist($setNo,maxPresent)
+ $zz.$setNo largeSetLowerBound 999999
+ $zz.$setNo smallSetUpperBound 0
+ $zz.$setNo mediumSetPresentNumber $hist($setNo,maxPresent)
} else {
- z39.$setNo largeSetLowerBound 2
- z39.$setNo smallSetUpperBound 0
- z39.$setNo mediumSetPresentNumber 0
+ $zz.$setNo largeSetLowerBound 2
+ $zz.$setNo smallSetUpperBound 0
+ $zz.$setNo mediumSetPresentNumber 0
}
set sessionWait 0
- z39.$setNo search $hist($setNo,query)
+ $zz.$setNo search $query
if {[catch {zwait sessionWait 600}]} {
html "</body></html>\n"
- z39 disconnect
+ $zz disconnect
return 0
}
if {$sessionWait != 1} {
html "</body></html>\n"
- z39 disconnect
+ $zz disconnect
return 0
}
- set status [z39.$setNo responseStatus]
+ set status [$zz.$setNo responseStatus]
if {[lindex $status 0] == "NSD"} {
set code [lindex $status 1]
set msg [lindex $status 2]
html "<h2>Error NSD$code: $msg: $addinfo </h2><br>\n"
return 0
}
- set hist($setNo,hits) [z39.$setNo resultCount]
+ set hist($setNo,hits) [$zz.$setNo resultCount]
return 1
}
}
}
-proc z39present {setNo setOffset setMax dfunc} {
+proc z39present {setNo tno setOffset setMax dfunc} {
global hist
global sessionWait
+ if {$tno > 0} {
+ set zz z39$tno
+ } else {
+ set zz z39
+ }
+
set toGet [expr 1 + $setMax - $setOffset]
while {$setMax > 0 && $toGet > 0} {
for {set got 0} {$got < $toGet} {incr got} {
- if {[z39.$setNo type [expr $setOffset + $got]] == ""} {
+ if {[$zz.$setNo type [expr $setOffset + $got]] == ""} {
break
}
}
if {$got < $toGet} {
set sessionWait 0
- z39.$setNo present $setOffset $toGet
+ $zz.$setNo present $setOffset $toGet
if {[catch {zwait sessionWait 300}]} {
- z39 disconnect
+ $zz disconnect
break
}
if {$sessionWait != "1"} {
break
}
- set got [z39.$setNo numberOfRecordsReturned]
+ set got [$zz.$setNo numberOfRecordsReturned]
if {$got <= 0} {
break
}
}
- display-rec $setOffset [expr $got + $setOffset - 1] $dfunc z39
+ display-rec $setOffset [expr $got + $setOffset - 1] $dfunc $tno
set setOffset [expr $got + $setOffset]
set toGet [expr 1 + $setMax - $setOffset]
wflush