X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=www%2Fz39util.tcl;h=8740be44742c7b7eab30d3ea135425806e25fca6;hb=4938d0c2e8f4e1eec397c2bfbbc7e23fd150c369;hp=cafca965a763321a9e917eb2f962efb6315caf36;hpb=3f5ac67b4a7152e27839a81a8e8e6e334b7e2695;p=egate.git
diff --git a/www/z39util.tcl b/www/z39util.tcl
index cafca96..8740be4 100644
--- a/www/z39util.tcl
+++ b/www/z39util.tcl
@@ -1,5 +1,5 @@
#
-# $Id: z39util.tcl,v 1.31 1996/02/20 16:07:39 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,7 +88,15 @@ 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 corp [$zset getMarc $no field 110 * a]
@@ -106,7 +112,7 @@ proc display-brief {zset no tno} {
set year [$zset getMarc $no field 260 * c]
} dispError ] } {
html { }
+ html $sessionId {/showfull.egw/} $setNo + $targetNo + $no + full {">}
set p 0
foreach a $author {
if {$p} {
@@ -152,7 +158,7 @@ proc display-brief {zset no tno} {
html { }
} else {
html { }
+ html $sessionId {/showfull.egw/} $setNo + $targetNo + $no + full {">}
html {No Title}
html { }
html "Error: " $dispError "\n"
@@ -297,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]
@@ -315,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
@@ -413,19 +498,10 @@ 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
}
}
@@ -453,6 +529,15 @@ proc build-query {t ilines} {
set q {}
for {set i 1} {$i <= $ilines} {incr 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 [egw_form menu$i]]
foreach x [lindex $targets($t) 2] {
@@ -481,24 +566,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 ""
}
@@ -506,7 +581,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
@@ -589,11 +664,7 @@ proc display-scan {setNo scanNo tno} {
global env
global sessionId
- 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]
@@ -626,7 +697,7 @@ proc display-scan {setNo scanNo tno} {
} else {
regsub -all {\ } [lindex [$zs scanLine $i] 1] + tterm
html {}
}
html [lindex [$zs scanLine $i] 1]
@@ -643,29 +714,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
@@ -690,7 +753,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
@@ -706,15 +769,23 @@ 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]]} {
- return 1
+ } elseif {![catch [list $zz.$setNo smallSetUpperBound 0]]} {
+ if {$tno > 0} {
+ if {[info exists hist($setNo,$tno,hits)]} {
+ return 1
+ }
+ } else {
+ if {[info exists hist($setNo,hits)]} {
+ return 1
+ }
}
-
}
- ir-set $zz.$setNo $zz
+ if {[lindex $targets($host) 6] == "1"} {
+ wais-set $zz.$setNo $zz
+ } else {
+ ir-set $zz.$setNo $zz
+ }
if {![lindex $targets($host) 5]} {
set elements {}
}
@@ -739,9 +810,14 @@ proc z39search {setNo piggy tno elements} {
}
set sessionWait 0
egw_log debug "search: $query"
- $zz.$setNo search $query
- if {[catch {egw_wait sessionWait 60}]} {
+ 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 "