X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;ds=sidebyside;f=www%2Fz39util.tcl;h=451fb70af4e1c44487b44c1c021747b187c2216c;hb=918a8257a2f64e0965abc4c48eea774949c19883;hp=406662ddf4e4270dc4c66789c934f37aae04bd82;hpb=09f416a26c1c7e35ead317106f985774ec0c97bd;p=egate.git
diff --git a/www/z39util.tcl b/www/z39util.tcl
index 406662d..451fb70 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.29 1996/01/31 15:56:37 adam Exp $
#
proc saveState {} {
uplevel #0 {
@@ -70,6 +70,8 @@ proc display-brief {zset no tno} {
global setNo
global sessionId
+
+ html {
}
set type [$zset type $no]
if {$type == "SD"} {
set err [lindex [$zset diag $no] 1]
@@ -83,7 +85,6 @@ 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]]
@@ -91,12 +92,60 @@ proc display-brief {zset no tno} {
return
}
if {![catch {
- set title [lindex [$zset getMarc $no field 245 * a] 0]
- set year [lindex [$zset getMarc $no field 260 * c] 0]
+ 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]
} ] } {
- html { } $title {} " ${year} "
+ 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
+ }
+ if {$nope} {
+ set v [join $cover ""]
+ if {[string length $v] > 40} {
+ html [string range $v 0 38] "..."
+ } else {
+ html $v
+ }
+ }
+ html { }
}
html "
\n"
}
@@ -149,7 +198,7 @@ proc display-raw {zset no tno} {
}
html $data
}
- htmlr {
}
+ html "
\n"
}
}
@@ -268,8 +317,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,7 +389,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"
}
@@ -361,20 +419,19 @@ proc display-rec {from to dfunc tno} {
}
}
-proc build-scan {t ilines} {
+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,9 +442,9 @@ 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]
+ set term [join [egw_form entry$i]]
+ if {[string length $term] > 0} {
+ set field [join [egw_form menu$i]]
foreach x [lindex $targets($t) 2] {
if {[lindex $x 0] == $field} {
set attr [lindex $x 1]
@@ -395,21 +452,21 @@ proc build-query {t ilines} {
}
switch $op {
And
- { set q "@and $q ${attr} ${term}" }
+ { set q "@and $q ${attr} \"${term}\"" }
Or
- { set q "@or $q ${attr} ${term}" }
+ { set q "@or $q ${attr} \"${term}\"" }
{And not}
- { set q "@not $q ${attr} ${term}" }
+ { set q "@not $q ${attr} \"${term}\"" }
{}
- { set q "${attr} ${term}" }
+ { set q "${attr} \"${term}\"" }
}
- set op [wform logic$i]
+ 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
@@ -438,49 +495,50 @@ proc z39scan {setNo scanNo tno scanLines scanPos} {
set zs $zz.s$scanNo.$setNo
$zz callback ok-response
$zz failback fail-response
- if {$oldHost != $host} {
+ set thisHost [splitHostSpec $host]
+ if {$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 +551,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 "