{
+ 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
}
}
@@ -542,30 +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 {[lindex $targets($t) 6] == "1"} {
- if {[string length $op] == 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
- }
- if {[string length $term] > 0} {
+ } 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]
@@ -579,21 +748,13 @@ 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)
- }
+ 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 ""
@@ -684,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]
@@ -717,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]
@@ -739,19 +897,13 @@ 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)
- }
+ 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 ""
@@ -801,21 +953,17 @@ proc z39search {setNo piggy tno elements} {
return 0
}
} 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
- }
+ if {[info exists hist($setNo,$tno,hits)]} {
+ return 1
}
}
- if {[lindex $targets($host) 6] == "1"} {
+ 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 {}
@@ -827,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
@@ -841,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 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 "