X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=www%2Fz39util.tcl;h=36a28a1588133b7fc54bf8ff06cc06e48cb382a5;hb=8bafbc608e1ffba9ee87f4856e586dffa57901b8;hp=1d78f644c3ff8beea814e3dc0fa2a1dd534a4029;hpb=da4f027b1e7c0bf90efe6782a326448af164cd37;p=egate.git
diff --git a/www/z39util.tcl b/www/z39util.tcl
index 1d78f64..36a28a1 100644
--- a/www/z39util.tcl
+++ b/www/z39util.tcl
@@ -1,5 +1,5 @@
#
-# $Id: z39util.tcl,v 1.28 1996/01/29 17:31:48 adam Exp $
+# $Id: z39util.tcl,v 1.41 1996/03/14 11:50:51 adam Exp $
#
proc saveState {} {
uplevel #0 {
@@ -65,12 +65,10 @@ 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"} {
@@ -86,11 +84,29 @@ proc display-brief {zset no tno} {
return
}
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 author [$zset getMarc $no field 100 * a]
set corp [$zset getMarc $no field 110 * a]
@@ -104,9 +120,10 @@ proc display-brief {zset no tno} {
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 { }
+ html $sessionId {/showfull.egw/} $setNo + $targetNo + $no + full {">}
set p 0
foreach a $author {
if {$p} {
@@ -137,20 +154,32 @@ proc display-brief {zset no tno} {
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
- }
- }
+ 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]} {
+ 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]
@@ -158,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
@@ -287,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} {
@@ -391,31 +518,167 @@ 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"
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
}
}
@@ -443,21 +706,35 @@ proc build-query {t ilines} {
set q {}
for {set i 1} {$i <= $ilines} {incr i} {
set term [join [egw_form entry$i]]
- if {[string length $term] > 0} {
+ 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
+ And
{ set q "@and $q ${attr} \"${term}\"" }
- Or
+ Or
{ set q "@or $q ${attr} \"${term}\"" }
- {And not}
+ {And not}
{ set q "@not $q ${attr} \"${term}\"" }
- {}
+ {}
{ set q "${attr} \"${term}\"" }
}
set op [egw_form logic$i]
@@ -471,24 +748,14 @@ 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 ""
}
@@ -496,7 +763,7 @@ proc z39scan {setNo scanNo tno scanLines scanPos cache} {
$zz callback ok-response
$zz failback fail-response
set thisHost [splitHostSpec $host]
- if {$oldHost != $thisHost} {
+ if {[string compare $oldHost $thisHost]} {
catch [list $zz disconnect]
set sessionWait 0
@@ -578,12 +845,9 @@ proc display-scan {setNo scanNo tno} {
global targets
global env
global sessionId
+ global scriptQuery
- if {$tno > 0} {
- set zz z39$tno
- } else {
- set zz z39
- }
+ set zz z39$tno
set zs $zz.s$scanNo.$setNo
set m [$zs numberOfEntriesReturned]
@@ -601,7 +865,7 @@ proc display-scan {setNo scanNo tno} {
set hist($setNo,[expr $scanNo + 1],scanTerm) $t
}
}
- html {}
+ html {}
html {Scan term}
html { | Hits}
html { |
} \n
@@ -611,12 +875,12 @@ proc display-scan {setNo scanNo tno} {
if {0} {
regsub -all {\ } [lindex [$zs scanLine $i] 1] + tterm
html {}
} else {
regsub -all {\ } [lindex [$zs scanLine $i] 1] + tterm
html {}
}
html [lindex [$zs scanLine $i] 1]
@@ -633,29 +897,21 @@ proc z39search {setNo piggy tno elements} {
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)
- } 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 {[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 query $hist($setNo,$tno,query)
+ catch {set docId $hist($setNo,$tno,queryId)}
+
+ mkAssoc $zz $host
if {[catch [list set oldHost [$zz connect]]]} {
set oldHost ""
}
$zz callback ok-response
$zz failback fail-response
set thisHost [splitHostSpec $host]
- if {$oldHost != $thisHost} {
+ if {[string compare $oldHost $thisHost]} {
catch [list $zz disconnect]
set sessionWait 0
@@ -680,7 +936,7 @@ proc z39search {setNo piggy tno elements} {
$zz disconnect
return 0
}
- if {[catch {egw_wait sessionWait 60}]} {
+ if {$sessionWait == 0 && [catch {egw_wait sessionWait 60}]} {
displayError "Cannot initialize target" $thisHost
$zz disconnect
return 0
@@ -696,15 +952,19 @@ proc z39search {setNo piggy tno elements} {
displayError "Cannot initialize target $thisHost" $u
return 0
}
- } else {
- if {[info exists hist($setNo,hits)] && \
- ![catch [list $zz.$setNo smallSetUpperBound 0]]} {
+ } elseif {![catch [list $zz.$setNo smallSetUpperBound 0]]} {
+ if {[info exists hist($setNo,$tno,hits)]} {
return 1
}
-
}
- ir-set $zz.$setNo $zz
+ if {![string compare [lindex $targets($host) 1] WAIS]} {
+ wais-set $zz.$setNo $zz
+ } else {
+ ir-set $zz.$setNo $zz
+ $zz.$setNo preferredRecordSyntax [lindex $targets($host) 1]
+ egw_log debug "set syntax to [lindex $targets($host) 1]"
+ }
if {![lindex $targets($host) 5]} {
set elements {}
}
@@ -715,8 +975,6 @@ proc z39search {setNo piggy tno elements} {
egw_log debug "database=$database"
eval $zz.$setNo databaseNames $database
- $zz.$setNo preferredRecordSyntax USMARC
-
$zz callback [list search-response $zz.$setNo]
if {$piggy} {
$zz.$setNo largeSetLowerBound 999999
@@ -729,9 +987,14 @@ proc z39search {setNo piggy tno elements} {
}
set sessionWait 0
egw_log debug "search: $query"
- $zz.$setNo search $query
- if {[catch {egw_wait sessionWait 600}]} {
+ if {[info exists docId]} {
+ $zz.$setNo search $query $docId
+ } else {
+ $zz.$setNo search $query
+ }
+
+ if {!$sessionWait && [catch {egw_wait sessionWait 60}]} {
egw_log debug "timeout/cancel in search"
displayError "Timeout in search" {}
html "