X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=www%2Fz39util.tcl;h=d78e5d62932d81457e37cf7fb1c18f287d67cdfb;hb=309c35b155c617707995d52197f64f7e17d143a2;hp=7903fd4773e40b20457945f2129371a2cdc866e1;hpb=84081f9782ee28f9236b0974891f1d6b865992be;p=egate.git
diff --git a/www/z39util.tcl b/www/z39util.tcl
index 7903fd4..d78e5d6 100644
--- a/www/z39util.tcl
+++ b/www/z39util.tcl
@@ -1,5 +1,5 @@
#
-# $Id: z39util.tcl,v 1.25 1996/01/24 16:59:29 adam Exp $
+# $Id: z39util.tcl,v 1.35 1996/03/05 18:50:26 adam Exp $
#
proc saveState {} {
uplevel #0 {
@@ -70,7 +70,6 @@ proc display-brief {zset no tno} {
global setNo
global sessionId
-
html {
}
set type [$zset type $no]
if {$type == "SD"} {
@@ -90,7 +89,15 @@ proc display-brief {zset no tno} {
html [join [$zset getSutrs $no]]
html "
\n"
return
- }
+ }
+ if {$rtype == "WAIS"} {
+ html { }
+ html [join [$zset getWAIS $no headline]]
+ html {}
+ html "
\n"
+ return
+ }
if {![catch {
set author [$zset getMarc $no field 100 * a]
set corp [$zset getMarc $no field 110 * a]
@@ -104,7 +111,9 @@ proc display-brief {zset no tno} {
set location [$zset getMarc $no field 260 * a]
set publisher [$zset getMarc $no field 260 * b]
set year [$zset getMarc $no field 260 * c]
- } ] } {
+ } dispError ] } {
+ html { }
set p 0
foreach a $author {
if {$p} {
@@ -130,32 +139,30 @@ proc display-brief {zset no tno} {
if {$p} {
html ": "
}
- html { }
set nope 1
foreach v $title {
html $v
set nope 0
}
if {$nope} {
- html {No title}
- }
- html { }
- foreach v $cover {
- html $v
- }
- if {0} {
- html {
}
- foreach v $location {
- html " $v"
- }
- foreach v $publisher {
- html " $v"
- }
- foreach v $year {
- html " $v"
+ set v [join $cover ""]
+ if {[string length $v] > 40} {
+ set nope 0
+ html [string range $v 0 38] "..."
+ } elseif {[string length $v] > 0} {
+ set nope 0
+ html $v
+ } else {
+ html "No Title"
}
- }
+ }
+ html { }
+ } else {
+ html { }
+ html {No Title}
+ html { }
+ html "Error: " $dispError "\n"
}
html "
\n"
}
@@ -297,6 +304,69 @@ proc dl-marc-field-rec {zset no tag lead start stop startid sep} {
}
}
+proc display-full-wais {zset no} {
+ set i 0
+ set element junk
+ htmlToken l [join [$zset getWAIS $no text]] {
+ if {[string compare [string index $l 0] {<}]} {
+ set data($element) $l
+ continue
+ }
+ switch -exact $l {
+ {
+ set element title
+ }
+ {
+ set element dateOfLastModification
+ }
+ {
+ set element controlIdentifier
+ }
+ {
+ set element lastChecked
+ }
+ {
+ set element bytes
+ }
+ {
+ set element linkage
+ }
+ {
+ incr i
+ }
+ {
+ set element "$i,linkage"
+ }
+ {
+ set element "$i,title"
+ }
+ default {
+ set element junk
+ }
+ }
+ }
+ html {Title: } {} $data(title) "
\n"
+ html {URL: } $data(linkage) "
\n"
+ html {Score: } [$zset getWAIS $no score] "
\n"
+ html {Lines: } [$zset getWAIS $no lines] "
\n"
+ if {[info exists data(bytes)]} {
+ html {Bytes: } $data(bytes) "
\n"
+ }
+ if {[info exists data(dateOfLastModification)]} {
+ html {Last modified: } $data(dateOfLastModification) "
\n"
+ }
+ if {[info exists data(lastChecked)]} {
+ html {Last checked: } $data(lastChecked) "
\n"
+ }
+ html "\n"
+ for {set i 1} {[info exists data($i,linkage)]} {incr i} {
+ html {- }
+ html $data($i,title) "
\n"
+ html "URL: " $data($i,linkage)
+ }
+ html "
\n"
+}
+
proc display-full {zset no tno} {
set type [$zset type $no]
if {$type == "SD"} {
@@ -315,7 +385,11 @@ proc display-full {zset no tno} {
if {$rtype == "SUTRS"} {
html [join [$zset getSutrs $no]] "
\n"
return
- }
+ }
+ if {$rtype == "WAIS"} {
+ display-full-wais $zset $no
+ return
+ }
if {[catch {set r [$zset getMarc $no line * * *]}]} {
html "Unknown record type: $rtype
\n"
return
@@ -401,7 +475,7 @@ proc display-full {zset no tno} {
if {"x$sp" == "x"} {
set sp $url
}
- html {} [join $sp] "\n"
+ html {} [join $sp] "\n"
}
dl-marc-field $zset $no 037 {[abc]} "Acquisition" {} "
\n"
dl-marc-field $zset $no 037 {[f6]} "Form of issue" {} "
\n"
@@ -453,6 +527,15 @@ proc build-query {t ilines} {
set q {}
for {set i 1} {$i <= $ilines} {incr i} {
set term [join [egw_form entry$i]]
+ if {[lindex $targets($t) 6] == "1"} {
+ if {[string length $op] == 0} {
+ set q $term
+ } else {
+ set q "$term $q"
+ }
+ set op [egw_form logic$i]
+ continue
+ }
if {[string length $term] > 0} {
set field [join [egw_form menu$i]]
foreach x [lindex $targets($t) 2] {
@@ -496,9 +579,7 @@ proc z39scan {setNo scanNo tno scanLines scanPos cache} {
set scanAttr $hist($setNo,scanAttr)
set scanTerm $hist($setNo,$scanNo,scanTerm)
}
- if {[catch [list $zz failback fail-response]]} {
- ir $zz
- }
+ mkAssoc $zz $host
if {[catch [list set oldHost [$zz connect]]]} {
set oldHost ""
}
@@ -506,7 +587,7 @@ proc z39scan {setNo scanNo tno scanLines scanPos cache} {
$zz callback ok-response
$zz failback fail-response
set thisHost [splitHostSpec $host]
- if {$oldHost != $thisHost} {
+ if {[string compare $oldHost $thisHost]} {
catch [list $zz disconnect]
set sessionWait 0
@@ -561,6 +642,7 @@ proc z39scan {setNo scanNo tno scanLines scanPos cache} {
$zz callback [list scan-response $zs]
+ egw_log debug "scan: ${scanAttr} ${scanTerm}"
set sessionWait 0
$zs scan "${scanAttr} ${scanTerm}"
@@ -610,16 +692,31 @@ proc display-scan {setNo scanNo tno} {
set hist($setNo,[expr $scanNo + 1],scanTerm) $t
}
}
+ html { 0} {
+ if {[info exists hist($setNo,$tno,hits)]} {
+ return 1
+ }
+ } else {
+ if {[info exists hist($setNo,hits)]} {
+ return 1
+ }
}
-
}
- ir-set $zz.$setNo $zz
+ if {[lindex $targets($host) 6] == "1"} {
+ wais-set $zz.$setNo $zz
+ } else {
+ ir-set $zz.$setNo $zz
+ }
if {![lindex $targets($host) 5]} {
set elements {}
}
@@ -723,9 +826,14 @@ proc z39search {setNo piggy tno elements} {
}
set sessionWait 0
egw_log debug "search: $query"
- $zz.$setNo search $query
+ if {[catch {$zz.$setNo search $query}]} {
+ displayError "Search fail" "Connection closed"
+ html "