X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2Fz39util.tcl;h=3a2c69482c9a0e243bb1443fa1c46631f31072e6;hb=df7b985601de6c729147a6fd6588adba6f905480;hp=23fabd6bc6b7fb7bbb3d7393625dcf4b823f14ea;hpb=5bbe4c302d2d105aea7806317e9f31d5773a9536;p=egate.git
diff --git a/www/z39util.tcl b/www/z39util.tcl
index 23fabd6..3a2c694 100644
--- a/www/z39util.tcl
+++ b/www/z39util.tcl
@@ -1,5 +1,5 @@
#
-# $Id: z39util.tcl,v 1.10 1995/11/14 09:53:16 adam Exp $
+# $Id: z39util.tcl,v 1.15 1996/01/02 10:52:32 adam Exp $
#
proc saveState {} {
uplevel #0 {
@@ -43,6 +43,18 @@ proc search-response {zz} {
}
}
+proc scan-response {zz} {
+ global sessionWait
+
+ set status [$zz scanStatus]
+ if {$status == 6} {
+ displayError "Scan fail" ""
+ set sessionWait -2
+ } else {
+ set sessionWait 1
+ }
+}
+
proc ok-response {} {
global sessionWait
set sessionWait 1
@@ -118,7 +130,7 @@ proc display-raw {zset no tno} {
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] == " "} {
@@ -128,6 +140,7 @@ proc display-raw {zset no tno} {
}
}
}
+ html ""
foreach field $fields {
set id [lindex $field 0]
set data [lindex $field 1]
@@ -155,7 +168,7 @@ proc put-marc-contents {cc} {
}
html $cc
if {$ref != ""} {
- html {">} $urltype { reference}
+ html {">} $cc {}
}
}
@@ -318,7 +331,7 @@ proc display-full {zset no tno} {
if {"x$url" != "x"} {
html "URL\n"
if {"x$sp" == "x"} {
- set sp reference
+ set sp $url
}
html {} [join $sp] "\n"
}
@@ -348,12 +361,30 @@ proc display-rec {from to dfunc tno} {
}
}
-proc build-query {t} {
+proc build-scan {t ilines} {
+ global targets
+
+ for {set i 1} {$i <= $ilines} {incr i} {
+ set term [wform entry$i]
+ if {$term != ""} {
+ set field [wform menu$i]
+ 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} {
+ for {set i 1} {$i <= $ilines} {incr i} {
set term [wform entry$i]
if {$term != ""} {
set field [wform menu$i]
@@ -378,6 +409,134 @@ proc build-query {t} {
return $q
}
+proc z39scan {setNo scanNo tno scanLines scanPos} {
+ global hist
+ 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)
+ }
+ if {[catch [list $zz failback fail-response]]} {
+ ir $zz
+ }
+ if {[catch [list set oldHost [$zz connect]]]} {
+ set oldHost ""
+ }
+ set zs $zz.s$scanNo.$setNo
+ $zz callback ok-response
+ $zz failback fail-response
+ if {$oldHost != $host} {
+ catch [list $zz disconnect]
+
+ set sessionWait 0
+ if {[catch [list $zz connect $host]]} {
+ displayError "Cannot connect to target" $host
+ return 0
+ } elseif {$sessionWait == 0} {
+ if {[catch {zwait sessionWait 300}]} {
+ $zz disconnect
+ displayError "Cannot connect to target" $host
+ return 0
+ }
+ if {$sessionWait != 1} {
+ displayError "Cannot connect to target" $host
+ return 0
+ }
+ }
+ $zz idAuthentication $idAuth
+ set sessionWait 0
+ if {[catch {$zz init}]} {
+ displayError "Cannot initialize target" $host
+ $zz disconnect
+ return 0
+ }
+ if {[catch {zwait sessionWait 60}]} {
+ displayError "Cannot initialize target" $host
+ $zz disconnect
+ return 0
+ }
+ if {$sessionWait != "1"} {
+ displayError "Cannot initialize target" $host
+ $zz disconnect
+ return 0
+ }
+ if {![$zz initResult]} {
+ set u [$zz userInformationField]
+ $zz disconnect
+ displayError "Cannot initialize target $host" $u
+ return 0
+ }
+ } else {
+ if {![catch [list $zs numberOfTermsRequested 5]]} {
+ return 1
+ }
+ }
+ eval $zz databaseNames $database
+
+ ir-scan $zs $zz
+
+ $zs numberOfTermsRequested $scanLines
+ $zs preferredPositionInResponse $scanPos
+
+ $zz callback [list scan-response $zs]
+
+ set sessionWait 0
+ $zs scan "${scanAttr} ${scanTerm}"
+
+ if {[catch {zwait sessionWait 600}]} {
+ wlog debug "timeout/cancel in scan"
+ displayError "Timeout in scan" {}
+ html "