X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fz39util.tcl;h=e893729abc915627c0f1986a332e30921eef6c7e;hb=ed480f4a8f1c83bc5ba9b2afb1407b5df7f84611;hp=476673bdf92746e6611538926dc1ebeeee7f6fd1;hpb=7bdfdfe5fd17c547d0332b4f9fc0b3f997e790ed;p=egate.git
diff --git a/www/z39util.tcl b/www/z39util.tcl
index 476673b..e893729 100644
--- a/www/z39util.tcl
+++ b/www/z39util.tcl
@@ -1,5 +1,5 @@
#
-# $Id: z39util.tcl,v 1.9 1995/11/13 18:17:48 adam Exp $
+# $Id: z39util.tcl,v 1.43 1996/03/26 16:27:03 adam Exp $
#
proc saveState {} {
uplevel #0 {
@@ -26,12 +26,12 @@ proc saveState {} {
}
}
-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]
@@ -43,6 +43,18 @@ proc search-response {sno} {
}
}
+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
@@ -53,11 +65,11 @@ proc fail-response {} {
set sessionWait -1
}
-proc display-brief {zset no tno} {
+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]
@@ -71,25 +83,103 @@ proc display-brief {zset no tno} {
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 {} " ${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] == 1} {
+ html "; Score " $nscore
+ }
+ } else {
+ html { }
+ html {No Title}
+ html { }
+ html "Error: " $dispError "\n"
}
html "
\n"
}
-proc display-raw {zset no tno} {
+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]
@@ -97,18 +187,134 @@ proc display-raw {zset no tno} {
if {$add != {}} {
set add " :${add}"
}
- html "${no}
\n"
- html "Error ${err}${add}
\n"
+ html "${no} Error ${err}${add}
\n"
return
}
if {$type != "DB"} {
return
}
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
@@ -118,7 +324,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 +334,7 @@ proc display-raw {zset no tno} {
}
}
}
+ html ""
foreach field $fields {
set id [lindex $field 0]
set data [lindex $field 1]
@@ -136,7 +343,7 @@ proc display-raw {zset no tno} {
}
html $data
}
- htmlr {
}
+ html "
\n"
}
}
@@ -155,7 +362,7 @@ proc put-marc-contents {cc} {
}
html $cc
if {$ref != ""} {
- html {">} $urltype { reference}
+ html {">} $cc {}
}
}
@@ -225,29 +432,11 @@ proc dl-marc-field-rec {zset no tag lead start stop startid sep} {
}
}
-proc display-full {zset no tno} {
- set type [$zset type $no]
- if {$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
- }
- if {$type != "DB"} {
- return
- }
- set rtype [$zset recordType $no]
- if {$rtype == "SUTRS"} {
- html [join [$zset getSutrs $no]] "
\n"
- return
- }
- if {[catch {set r [$zset getMarc $no line * * *]}]} {
- html "Unknown record type: $rtype
\n"
- return
- }
+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} {
@@ -255,8 +444,17 @@ proc display-full {zset no tno} {
}
set n [dl-marc-field $zset $no 710 a "Corporate Name" {} ", "]
if {$n == 0} {
- set n [dl-marc-field $zset $no 710 a "Corporate Name" {} ", "]
+ 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 "" ""
@@ -318,140 +516,466 @@ 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"
+ 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
-proc display-rec {from to dfunc tno} {
- global setNo
-
- if {$tno > 0} {
- while {$from <= $to} {
- eval "$dfunc z39${tno}.${setNo} $from $tno"
- incr from
+ 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 {
- while {$from <= $to} {
- eval "$dfunc z39.${setNo} $from 0"
- incr from
+ 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 setNo targetNo} {
+ while {$from <= $to} {
+ eval "$dfunc z39${targetNo}.${setNo} $from $setNo $targetNo"
+ incr from
+ }
+}
+
+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} {
+proc build-query {t ilines} {
global targets
set op {}
set q {}
- for {set i 1} {$i < 4} {incr i} {
- set term [wform entry$i]
- 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 tno elements} {
+proc z39scan {setNo scanNo tno scanLines scanPos cache} {
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 query $hist($setNo,$tno,query)
+ 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 ""
+ }
+ 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]
+
+ set sessionWait 0
+ if {[catch [list $zz connect $thisHost]]} {
+ displayError "Cannot connect to target" $thisHost
+ return 0
+ } elseif {$sessionWait == 0} {
+ if {[catch {egw_wait sessionWait 300}]} {
+ $zz disconnect
+ displayError "Cannot connect to target" $thisHost
+ return 0
+ }
+ if {$sessionWait != 1} {
+ displayError "Cannot connect to target" $thisHost
+ return 0
+ }
+ }
+ $zz idAuthentication $idAuth
+ set sessionWait 0
+ 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
+ }
+ if {$sessionWait != "1"} {
+ 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 {
- set zz z39
- set host $hist($setNo,host)
- set idAuth $hist($setNo,idAuthentication)
- set database $hist($setNo,database)
- set query $hist($setNo,query)
+ if {$cache && ![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]
+
+ egw_log debug "scan: ${scanAttr} ${scanTerm}"
+ set sessionWait 0
+ $zs scan "${scanAttr} ${scanTerm}"
+
+ if {[catch {egw_wait sessionWait 60}]} {
+ egw_log debug "timeout/cancel in scan"
+ displayError "Timeout in scan" {}
+ html "