X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fz39util.tcl;h=aa5378202b21b4ded38f4edb51340988c5e66e0b;hb=25db261b6bbbfcc7bc26f679f195b51d31b9d7d7;hp=e7030623a71b93996771135a151bf7267dcefd80;hpb=3bbb844581f17ede97f6eb7ea8022b69a0859420;p=egate.git
diff --git a/www/z39util.tcl b/www/z39util.tcl
index e703062..aa53782 100644
--- a/www/z39util.tcl
+++ b/www/z39util.tcl
@@ -1,5 +1,5 @@
#
-# $Id: z39util.tcl,v 1.27 1996/01/26 17:41:26 adam Exp $
+# $Id: z39util.tcl,v 1.34 1996/02/29 15:41:40 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,7 @@ 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
@@ -140,12 +147,22 @@ proc display-brief {zset no tno} {
if {$nope} {
set v [join $cover ""]
if {[string length $v] > 40} {
+ set nope 0
html [string range $v 0 38] "..."
- } else {
+ } 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"
}
@@ -287,6 +304,84 @@ proc dl-marc-field-rec {zset no tag lead start stop startid sep} {
}
}
+proc display-full-wais {zset no} {
+ set i0 0
+ set i1 0
+ set refNo 0
+ set body [$zset getWAIS $no text]
+
+ while {[string length [set c [string index $body $i1]]]} {
+ if {[string compare $c \n]} {
+ incr i1
+ continue
+ }
+ set l [string trim [string range $body $i0 $i1]]
+ egw_log debug "line=$l"
+ incr i1
+ set i0 $i1
+ if {[string compare [string index $l 0] {<}]} {
+ egw_log "xxxxxxxxxxxxxxxx"
+ continue
+ }
+ if {[set mark [string first > $l ]] < 1} {
+ egw_log "yyyyyyyyyyyyyyyy"
+ continue
+ }
+ set data [string trim [string range $l [expr $mark +1] end]]
+ incr mark -1
+ set sw [string range $l 1 $mark]
+ egw_log debug "sw=$sw"
+ egw_log debug "data=$data"
+ switch -exact $sw {
+ ti {
+ set title $data
+ }
+ dm {
+ set dateOfLastModification $data
+ }
+ ci {
+ set controlIdentifier $data
+ }
+ lc {
+ set lastChecked $data
+ }
+ by {
+ set bytes $data
+ }
+ avli {
+ set linkage $data
+ }
+ cr {
+ incr refNo
+ }
+ li {
+ set crossRef($refNo,linkage) $data
+ }
+ cp {
+ set crossRef($refNo,title) $data
+ }
+ }
+ }
+ html {Title: } {} $title "
\n"
+ html {URL: } $linkage "
\n"
+ if {[info exists bytes]} {
+ html {Bytes: } $bytes "
\n"
+ }
+ if {[info exists dateOfLastModification]} {
+ html {Last modified: } $dateOfLastModification "
\n"
+ }
+ if {[info exists lastChecked]} {
+ html {Last checked: } $lastChecked "
\n"
+ }
+ html "\n"
+}
+
proc display-full {zset no tno} {
set type [$zset type $no]
if {$type == "SD"} {
@@ -305,7 +400,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
@@ -391,7 +490,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"
@@ -443,6 +542,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] {
@@ -486,9 +594,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 ""
}
@@ -496,7 +602,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
@@ -601,7 +707,7 @@ proc display-scan {setNo scanNo tno} {
set hist($setNo,[expr $scanNo + 1],scanTerm) $t
}
}
- html {}
+ html {}
html {Scan term}
html { | Hits}
html { |
} \n
@@ -646,16 +752,14 @@ proc z39search {setNo piggy tno elements} {
set database $hist($setNo,database)
set query $hist($setNo,query)
}
- if {[catch [list $zz failback fail-response]]} {
- ir $zz
- }
+ mkAssoc $zz $host
if {[catch [list set oldHost [$zz connect]]]} {
set oldHost ""
}
$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
@@ -680,7 +784,7 @@ proc z39search {setNo piggy tno elements} {
$zz disconnect
return 0
}
- if {[catch {egw_wait sessionWait 60}]} {
+ if {$sessionWait == 0 && [catch {egw_wait sessionWait 60}]} {
displayError "Cannot initialize target" $thisHost
$zz disconnect
return 0
@@ -696,15 +800,23 @@ proc z39search {setNo piggy tno elements} {
displayError "Cannot initialize target $thisHost" $u
return 0
}
- } else {
- if {[info exists hist($setNo,hits)] && \
- ![catch [list $zz.$setNo smallSetUpperBound 0]]} {
- return 1
+ } elseif {![catch [list $zz.$setNo smallSetUpperBound 0]]} {
+ if {$tno > 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 {}
}
@@ -731,7 +843,7 @@ proc z39search {setNo piggy tno elements} {
egw_log debug "search: $query"
$zz.$setNo search $query
- if {[catch {egw_wait sessionWait 600}]} {
+ if {[catch {egw_wait sessionWait 60}]} {
egw_log debug "timeout/cancel in search"
displayError "Timeout in search" {}
html "