X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2Fz39util.tcl;h=20fcec2a99befb5a2a9015fc8bb65c14f4372ac4;hb=6315a552d51ac08b60d25d8500da5574a83ba530;hp=796fdd22259859e5b5db67c91fd2c8c4de2ed825;hpb=6e37e8e91bf35cb14c930e8988085cf78f11029a;p=egate.git
diff --git a/www/z39util.tcl b/www/z39util.tcl
index 796fdd2..20fcec2 100644
--- a/www/z39util.tcl
+++ b/www/z39util.tcl
@@ -1,5 +1,5 @@
#
-# $Id: z39util.tcl,v 1.2 1995/11/07 14:57:00 adam Exp $
+# $Id: z39util.tcl,v 1.3 1995/11/08 12:42:18 adam Exp $
#
proc saveState {} {
uplevel #0 {
@@ -71,7 +71,7 @@ proc display-brief {zset no} {
set rtype [$zset recordType $no]
if {$rtype == "SUTRS"} {
html [join [$zset getSutrs $no]]
- htmlr {
}
+ html "
\n"
return
}
if {![catch {
@@ -82,7 +82,7 @@ proc display-brief {zset no} {
html $sessionId {/showfull.egw/} $setNo + $no {"> } $title {}
html " ${year} "
}
- htmlr {
}
+ html "
\n"
}
proc display-full {zset no} {
@@ -93,21 +93,21 @@ proc display-full {zset no} {
if {$add != {}} {
set add " :${add}"
}
- htmlr "
${no}
"
- htmlr "Error ${err}${add}
"
+ html "${no}
\n"
+ html "Error ${err}${add}
\n"
return
}
if {$type != "DB"} {
return
}
- htmlr "
${no}
"
+ html "${no}
\n"
set rtype [$zset recordType $no]
if {$rtype == "SUTRS"} {
- htmlr [join [$zset getSutrs $no]]
+ html [join [$zset getSutrs $no]] "
\n"
return
}
if {[catch {set r [$zset getMarc $no line * * *]}]} {
- htmlr "Unknown record type: $rtype"
+ html "Unknown record type: $rtype
\n"
return
}
foreach line $r {
@@ -118,8 +118,8 @@ proc display-full {zset no} {
html "$tag "
if {$l > 0} {
for {set i 0} {$i < $l} {incr i} {
- if {[string index $tag $i] == " "} {
- html "_"
+ if {[string index $indicator $i] == " "} {
+ html "-"
} else {
html [string index $tag $i]
}
@@ -205,6 +205,7 @@ proc z39search {setNo piggy} {
return 0
}
}
+ z39 idAuthentication $hist($setNo,idAuthentication)
set sessionWait 0
if {[catch {z39 init}]} {
html "Cannot initialize with target ${host}
\n"
@@ -397,7 +398,7 @@ proc z39present {setNo setOffset setMax dfunc} {
}
set got [z39.$setNo numberOfRecordsReturned]
}
- display-rec $setOffset [expr $got + $setOffset - 1] $dfunc
+ display-rec $setOffset [expr $got + $setOffset - 1] $dfunc z39
set setOffset [expr $got + $setOffset]
set toGet [expr 1 + $setMax - $setOffset]
wflush
@@ -409,6 +410,7 @@ proc z39history {} {
global hist
global env
global sessionId
+ global targets
if {![info exists nextSetNo]} {
return
@@ -418,7 +420,7 @@ proc z39history {} {
html { } $hist($setNo,host)
+ html {"> } [lindex $targets($hist($setNo,host)) 0]
if {[llength $hist($setNo,database)] > 1} {
html ": "
foreach b $hist($setNo,database) {