X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=www%2Fz39util.tcl;h=36a28a1588133b7fc54bf8ff06cc06e48cb382a5;hb=8bafbc608e1ffba9ee87f4856e586dffa57901b8;hp=20fcec2a99befb5a2a9015fc8bb65c14f4372ac4;hpb=6315a552d51ac08b60d25d8500da5574a83ba530;p=egate.git
diff --git a/www/z39util.tcl b/www/z39util.tcl
index 20fcec2..36a28a1 100644
--- a/www/z39util.tcl
+++ b/www/z39util.tcl
@@ -1,5 +1,5 @@
#
-# $Id: z39util.tcl,v 1.3 1995/11/08 12:42:18 adam Exp $
+# $Id: z39util.tcl,v 1.41 1996/03/14 11:50:51 adam Exp $
#
proc saveState {} {
uplevel #0 {
@@ -8,31 +8,47 @@ proc saveState {} {
if {$var == "f"} continue
if {$var == "sessionId"} continue
if {$var == "errorInfo"} continue
- set names [array names $var]
- if {$names != ""} {
+ if {[catch {set names [array names $var]}]} {
+ eval "set v \$${var}"
+ puts $f "set ${var} \{$v\}"
+ } else {
foreach n $names {
eval "set v \$${var}(\$n)"
puts $f "set ${var}($n) \{$v\}"
}
- } else {
- eval "set v \$${var}"
- puts $f "set ${var} \{$v\}"
+ catch {
+ eval "set v \$${var}"
+ puts $f "set ${var} \{$v\}"
+ }
}
}
close $f
}
}
-proc search-response {sno} {
+proc search-response {zz} {
global sessionWait
- set status [z39.$sno responseStatus]
+ set status [$zz responseStatus]
if {[lindex $status 0] == "NSD"} {
- z39.$sno nextResultSetPosition 0
+ $zz nextResultSetPosition 0
set code [lindex $status 1]
set msg [lindex $status 2]
set addinfo [lindex $status 3]
- html "
Error NSD$code: $msg: $addinfo
\n"
+ displayError "Diagnostic message" \
+ "$msg: $addinfo
\n(error code $code)"
+ set sessionWait -2
+ } else {
+ set sessionWait 1
+ }
+}
+
+proc scan-response {zz} {
+ global sessionWait
+
+ set status [$zz scanStatus]
+ if {$status == 6} {
+ displayError "Scan fail" ""
set sessionWait -2
} else {
set sessionWait 1
@@ -49,11 +65,11 @@ proc fail-response {} {
set sessionWait -1
}
-proc display-brief {zset no} {
+proc display-medium {zset no setNo targetNo} {
global env
- global setNo
global sessionId
+ html {}
set type [$zset type $no]
if {$type == "SD"} {
set err [lindex [$zset diag $no] 1]
@@ -67,25 +83,103 @@ proc display-brief {zset no} {
if {$type != "DB"} {
return
}
- html "${no} "
set rtype [$zset recordType $no]
- if {$rtype == "SUTRS"} {
- html [join [$zset getSutrs $no]]
- html "
\n"
- return
- }
+ switch $rtype {
+ SUTRS {
+ html { }
+ html [join [$zset getSutrs $no]]
+ html "
\n"
+ return
+ }
+ WAIS {
+ html { }
+ html [join [$zset getWAIS $no headline]]
+ html {}
+ html "
\n"
+ html {Score: } [$zset getWAIS $no score]
+ set lines [$zset getWAIS $no lines]
+ if {$lines > 0} {
+ html {, } $lines { lines}
+ }
+ html "
\n"
+ return
+ }
+ }
if {![catch {
- set title [lindex [$zset getMarc $no field 245 * a] 0]
- set year [lindex [$zset getMarc $no field 260 * c] 0]
- } ] } {
- html { } $title {}
- html " ${year} "
+ set author [$zset getMarc $no field 100 * a]
+ set corp [$zset getMarc $no field 110 * a]
+ set meet [$zset getMarc $no field 111 * a]
+ set title [$zset getMarc $no field 245 * a]
+ if {[llength $author] == 0} {
+ set cover [$zset getMarc $no field 245 * {[bc]}]
+ } else {
+ set cover [$zset getMarc $no field 245 * b]
+ }
+ set location [$zset getMarc $no field 260 * a]
+ set publisher [$zset getMarc $no field 260 * b]
+ set year [$zset getMarc $no field 260 * c]
+ set score [$zset getMarc $no field 999 * r]
+ } dispError ] } {
+ html { }
+ set p 0
+ foreach a $author {
+ if {$p} {
+ html ", "
+ }
+ html $a
+ set p 1
+ }
+ foreach a $corp {
+ if {$p} {
+ html ", "
+ }
+ html $a
+ set p 1
+ }
+ foreach a $meet {
+ if {$p} {
+ html ", "
+ }
+ html $a
+ set p 1
+ }
+ if {$p} {
+ html ": "
+ }
+ set nope 1
+ foreach v $title {
+ html $v
+ set nope 0
+ }
+ set v [join $cover ""]
+ if {[string length $v] > 0} {
+ set nope 0
+ html $v
+ } elseif {$nope} {
+ html "No Title"
+ }
+ html { }
+ if {[scan $score %d nscore]} {
+ html "; Score " $nscore
+ }
+ } else {
+ html { }
+ html {No Title}
+ html { }
+ html "Error: " $dispError "\n"
}
html "
\n"
}
-proc display-full {zset no} {
+proc display-brief {zset no setNo targetNo} {
+ global env
+ global sessionId
+
+ html {}
set type [$zset type $no]
if {$type == "SD"} {
set err [lindex [$zset diag $no] 1]
@@ -93,19 +187,134 @@ proc display-full {zset no} {
if {$add != {}} {
set add " :${add}"
}
- html "${no}
\n"
- html "Error ${err}${add}
\n"
+ html "${no} Error ${err}${add}
\n"
return
}
if {$type != "DB"} {
return
}
- html "${no}
\n"
set rtype [$zset recordType $no]
- if {$rtype == "SUTRS"} {
- html [join [$zset getSutrs $no]] "
\n"
- return
- }
+ switch $rtype {
+ SUTRS {
+ html { }
+ html [string range [join [$zset getSutrs $no]] 0 70]
+ html "
\n"
+ return
+ }
+ WAIS {
+ html { }
+ html [string range [join [$zset getWAIS $no headline]] 0 70]
+
+ html {}
+ set score [$zset getWAIS $no score]
+ html { Score } $score
+ html "
\n"
+ return
+ }
+ }
+ if {![catch {
+ set author [$zset getMarc $no field 100 * a]
+ set corp [$zset getMarc $no field 110 * a]
+ set meet [$zset getMarc $no field 111 * a]
+ set title [$zset getMarc $no field 245 * a]
+ if {[llength $author] == 0} {
+ set cover [$zset getMarc $no field 245 * {[bc]}]
+ } else {
+ set cover [$zset getMarc $no field 245 * b]
+ }
+ 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} {
+ html ", "
+ }
+ html $a
+ set p 1
+ }
+ foreach a $corp {
+ if {$p} {
+ html ", "
+ }
+ html $a
+ set p 1
+ }
+ foreach a $meet {
+ if {$p} {
+ html ", "
+ }
+ html $a
+ set p 1
+ }
+ if {$p} {
+ html ": "
+ }
+ html {}
+ set nope 1
+ foreach v $title {
+ html $v
+ set nope 0
+ }
+ html {}
+ if {$nope} {
+ 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"
+}
+
+proc display-raw {zset no setNo targetNo} {
+ set type [$zset type $no]
+ switch $type {
+ SD {
+ set err [lindex [$zset diag $no] 1]
+ set add [lindex [$zset diag $no] 2]
+ if {$add != {}} {
+ set add " :${add}"
+ }
+ html "${no}
\n"
+ html "Error ${err}${add}
\n"
+ return
+ }
+ DB {
+ }
+ default {
+ return
+ }
+ }
+ set rtype [$zset recordType $no]
+ switch $rtype {
+ SUTRS {
+ html "\n" [join [$zset getSutrs $no]] "\n\n"
+ return
+ }
+ WAIS {
+ html "\n" [join [$zset getWAIS $no text]] "\n\n"
+ return
+ }
+ }
if {[catch {set r [$zset getMarc $no line * * *]}]} {
html "Unknown record type: $rtype
\n"
return
@@ -115,7 +324,7 @@ proc display-full {zset no} {
set indicator [lindex $line 1]
set fields [lindex $line 2]
set l [string length $indicator]
- html "$tag "
+ html "$tag "
if {$l > 0} {
for {set i 0} {$i < $l} {incr i} {
if {[string index $indicator $i] == " "} {
@@ -125,6 +334,7 @@ proc display-full {zset no} {
}
}
}
+ html ""
foreach field $fields {
set id [lindex $field 0]
set data [lindex $field 1]
@@ -133,183 +343,774 @@ proc display-full {zset no} {
}
html $data
}
- htmlr {
}
+ html "
\n"
+ }
+}
+
+proc put-marc-contents {cc} {
+ set ref ""
+ if {[string first :// $cc] > 0} {
+ foreach urltype {gopher http ftp mailto} {
+ if {[string first ${urltype}:// $cc] == 0} {
+ set ref $urltype
+ break
+ }
+ }
+ }
+ if {$ref != ""} {
+ html {} $cc {}
+ }
+}
+
+proc dl-marc-field {zset no tag id la lb sep} {
+ set n 0
+ set c [$zset getMarc $no field $tag * $id]
+ set len [llength $c]
+ if {$len == 0} {
+ return 0
+ }
+ if {$len > 1 && "x$lb" != "x"} {
+ html "$lb\n"
+ } else {
+ html "$la\n"
+ }
+ foreach cc $c {
+ if {$n > 0} {
+ html $sep
+ }
+ put-marc-contents $cc
+ incr n
+ }
+ return $n
+}
+
+proc dd-marc-field {zset no tag id start stop} {
+ set n 0
+ set c [$zset getMarc $no field $tag * $id]
+ set len [llength $c]
+ if {$len == 0} {
+ return 0
+ }
+ foreach cc $c {
+ html $start
+ put-marc-contents $cc
+ html $stop
+ incr n
+ }
+ return $n
+}
+
+proc dl-marc-field-rec {zset no tag lead start stop startid sep} {
+ set n 0
+ set lines [$zset getMarc $no line $tag * *]
+ foreach line $lines {
+ foreach field [lindex $line 2] {
+ if {$n == 0} {
+ html "$lead"
+ html "\n"
+ }
+ set id [lindex $field 0]
+ if {$id == $startid} {
+ if {$n > 0} {
+ html $stop
+ }
+ html $start
+ incr n
+ html [lindex $field 1]
+ } else {
+ html $sep
+ html [lindex $field 1]
+ }
+ }
+ }
+ if {$n > 0} {
+ html $stop
+ }
+}
+
+proc display-full-marc {zset no setNo targetNo} {
+ global env
+ global hist
+ global sessionId
+
+ html "\n"
+ set n [dl-marc-field $zset $no 700 a "Author" "Authors" "
\n"]
+ if {$n == 0} {
+ set n [dl-marc-field $zset $no 100 a "Author" "Authors" "
\n"]
+ }
+ set n [dl-marc-field $zset $no 710 a "Corporate Name" {} ", "]
+ if {$n == 0} {
+ set n [dl-marc-field $zset $no 110 a "Corporate Name" {} ", "]
+ }
+ set n [dl-marc-field $zset $no 711 a "Meeting Name" {} ", "]
+ if {$n > 0} {
+ dd-marc-field $zset $no 711 {[bndc]} " " ""
+ } else {
+ set n [dl-marc-field $zset $no 111 a "Meeting Name" {} ", "]
+ if {$n > 0} {
+ dd-marc-field $zset $no 111 {[bndc]} " " " "
+ }
+ }
+ set n [dl-marc-field $zset $no 245 {a} "Title" {} " "]
+ if {$n > 0} {
+ dd-marc-field $zset $no 245 b "" ""
+ dd-marc-field $zset $no 245 c " " ""
+ } else {
+ dl-marc-field $zset $no 245 {[ab]} "Title" {} " "
+ }
+ dl-marc-field $zset $no 520 a "Abstract" {} ", "
+ dl-marc-field $zset $no 072 * "Subject code" "Subject codes" ", "
+ dl-marc-field $zset $no 650 * "Subject" {} ", "
+ dl-marc-field $zset $no 260 * "Publisher" {} " "
+ dl-marc-field $zset $no 300 * "Physical Description" {} " "
+
+ dl-marc-field-rec $zset $no 500 "Notes" "" "
\n" "a" ", "
+
+ dl-marc-field-rec $zset $no 510 "References" "" "
\n" "a" ", "
+
+ dl-marc-field-rec $zset $no 511 "Participant note" "" "
\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" "" "
\n" "a" ", "
+ dl-marc-field-rec $zset $no 516 "Data notes" "" "
\n" "a" ", "
+ dl-marc-field-rec $zset $no 518 "Date/time notes" "" "
\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" "" "
\n" p ", "
+ if {0} {
+ set n [dl-marc-field $zset $no 270 p "Contact name" {} ", "]
+ if {$n > 0} {
+ html "\n\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" {} "
\n"
+ }
+
+ html "\n
\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" {} ", "
+ dl-marc-field $zset $no 022 a "ISSN" {} ", "
+ set url [$zset getMarc $no field 856 * u]
+ set sp [$zset getMarc $no field 856 * 3]
+ if {"x$url" != "x"} {
+ html "- URL\n"
+ if {"x$sp" == "x"} {
+ set sp $url
+ }
+ html {
- } [join $sp] "\n"
+ }
+ dl-marc-field $zset $no 037 {[abc]} "Acquisition" {} "
\n"
+ dl-marc-field $zset $no 037 {[f6]} "Form of issue" {} "
\n"
+ dl-marc-field $zset $no 537 * "Source of data" {} "
\n"
+ dl-marc-field $zset $no 538 * "System details" {} "
\n"
+ dl-marc-field $zset $no 787 {[rstw6]} "Related information" {} "
\n"
+ dl-marc-field $zset $no 999 r "Score" {} ", "
+ dl-marc-field $zset $no 001 * "Local control number" {} ", "
+ html "
\n"
+}
+
+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]] {
+ if {[string compare [string index $l 0] {<}]} {
+ if {[info exist data($element)]} {
+ set data($element) $data($element)$l
+ } else {
+ set data($element) $l
+ }
+ continue
+ }
+ switch -- $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"
+ }
+ {
+ set element ip
+ }
+ default {
+ set element junk
+ }
+ }
+ }
+ if {![info exists data(title)] || ![info exists data(linkage)]} {
+ set nwi 0
+ } else {
+ set nwi 1
+ }
+ html "\n"
+ html {- Title}
+ if {$nwi} {
+ html {
- } $data(title) ""
+ html {
- URL}
+ html {
- } $data(linkage) "
\n"
+ } else {
+ html {- } [join [$zset getWAIS $no headline]]
+ }
+ html {
- Score
- } [$zset getWAIS $no score]
+ set lines [$zset getWAIS $no lines]
+ if {$lines > 0} {
+ html {
- Lines
- } $lines "
\n"
+ }
+ if {!$nwi} {
+ html "
\n" [join [$zset getWAIS $no text]] "\n
\n"
+ return
+ }
+ if {[info exists data(bytes)]} {
+ html {Bytes} $data(bytes)
+ }
+ if {[info exists data(dateOfLastModification)]} {
+ html {Last modified} $data(dateOfLastModification)
+ }
+ if {[info exists data(lastChecked)]} {
+ html {Last checked} $data(lastChecked) "
\n"
+ }
+ if {[info exists data(ip)]} {
+ html {Initial text} $data(ip) "
\n"
+ }
+ if {0} {
+ html {}
+ html {Similar WAIS record
}
+ }
+ if {[info exists data($i,linkage)]} {
+ html "References\n"
+ }
+ for {set i 1} {[info exists data($i,linkage)]} {incr i} {
+ html {}
+ if {[info exists data($i,title)]} {
+ html $data($i,title)
+ } else {
+ html Untitled
+ }
+ html "
\n"
+ }
+ html "\n"
+}
+
+proc display-full {zset no setNo targetNo} {
+ set type [$zset type $no]
+ switch $type {
+ SD {
+ set err [lindex [$zset diag $no] 1]
+ set add [lindex [$zset diag $no] 2]
+ if {$add != {}} {
+ set add " :${add}"
+ }
+ html "Error ${err}${add}
\n"
+ return
+ }
+ DB {
+ }
+ default {
+ return
+ }
+ }
+ set rtype [$zset recordType $no]
+ switch $rtype {
+ SUTRS {
+ html "" [join [$zset getSutrs $no]] "
\n"
+ return
+ }
+ WAIS {
+ display-full-wais $zset $no $setNo $targetNo
+ return
+ }
+ }
+ if {[catch {set r [$zset getMarc $no line * * *]}]} {
+ html "Unknown record type: $rtype
\n"
+ return
}
+ display-full-marc $zset $no $setNo $targetNo
}
-proc display-rec {from to dfunc zz} {
- global setNo
+proc display-rec {from to dfunc setNo targetNo} {
while {$from <= $to} {
- eval "$dfunc $zz.$setNo $from"
+ eval "$dfunc z39${targetNo}.${setNo} $from $setNo $targetNo"
incr from
}
}
-proc build-query {t} {
+proc build-scan {t i} {
+ global targets
+
+ set term [egw_form entry$i]
+ if {$term != ""} {
+ set field [join [egw_form menu$i]]
+ set attr {Title}
+ foreach x [lindex $targets($t) 2] {
+ if {[lindex $x 0] == $field} {
+ set attr [lindex $x 1]
+ }
+ }
+ return [list $term $attr]
+ }
+ return ""
+}
+
+proc build-query {t ilines} {
global targets
set op {}
set q {}
- for {set i 1} {$i < 4} {incr i} {
- set term1 [wform entry$i]
- regsub {\+} $term1 " " term
- if {$term != ""} {
- set field [wform menu$i]
+ for {set i 1} {$i <= $ilines} {incr i} {
+ set term [join [egw_form entry$i]]
+ if {[string length $term] == 0} continue
+ if {![string compare [lindex $targets($t) 1] WAIS]} {
+ if {[string length $q] == 0} {
+ set q $term
+ } else {
+ set q "$term $q"
+ }
+ set op [egw_form logic$i]
+ continue
+ } else {
+ set field [join [egw_form menu$i]]
+ catch {unset attr}
foreach x [lindex $targets($t) 2] {
- if {[lindex $x 0] == $field} {
+ if {![string compare [lindex $x 0] $field]} {
set attr [lindex $x 1]
}
}
+ if {![info exists attr]} {
+ egw_log debug "attr failed for $t"
+ set attr [lindex [lindex [lindex $targets($t) 2] 0] 1]
+ }
switch $op {
- And
- { set q "@and $q ${attr} \{${term}\}" }
- Or
- { set q "@or $q ${attr} \{${term}\}" }
- {And not}
- { set q "@not $q ${attr} \{${term}\}" }
- {}
- { set q "${attr} \{${term}\}" }
+ And
+ { set q "@and $q ${attr} \"${term}\"" }
+ Or
+ { set q "@or $q ${attr} \"${term}\"" }
+ {And not}
+ { set q "@not $q ${attr} \"${term}\"" }
+ {}
+ { set q "${attr} \"${term}\"" }
}
- set op [wform logic$i]
+ set op [egw_form logic$i]
}
}
return $q
}
-proc z39search {setNo piggy} {
+proc z39scan {setNo scanNo tno scanLines scanPos cache} {
global hist
global sessionWait
+ global targets
- set host $hist($setNo,host)
- if {[catch {z39 failback fail-response}]} {
- ir z39
- }
- if {[catch {set oldHost [z39 connect]}]} {
+ 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 ""
}
- z39 callback ok-response
- z39 failback fail-response
- if {$oldHost != $host} {
- catch {z39 disconnect}
+ set zs $zz.s$scanNo.$setNo
+ $zz callback ok-response
+ $zz failback fail-response
+ set thisHost [splitHostSpec $host]
+ if {[string compare $oldHost $thisHost]} {
+ catch [list $zz disconnect]
- html "Connecting to target " $host "
\n"
set sessionWait 0
- if {[catch {z39 connect $host}]} {
- html "Cannot connect to target ${host}
\n"
+ if {[catch [list $zz connect $thisHost]]} {
+ displayError "Cannot connect to target" $thisHost
return 0
} elseif {$sessionWait == 0} {
- zwait sessionWait
+ if {[catch {egw_wait sessionWait 300}]} {
+ $zz disconnect
+ displayError "Cannot connect to target" $thisHost
+ return 0
+ }
if {$sessionWait != 1} {
- html "Cannot connect to target ${host}
\n"
+ displayError "Cannot connect to target" $thisHost
return 0
}
}
- z39 idAuthentication $hist($setNo,idAuthentication)
+ $zz idAuthentication $idAuth
set sessionWait 0
- if {[catch {z39 init}]} {
- html "Cannot initialize with target ${host}
\n"
+ if {[catch {$zz init}]} {
+ displayError "Cannot initialize target" $thisHost
+ $zz disconnect
+ return 0
+ }
+ if {[catch {egw_wait sessionWait 60}]} {
+ displayError "Cannot initialize target" $thisHost
+ $zz disconnect
return 0
}
- zwait sessionWait
if {$sessionWait != "1"} {
- html "Cannot initialize with target ${host}
\n"
+ displayError "Cannot initialize target" $thisHost
+ $zz disconnect
return 0
}
+ if {![$zz initResult]} {
+ set u [$zz userInformationField]
+ $zz disconnect
+ displayError "Cannot initialize target $thisHost" $u
+ return 0
+ }
+ } else {
+ if {$cache && ![catch [list $zs numberOfTermsRequested 5]]} {
+ return 1
+ }
}
- if {![catch {z39.$setNo smallSetUpperBound 0}]} {
- return 1
- }
- ir-set z39.$setNo z39
- eval z39.$setNo databaseNames $hist($setNo,database)
+ eval $zz databaseNames $database
- z39.$setNo preferredRecordSyntax USMARC
+ ir-scan $zs $zz
- z39 callback search-response $setNo
- if {$piggy} {
- z39.$setNo largeSetLowerBound 999999
- z39.$setNo smallSetUpperBound 0
- z39.$setNo mediumSetPresentNumber $hist($setNo,maxPresent)
- } else {
- z39.$setNo largeSetLowerBound 2
- z39.$setNo smallSetUpperBound 0
- z39.$setNo mediumSetPresentNumber 0
- }
+ $zs numberOfTermsRequested $scanLines
+ $zs preferredPositionInResponse $scanPos
+
+ $zz callback [list scan-response $zs]
+
+ egw_log debug "scan: ${scanAttr} ${scanTerm}"
set sessionWait 0
- z39.$setNo search $hist($setNo,query)
+ $zs scan "${scanAttr} ${scanTerm}"
- zwait sessionWait
- if {$sessionWait != 1} {
+ if {[catch {egw_wait sessionWait 60}]} {
+ egw_log debug "timeout/cancel in scan"
+ displayError "Timeout in scan" {}
html "