X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fz39util.tcl;h=8740be44742c7b7eab30d3ea135425806e25fca6;hb=4938d0c2e8f4e1eec397c2bfbbc7e23fd150c369;hp=d78e5d62932d81457e37cf7fb1c18f287d67cdfb;hpb=077cc4d735856a5e9c31e16ee75d28e85c67ac62;p=egate.git
diff --git a/www/z39util.tcl b/www/z39util.tcl
index d78e5d6..8740be4 100644
--- a/www/z39util.tcl
+++ b/www/z39util.tcl
@@ -1,5 +1,5 @@
#
-# $Id: z39util.tcl,v 1.35 1996/03/05 18:50:26 adam Exp $
+# $Id: z39util.tcl,v 1.36 1996/03/07 12:46:09 adam Exp $
#
proc saveState {} {
uplevel #0 {
@@ -65,9 +65,8 @@ proc fail-response {} {
set sessionWait -1
}
-proc display-brief {zset no tno} {
+proc display-brief {zset no setNo targetNo} {
global env
- global setNo
global sessionId
html {
}
@@ -92,7 +91,7 @@ proc display-brief {zset no tno} {
}
if {$rtype == "WAIS"} {
html { }
+ html $sessionId {/showfull.egw/} $setNo + $targetNo + $no + full {">}
html [join [$zset getWAIS $no headline]]
html {}
html "
\n"
@@ -113,7 +112,7 @@ proc display-brief {zset no tno} {
set year [$zset getMarc $no field 260 * c]
} dispError ] } {
html { }
+ html $sessionId {/showfull.egw/} $setNo + $targetNo + $no + full {">}
set p 0
foreach a $author {
if {$p} {
@@ -159,7 +158,7 @@ proc display-brief {zset no tno} {
html { }
} else {
html { }
+ html $sessionId {/showfull.egw/} $setNo + $targetNo + $no + full {">}
html {No Title}
html { }
html "Error: " $dispError "\n"
@@ -304,7 +303,11 @@ proc dl-marc-field-rec {zset no tag lead start stop startid sep} {
}
}
-proc display-full-wais {zset no} {
+proc display-full-wais {zset no setNo targetNo} {
+ global env
+ global hist
+ global sessionId
+
set i 0
set element junk
htmlToken l [join [$zset getWAIS $no text]] {
@@ -345,6 +348,10 @@ proc display-full-wais {zset no} {
}
}
}
+ if {![info exists data(title)] || ![info exists data(linkage)]} {
+ html "" [join [$zset getWAIS $no text]] "\n"
+ return
+ }
html {Title: } {} $data(title) "
\n"
html {URL: } $data(linkage) "
\n"
html {Score: } [$zset getWAIS $no score] "
\n"
@@ -358,6 +365,10 @@ proc display-full-wais {zset no} {
if {[info exists data(lastChecked)]} {
html {Last checked: } $data(lastChecked) "
\n"
}
+ html {}
+ html {Similar WAIS record
}
html "\n"
}
-proc display-full {zset no tno} {
+proc display-full {zset no setNo targetNo} {
set type [$zset type $no]
if {$type == "SD"} {
set err [lindex [$zset diag $no] 1]
@@ -387,7 +398,7 @@ proc display-full {zset no tno} {
return
}
if {$rtype == "WAIS"} {
- display-full-wais $zset $no
+ display-full-wais $zset $no $setNo $targetNo
return
}
if {[catch {set r [$zset getMarc $no line * * *]}]} {
@@ -487,19 +498,10 @@ proc display-full {zset no tno} {
}
-proc display-rec {from to dfunc tno} {
- global setNo
-
- 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
- }
+proc display-rec {from to dfunc setNo targetNo} {
+ while {$from <= $to} {
+ eval "$dfunc z39${targetNo}.${setNo} $from $setNo $targetNo"
+ incr from
}
}
@@ -564,21 +566,13 @@ proc z39scan {setNo scanNo tno scanLines scanPos cache} {
global sessionWait
global targets
- 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 scanAttr $hist($setNo,$tno,scanAttr)
- set scanTerm $hist($setNo,$tno,$scanNo,scanTerm)
- } else {
- set zz z39
- set host $hist($setNo,host)
- set idAuth $hist($setNo,idAuthentication)
- set database $hist($setNo,database)
- set scanAttr $hist($setNo,scanAttr)
- set scanTerm $hist($setNo,$scanNo,scanTerm)
- }
+ set zz z39$tno
+ set host $hist($setNo,$tno,host)
+ set idAuth $hist($setNo,$tno,idAuthentication)
+ set database $hist($setNo,$tno,database)
+ set scanAttr $hist($setNo,scanAttr)
+ set scanTerm $hist($setNo,$scanNo,scanTerm)
+
mkAssoc $zz $host
if {[catch [list set oldHost [$zz connect]]]} {
set oldHost ""
@@ -670,11 +664,7 @@ proc display-scan {setNo scanNo tno} {
global env
global sessionId
- if {$tno > 0} {
- set zz z39$tno
- } else {
- set zz z39
- }
+ set zz z39$tno
set zs $zz.s$scanNo.$setNo
set m [$zs numberOfEntriesReturned]
@@ -707,7 +697,7 @@ proc display-scan {setNo scanNo tno} {
} else {
regsub -all {\ } [lindex [$zs scanLine $i] 1] + tterm
html {}
}
html [lindex [$zs scanLine $i] 1]
@@ -724,19 +714,13 @@ proc z39search {setNo piggy tno elements} {
global sessionWait
global targets
- 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)
- }
+ 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)
+ catch {set docId $hist($setNo,$tno,queryId)}
+
mkAssoc $zz $host
if {[catch [list set oldHost [$zz connect]]]} {
set oldHost ""
@@ -826,14 +810,14 @@ proc z39search {setNo piggy tno elements} {
}
set sessionWait 0
egw_log debug "search: $query"
- if {[catch {$zz.$setNo search $query}]} {
- displayError "Search fail" "Connection closed"
- html "