X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fz39util.tcl;h=8740be44742c7b7eab30d3ea135425806e25fca6;hb=4938d0c2e8f4e1eec397c2bfbbc7e23fd150c369;hp=737ca46c040b82fc4b6ec19744f214524376d4ac;hpb=0d7108cd3425504a09522f915dda5c9158443084;p=egate.git
diff --git a/www/z39util.tcl b/www/z39util.tcl
index 737ca46..8740be4 100644
--- a/www/z39util.tcl
+++ b/www/z39util.tcl
@@ -1,5 +1,5 @@
#
-# $Id: z39util.tcl,v 1.21 1996/01/12 13:08:30 adam Exp $
+# $Id: z39util.tcl,v 1.36 1996/03/07 12:46:09 adam Exp $
#
proc saveState {} {
uplevel #0 {
@@ -65,12 +65,10 @@ proc fail-response {} {
set sessionWait -1
}
-proc display-brief {zset no tno} {
+proc display-brief {zset no setNo targetNo} {
global env
- global setNo
global sessionId
-
html {
}
set type [$zset type $no]
if {$type == "SD"} {
@@ -90,12 +88,31 @@ proc display-brief {zset no tno} {
html [join [$zset getSutrs $no]]
html "
\n"
return
- }
+ }
+ if {$rtype == "WAIS"} {
+ html { }
+ html [join [$zset getWAIS $no headline]]
+ html {}
+ html "
\n"
+ return
+ }
if {![catch {
set author [$zset getMarc $no field 100 * a]
- set title [lindex [$zset getMarc $no field 245 * a] 0]
- set year [lindex [$zset getMarc $no field 260 * c] 0]
- } ] } {
+ 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} {
@@ -104,17 +121,47 @@ proc display-brief {zset no tno} {
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 {}
- if {[string length $title] == 0} {
- html {No title}
- } else {
- html $title
+ set nope 1
+ foreach v $title {
+ html $v
+ set nope 0
}
- html {} " ${year} "
+ 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"
}
@@ -167,7 +214,7 @@ proc display-raw {zset no tno} {
}
html $data
}
- htmlr {
}
+ html "
\n"
}
}
@@ -256,7 +303,82 @@ proc dl-marc-field-rec {zset no tag lead start stop startid sep} {
}
}
-proc display-full {zset no tno} {
+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] {<}]} {
+ set data($element) $l
+ continue
+ }
+ switch -exact $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"
+ }
+ default {
+ set element junk
+ }
+ }
+ }
+ if {![info exists data(title)] || ![info exists data(linkage)]} {
+ html "" [join [$zset getWAIS $no text]] "\n"
+ return
+ }
+ html {Title: } {} $data(title) "
\n"
+ html {URL: } $data(linkage) "
\n"
+ html {Score: } [$zset getWAIS $no score] "
\n"
+ html {Lines: } [$zset getWAIS $no lines] "
\n"
+ if {[info exists data(bytes)]} {
+ html {Bytes: } $data(bytes) "
\n"
+ }
+ if {[info exists data(dateOfLastModification)]} {
+ html {Last modified: } $data(dateOfLastModification) "
\n"
+ }
+ if {[info exists data(lastChecked)]} {
+ html {Last checked: } $data(lastChecked) "
\n"
+ }
+ html {}
+ html {Similar WAIS record
}
+ html "\n"
+ for {set i 1} {[info exists data($i,linkage)]} {incr i} {
+ html {- }
+ html $data($i,title) "
\n"
+ html "URL: " $data($i,linkage)
+ }
+ html "
\n"
+}
+
+proc display-full {zset no setNo targetNo} {
set type [$zset type $no]
if {$type == "SD"} {
set err [lindex [$zset diag $no] 1]
@@ -274,7 +396,11 @@ proc display-full {zset no tno} {
if {$rtype == "SUTRS"} {
html [join [$zset getSutrs $no]] "
\n"
return
- }
+ }
+ if {$rtype == "WAIS"} {
+ display-full-wais $zset $no $setNo $targetNo
+ return
+ }
if {[catch {set r [$zset getMarc $no line * * *]}]} {
html "Unknown record type: $rtype
\n"
return
@@ -286,8 +412,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 "" ""
@@ -351,7 +486,7 @@ proc display-full {zset no tno} {
if {"x$sp" == "x"} {
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"
@@ -363,28 +498,19 @@ proc display-full {zset no tno} {
}
-proc display-rec {from to dfunc tno} {
- global setNo
-
- if {$tno > 0} {
- while {$from <= $to} {
- eval "$dfunc z39${tno}.${setNo} $from $tno"
- incr from
- }
- } else {
- while {$from <= $to} {
- eval "$dfunc z39.${setNo} $from 0"
- incr from
- }
+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 [wform entry$i]
+ set term [egw_form entry$i]
if {$term != ""} {
- set field [join [wform menu$i]]
+ set field [join [egw_form menu$i]]
set attr {Title}
foreach x [lindex $targets($t) 2] {
if {[lindex $x 0] == $field} {
@@ -402,9 +528,18 @@ proc build-query {t ilines} {
set op {}
set q {}
for {set i 1} {$i <= $ilines} {incr i} {
- set term [join [wform entry$i]]
+ set term [join [egw_form entry$i]]
+ if {[lindex $targets($t) 6] == "1"} {
+ if {[string length $op] == 0} {
+ set q $term
+ } else {
+ set q "$term $q"
+ }
+ set op [egw_form logic$i]
+ continue
+ }
if {[string length $term] > 0} {
- set field [join [wform menu$i]]
+ set field [join [egw_form menu$i]]
foreach x [lindex $targets($t) 2] {
if {[lindex $x 0] == $field} {
set attr [lindex $x 1]
@@ -412,15 +547,15 @@ 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
@@ -431,69 +566,60 @@ proc z39scan {setNo scanNo tno scanLines scanPos cache} {
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 {
@@ -510,11 +636,12 @@ proc z39scan {setNo scanNo tno scanLines scanPos cache} {
$zz callback [list scan-response $zs]
+ egw_log debug "scan: ${scanAttr} ${scanTerm}"
set sessionWait 0
$zs scan "${scanAttr} ${scanTerm}"
- if {[catch {zwait sessionWait 60}]} {
- wlog debug "timeout/cancel in scan"
+ if {[catch {egw_wait sessionWait 60}]} {
+ egw_log debug "timeout/cancel in scan"
displayError "Timeout in scan" {}
html "