X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fz39util.tcl;h=8aa211841379d96488b96fd8da9fd2b42e1f4bca;hb=3acf7ded1eac12a1027c9e9ec379d41f930fb85b;hp=406662ddf4e4270dc4c66789c934f37aae04bd82;hpb=09f416a26c1c7e35ead317106f985774ec0c97bd;p=egate.git
diff --git a/www/z39util.tcl b/www/z39util.tcl
index 406662d..8aa2118 100644
--- a/www/z39util.tcl
+++ b/www/z39util.tcl
@@ -1,5 +1,5 @@
#
-# $Id: z39util.tcl,v 1.13 1995/12/21 15:49:53 adam Exp $
+# $Id: z39util.tcl,v 1.48 1997/02/24 10:05:20 adam Exp $
#
proc saveState {} {
uplevel #0 {
@@ -65,13 +65,13 @@ 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
set type [$zset type $no]
if {$type == "SD"} {
+ html {
}
set err [lindex [$zset diag $no] 1]
set add [lindex [$zset diag $no] 2]
if {$add != {}} {
@@ -83,44 +83,211 @@ proc display-brief {zset no tno} {
if {$type != "DB"} {
return
}
- html "${no}"
+ html {}
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
+ }
+ }
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
+
set type [$zset type $no]
if {$type == "SD"} {
+ html {}
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"
+ html "${no} Error ${err}${add}
\n"
return
}
if {$type != "DB"} {
return
}
+ html {}
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
+ }
+ }
+ 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
+ }
+ }
if {[catch {set r [$zset getMarc $no line * * *]}]} {
html "Unknown record type: $rtype
\n"
return
@@ -149,7 +316,7 @@ proc display-raw {zset no tno} {
}
html $data
}
- htmlr {
}
+ html "
\n"
}
}
@@ -238,29 +405,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} {
@@ -268,8 +417,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 "" ""
@@ -331,50 +489,73 @@ 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-rec {from to dfunc tno} {
- global setNo
-
- if {$tno > 0} {
- while {$from <= $to} {
- eval "$dfunc z39${tno}.${setNo} $from $tno"
- incr from
+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
}
- } else {
- while {$from <= $to} {
- eval "$dfunc z39.${setNo} $from 0"
- incr from
+ DB {
+ }
+ default {
+ return
}
}
+ set rtype [$zset recordType $no]
+ switch $rtype {
+ SUTRS {
+ html "" [join [$zset getSutrs $no]] "
\n"
+ return
+ }
+ }
+ if {[catch {set r [$zset getMarc $no line * * *]}]} {
+ html "Unknown record type: $rtype
\n"
+ return
+ }
+ display-full-marc $zset $no $setNo $targetNo
}
-proc build-scan {t ilines} {
+
+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
- 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]
- }
+ 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 [list $term $attr]
}
return ""
}
@@ -385,102 +566,98 @@ proc build-query {t ilines} {
set op {}
set q {}
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]
- }
+ set term [join [egw_form entry$i]]
+ if {[string length $term] == 0} continue
+ set field [join [egw_form menu$i]]
+ catch {unset attr}
+ foreach x [lindex $targets($t) 2] {
+ if {![string compare [lindex $x 0] $field]} {
+ set attr [lindex $x 1]
}
- switch $op {
+ }
+ if {![info exists attr]} {
+ egw_log debug "attr failed for $t"
+ set attr [lindex [lindex [lindex $targets($t) 2] 0] 1]
+ }
+ egw_log debug "op=${op}"
+ switch $op {
And
- { set q "@and $q ${attr} ${term}" }
+ { set q "@and $q ${attr} \"${term}\""; egw_log debug AND }
Or
- { set q "@or $q ${attr} ${term}" }
- {And not}
- { set q "@not $q ${attr} ${term}" }
+ { set q "@or $q ${attr} \"${term}\""; egw_log debug OR }
{}
- { set q "${attr} ${term}" }
- }
- set op [wform logic$i]
+ { set q "${attr} \"${term}\""; egw_log debug NOPE }
+ default
+ { set q "@not $q ${attr} \"${term}\""; egw_log debug ANDNOT }
}
+ set op [egw_form logic$i]
}
return $q
}
-proc z39scan {setNo scanNo tno scanLines scanPos} {
+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 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
- }
+ 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
- if {$oldHost != $host} {
+ set thisHost [splitHostSpec $host]
+ if {[string compare $oldHost $thisHost]} {
catch [list $zz disconnect]
set sessionWait 0
- if {[catch [list $zz connect $host]]} {
- displayError "Cannot connect to target" $host
+ if {[catch [list $zz connect $thisHost]]} {
+ displayError "Cannot connect to target" $thisHost
return 0
} elseif {$sessionWait == 0} {
- if {[catch {zwait sessionWait 300}]} {
+ if {[catch {egw_wait sessionWait 300}]} {
$zz disconnect
- displayError "Cannot connect to target" $host
+ displayError "Cannot connect to target" $thisHost
return 0
}
if {$sessionWait != 1} {
- displayError "Cannot connect to target" $host
+ displayError "Cannot connect to target" $thisHost
return 0
}
}
$zz idAuthentication $idAuth
set sessionWait 0
if {[catch {$zz init}]} {
- displayError "Cannot initialize target" $host
+ displayError "Cannot initialize target" $thisHost
$zz disconnect
return 0
}
- if {[catch {zwait sessionWait 60}]} {
- displayError "Cannot initialize target" $host
+ if {[catch {egw_wait sessionWait 60}]} {
+ displayError "Cannot initialize target" $thisHost
$zz disconnect
return 0
}
if {$sessionWait != "1"} {
- displayError "Cannot initialize target" $host
+ displayError "Cannot initialize target" $thisHost
$zz disconnect
return 0
}
if {![$zz initResult]} {
set u [$zz userInformationField]
$zz disconnect
- displayError "Cannot initialize target $host" $u
+ displayError "Cannot initialize target $thisHost" $u
return 0
}
} else {
- if {![catch [list $zs numberOfTermsRequested 5]]} {
+ if {$cache && ![catch [list $zs numberOfTermsRequested 5]]} {
return 1
}
}
@@ -493,11 +670,12 @@ proc z39scan {setNo scanNo tno scanLines scanPos} {
$zz callback [list scan-response $zs]
+ egw_log debug "scan: ${scanAttr} ${scanTerm}"
set sessionWait 0
$zs scan "${scanAttr} ${scanTerm}"
- if {[catch {zwait sessionWait 600}]} {
- wlog debug "timeout/cancel in scan"
+ if {[catch {egw_wait sessionWait 60}]} {
+ egw_log debug "timeout/cancel in scan"
displayError "Timeout in scan" {}
html "