X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fz39util.tcl;h=36a28a1588133b7fc54bf8ff06cc06e48cb382a5;hb=8bafbc608e1ffba9ee87f4856e586dffa57901b8;hp=bfa560845c37b69475f5c6238558e0bec46a798c;hpb=e406f6fe976eeae769f193a9d48938d903c02543;p=egate.git

diff --git a/www/z39util.tcl b/www/z39util.tcl
index bfa5608..36a28a1 100644
--- a/www/z39util.tcl
+++ b/www/z39util.tcl
@@ -1,5 +1,5 @@
 #
-# $Id: z39util.tcl,v 1.37 1996/03/08 16:47:08 adam Exp $
+# $Id: z39util.tcl,v 1.41 1996/03/14 11:50:51 adam Exp $
 #
 proc saveState {} {
     uplevel #0 {
@@ -65,7 +65,7 @@ proc fail-response {} {
     set sessionWait -1
 }
 
-proc display-brief {zset no setNo targetNo} {
+proc display-medium {zset no setNo targetNo} {
     global env
     global sessionId
 
@@ -84,21 +84,136 @@ proc display-brief {zset no setNo targetNo} {
         return
     }
     set rtype [$zset recordType $no]
-    if {$rtype == "SUTRS"} {
+    switch $rtype {
+        SUTRS {
+            html { <a href="http:} $env(SCRIPT_NAME) / $sessionId
+            html {/showfull.egw/} $setNo + $targetNo + $no + full {">}
+            html [join [$zset getSutrs $no]]
+            html "</a><br>\n"
+            return
+        }
+        WAIS {
+            html { <a href="http:} $env(SCRIPT_NAME) / $sessionId
+            html {/showfull.egw/} $setNo + $targetNo + $no + full {">}
+            html [join [$zset getWAIS $no headline]]
+            html {</a>}
+            html "<br>\n"
+            html {Score: } [$zset getWAIS $no score]
+            set lines [$zset getWAIS $no lines]
+            if {$lines > 0} {
+                html {, } $lines { lines}
+            }
+            html "<br>\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]
+        set score [$zset getMarc $no field 999 * r]
+    } dispError ] } {
         html { <a href="http:} $env(SCRIPT_NAME) /
         html $sessionId {/showfull.egw/} $setNo + $targetNo + $no + full {">}
-        html [join [$zset getSutrs $no]]
-        html "</a><br>\n"
-        return
-    }
-    if {$rtype == "WAIS"} {
+        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
+        }
+        set v [join $cover ""]
+        if {[string length $v] > 0} {
+            set nope 0
+            html $v
+        } elseif {$nope} {
+            html "No Title"
+        }
+        html {</a> }
+        if {[scan $score %d nscore]} {
+            html "; Score " $nscore
+        }
+    } else {
         html { <a href="http:} $env(SCRIPT_NAME) /
         html $sessionId {/showfull.egw/} $setNo + $targetNo + $no + full {">}
-        html [join [$zset getWAIS $no headline]]
-        html {</a>}
-        html "<br>\n"
+        html {No Title}
+        html {</a> }
+        html "Error: " $dispError "\n"
+    }
+    html "<br>\n"
+}
+
+proc display-brief {zset no setNo targetNo} {
+    global env
+    global sessionId
+
+    html {<li>}
+    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 "${no} Error ${err}${add} <br>\n"
+        return
+    }
+    if {$type != "DB"} {
         return
     }
+    set rtype [$zset recordType $no]
+    switch $rtype {
+        SUTRS {
+            html { <a href="http:} $env(SCRIPT_NAME) / $sessionId
+            html {/showfull.egw/} $setNo + $targetNo + $no + full {">}
+            html [string range [join [$zset getSutrs $no]] 0 70]
+            html "</a><br>\n"
+            return
+        }
+        WAIS {
+            html { <a href="http:} $env(SCRIPT_NAME) / $sessionId
+            html {/showfull.egw/} $setNo + $targetNo + $no + full {">}
+            html [string range [join [$zset getWAIS $no headline]] 0 70]
+            
+            html {</a>}
+            set score [$zset getWAIS $no score]
+            html { Score } $score
+            html "<br>\n"
+            return
+        }
+    }
     if {![catch {
         set author [$zset getMarc $no field 100 * a]
         set corp [$zset getMarc $no field 110 * a]
@@ -140,11 +255,13 @@ proc display-brief {zset no setNo targetNo} {
         if {$p} {
             html ": "
         }
+        html {<it>}
 	set nope 1
         foreach v $title {
             html $v
             set nope 0
         }
+        html {</it>}
         if {$nope} {
             set v [join $cover ""]
             if {[string length $v] > 40} {
@@ -168,26 +285,36 @@ proc display-brief {zset no setNo targetNo} {
     html "<br>\n"
 }
 
-proc display-raw {zset no tno} {
+proc display-raw {zset no setNo targetNo} {
     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}"
+    switch $type {
+        SD {
+            set err [lindex [$zset diag $no] 1]
+            set add [lindex [$zset diag $no] 2]
+            if {$add != {}} {
+                set add " :${add}"
+            }
+            html "<h3>${no}</h3>\n"
+            html "Error ${err}${add} <br>\n"
+            return
+        }
+        DB {
+        }
+        default {
+            return
         }
-        html "<h3>${no}</h3>\n"
-        html "Error ${err}${add} <br>\n"
-        return
-    }
-    if {$type != "DB"} {
-        return
     }
     set rtype [$zset recordType $no]
-    if {$rtype == "SUTRS"} {
-        html [join [$zset getSutrs $no]] "<br>\n"
-        return
-    } 
+    switch $rtype {
+        SUTRS {
+            html "<xmp>\n" [join [$zset getSutrs $no]] "\n</xmp>\n"
+            return
+        } 
+        WAIS {
+            html "<xmp>\n" [join [$zset getWAIS $no text]] "\n</xmp>\n"
+            return
+        }
+    }
     if {[catch {set r [$zset getMarc $no line * * *]}]} {
         html "Unknown record type: $rtype <br>\n"
         return
@@ -305,110 +432,11 @@ proc dl-marc-field-rec {zset no tag lead start stop startid sep} {
     }
 }
 
-proc display-full-wais {zset no setNo targetNo} {
+proc display-full-marc {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 {
-            <ti> {
-                set element title 
-            }
-            <dm> {
-                set element dateOfLastModification
-            }
-            <ci> {
-                set element controlIdentifier
-            }
-            <lc> {
-                set element lastChecked
-            }
-            <by> {
-                set element bytes
-            }
-            <avli> {
-                set element linkage
-            }
-            <cr> {
-                incr i
-            }
-            <li> {
-                set element "$i,linkage"
-            }
-            <cp> {
-                set element "$i,title"
-            }
-            default {
-                set element junk
-            }
-        }
-    }
-    if {![info exists data(title)] || ![info exists data(linkage)]} {
-        html "<pre>" [join [$zset getWAIS $no text]] "\n</pre>\n"
-        return
-    }
-    html {Title: } {<a href="} $data(linkage) {">} $data(title) "</a><br>\n"
-    html {URL: } $data(linkage) "<br>\n"
-    html {Score: } [$zset getWAIS $no score] "<br>\n"
-    html {Lines: } [$zset getWAIS $no lines] "<br>\n"
-    if {[info exists data(bytes)]} {
-        html {Bytes: } $data(bytes) "<br>\n"
-    }
-    if {[info exists data(dateOfLastModification)]} {
-        html {Last modified: } $data(dateOfLastModification) "<br>\n"
-    }
-    if {[info exists data(lastChecked)]} {
-        html {Last checked: } $data(lastChecked) "<br>\n"
-    }
-    html {<a href="} $env(SCRIPT_NAME) / $sessionId {/sameas.egw/}
-    html $setNo + $targetNo + 1 + $hist($setNo,maxPresent) +
-    html [egw_enc [$zset getWAIS $no documentID]] {">}
-    html {Similar WAIS record</a><br>}
-    html "<ul>\n"
-    for {set i 1} {[info exists data($i,linkage)]} {incr i} {
-        html {<li><a href="} $data($i,linkage) {">}
-        html $data($i,title) "</a><br>\n"
-        html "URL: " $data($i,linkage)
-    }
-    html "</ul>\n"
-}
-
-proc display-full {zset no setNo targetNo} {
-    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} <br>\n"
-        return
-    }
-    if {$type != "DB"} {
-        return
-    }
-    set rtype [$zset recordType $no]
-    if {$rtype == "SUTRS"} {
-        html "<pre>"
-        html [join [$zset getSutrs $no]]
-        html "</pre><br>\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 <br>\n"
-        return
-    }
     html "<dl>\n"
     set n [dl-marc-field $zset $no 700 a "Author" "Authors" "<br>\n"]
     if {$n == 0} {
@@ -497,10 +525,155 @@ proc display-full {zset no setNo targetNo} {
     dl-marc-field $zset $no 537 * "Source of data" {} "<br>\n"
     dl-marc-field $zset $no 538 * "System details" {} "<br>\n"
     dl-marc-field $zset $no 787 {[rstw6]} "Related information" {} "<br>\n"
+    dl-marc-field $zset $no 999 r "Score" {} ", "
     dl-marc-field $zset $no 001 * "Local control number" {} ", "
     html "</dl>\n"
 }
 
+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] {<}]} {
+            if {[info exist data($element)]} {
+                set data($element) $data($element)$l
+            } else {
+                set data($element) $l
+            }
+            continue
+        }
+        switch -- $l {
+            <ti> {
+                set element title 
+            }
+            <dm> {
+                set element dateOfLastModification
+            }
+            <ci> {
+                set element controlIdentifier
+            }
+            <lc> {
+                set element lastChecked
+            }
+            <by> {
+                set element bytes
+            }
+            <avli> {
+                set element linkage
+            }
+            <cr> {
+                incr i
+            }
+            <li> {
+                set element "$i,linkage"
+            }
+            <cp> {
+                set element "$i,title"
+            }
+            <ip> {
+                set element ip
+            }
+            default {
+                set element junk
+            }
+        }
+    }
+    if {![info exists data(title)] || ![info exists data(linkage)]} {
+        set nwi 0
+    } else {
+        set nwi 1
+    }
+    html "<dl>\n"
+    html {<dt><b>Title</b>}
+    if {$nwi} {
+        html {<dd><a href="} $data(linkage) {">} $data(title) "</a>"
+        html {<dt><b>URL</b>}
+        html {<dd>} $data(linkage) "<br>\n"
+    } else {
+        html {<dd>} [join [$zset getWAIS $no headline]]
+    }
+    html {<dt><b>Score</b><dd>} [$zset getWAIS $no score]
+    set lines [$zset getWAIS $no lines]
+    if {$lines > 0} {
+        html {<dt><b>Lines</b><dd>} $lines "<br>\n"
+    }
+    if {!$nwi} {
+        html "</dl><pre>\n" [join [$zset getWAIS $no text]] "\n</pre>\n"
+        return
+    }
+    if {[info exists data(bytes)]} {
+        html {<dt><b>Bytes</b><dd>} $data(bytes)
+    }
+    if {[info exists data(dateOfLastModification)]} {
+        html {<dt><b>Last modified</b><dd>} $data(dateOfLastModification)
+    }
+    if {[info exists data(lastChecked)]} {
+        html {<dt><b>Last checked</b><dd>} $data(lastChecked) "<br>\n"
+    }
+    if {[info exists data(ip)]} {
+        html {<dt><b>Initial text</b><dd>} $data(ip) "<br>\n"
+    }
+    if {0} {
+        html {<a href="} $env(SCRIPT_NAME) / $sessionId {/sameas.egw/}
+        html $setNo + $targetNo + 1 + $hist($setNo,maxPresent) +
+        html [egw_enc [$zset getWAIS $no documentID]] {">}
+        html {Similar WAIS record</a><br>}
+    }
+    if {[info exists data($i,linkage)]} {
+        html "<dt><b>References</b>\n"
+    }
+    for {set i 1} {[info exists data($i,linkage)]} {incr i} {
+        html {<dd><a href="} $data($i,linkage) {">}
+        if {[info exists data($i,title)]} {
+            html $data($i,title)
+        } else {
+            html Untitled
+        }
+        html "</a><br>\n"
+    }
+    html "</dl>\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} <br>\n"
+            return
+        }
+        DB {
+        }
+        default {
+            return
+        }
+    }
+    set rtype [$zset recordType $no]
+    switch $rtype {
+        SUTRS {
+            html "<pre>" [join [$zset getSutrs $no]] "</pre><br>\n"
+            return
+        }
+        WAIS {
+            display-full-wais $zset $no $setNo $targetNo
+            return
+        }
+    }
+    if {[catch {set r [$zset getMarc $no line * * *]}]} {
+        html "Unknown record type: $rtype <br>\n"
+        return
+    }
+    display-full-marc $zset $no $setNo $targetNo
+}
+
 
 proc display-rec {from to dfunc setNo targetNo} {
     while {$from <= $to} { 
@@ -533,16 +706,16 @@ 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} continue
         if {![string compare [lindex $targets($t) 1] WAIS]} {
-            if {[string length $op] == 0} {
+            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] {
@@ -555,13 +728,13 @@ proc build-query {t ilines} {
                 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]
@@ -672,6 +845,7 @@ proc display-scan {setNo scanNo tno} {
     global targets
     global env
     global sessionId
+    global scriptQuery
 
     set zz z39$tno
     set zs $zz.s$scanNo.$setNo
@@ -701,7 +875,7 @@ proc display-scan {setNo scanNo tno} {
         if {0} {
             regsub -all {\ } [lindex [$zs scanLine $i] 1] + tterm
             html {<a href="http:} $env(SCRIPT_NAME)
-            html / $sessionId {/query.egw/} $hist($setNo,host) + $setNo +
+            html / $sessionId / $scriptQuery {;/} $setNo + $hist($setNo,host) +
             html $hist($setNo,scan) +  $tterm {">}
         } else {
             regsub -all {\ } [lindex [$zs scanLine $i] 1] + tterm
@@ -779,14 +953,8 @@ 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
         }
     }
     
@@ -842,7 +1010,7 @@ proc z39search {setNo piggy tno elements} {
     if {$sessionWait != 1} {
 	return 0
     }
-    set hist($setNo,hits) [$zz.$setNo resultCount]
+    set hist($setNo,$tno,hits) [$zz.$setNo resultCount]
     return 1
 }
 
@@ -1021,8 +1189,12 @@ proc z39msearch {setNo elements start number cache} {
             }
             set zstatus($i) 1
             incr zleft
-            egw_log debug "setNo=$setNo msearch " $hist($setNo,$i,query)
-            z39$i.$setNo search $hist($setNo,$i,query)
+            egw_log debug "msearch host=" $hist($setNo,$i,host)
+            egw_log debug "setNo=$setNo query=" $hist($setNo,$i,query) "="
+            if {[catch {z39$i.$setNo search $hist($setNo,$i,query)}]} {
+                set zstatus($i) -1
+                incr zleft -1
+            }
         } elseif {[z39$i.$setNo resultCount] >= $start} {
             if {[expr $start + $number - 1] > [z39$i.$setNo resultCount]} {
                 set tnumber [expr [z39$i.$setNo resultCount] - $start + 1]
@@ -1142,19 +1314,25 @@ proc buttons-result-set-s {setNo targetNo setMax startPos after} {
 
     set zz z39$targetNo
     html "<p>\n"
-    button-europagate
+    button-main
     if {$setMax > 0 && $setMax < [$zz.$setNo resultCount]} {
+        if {!$useIcons} {
+            html "\n | "
+        }
         html {<a href="http:} $env(SCRIPT_NAME)
         html / $sessionId {/search.egw/} $setNo + $targetNo + 
         html [expr $setMax + 1] + [expr $setMax + $hist($setNo,maxPresent)]
         if {$useIcons} {
-            html {"><img src="/egwgif/button-next-records.gif" alt="Next Records"}
-	    html { border=0></a>}
+            html {"><img src="/egwgif/button-next-records.gif" }
+            html {alt="Next Records" border=0></a>}
         } else {
-            html {">Next Records</a>} " | \n"
+            html {">Next Records</a>}
         }
     }
     if {$setMax > 0 && $startPos != "" && $startPos != "1"} {
+        if {!$useIcons} {
+            html "\n | "
+        }
         html {<a href="http:} $env(SCRIPT_NAME)
         html / $sessionId {/search.egw/} $setNo + $targetNo
         html + [expr $startPos - $hist($setNo,maxPresent)]
@@ -1163,16 +1341,23 @@ proc buttons-result-set-s {setNo targetNo setMax startPos after} {
             html {"><img src="/egwgif/button-previous-records.gif" }
 	    html {alt="Previous Records" border=0></a>}
         } else {
-            html {">Previous Records</a>} " | \n"
+            html {">Previous Records</a>} 
         }
     }
-    button-new-query 1 $setNo
-    button-new-target 1
-    button-view-history 0
+    if {$targetNo > 0} {
+        button-result-set $setNo $targetNo
+    }
+    button-new-query $setNo
+    button-new-target
+    button-view-history
 
     html "<p>\n"
 }
 
+proc score-sort {l r} {
+    return [expr [lindex $r 0] - [lindex $l 0]]
+}
+
 proc display-result-set-m-score {setNo} {
     global hist
     global useIcons
@@ -1181,23 +1366,51 @@ proc display-result-set-m-score {setNo} {
 
     set not $hist($setNo,0,host)
     for {set i 1} {$i <= $not} {incr i} {
-        if {[lindex $status 0] != "DBOSD"} continue
-        
-        if {$hist($setNo,$i,offset) > $hist($setNo,maxPresent)} {
-            set nor $hist($setNo,$i,maxPresent)
-        } else {
-            set nor $hist($setNo,$i,offset)
-        }
-        for {set j 1} {$j < $not} {incr j} {
-            if {![string compare [z39$i.$setNo recordType] WAIS]} {
-                lappend scoreArray [list \
-                        [z39$i.$setNo getWAIS $j score] $i $setNo $j]
+        if {$zstatus($i) != 2} continue
+        set status [z39$i.$setNo responseStatus]
+        if {[lindex $status 0] != "DBOSD"} continue        
+        set nor $hist($setNo,$i,offset)
+        for {set j 1} {$j <= $nor} {incr j} {
+            if {![string compare [z39$i.$setNo recordType $j] WAIS]} {
+                set score [z39$i.$setNo getWAIS $j score]
+            } elseif {![string compare [z39$i.$setNo recordType $j] USmarc]} {
+                set score [z39$i.$setNo getMarc $j field 999 * r]
+                if {[scan $score %d score] != 1} {
+                    set score 10
+                }
             } else {
-                lappend scoreArray [list 0 $i $setNo $j]
+                set score 10
+            }
+            if {$score > 0} {
+                lappend scoreArray [list $score $i $j]
             }
         }
     }
-    html "score merge<br>"
+    if {![info exists scoreArray]} {
+        html "<br><h3>Search produced no result</h3><br>\n"
+    } else {
+        html "<ul>\n"
+        set scoreSorted [lsort -command score-sort $scoreArray]
+        foreach r $scoreSorted {
+            set i [lindex $r 1]
+            set j [lindex $r 2]
+            display-$hist($setNo,format) z39$i.$setNo $j $setNo $i
+        }
+        html "<br></ul>\n"
+    }
+    for {set i 1} {$i <= $not} {incr i} {
+        if {$zstatus($i) != 2} continue
+        set status [z39$i.$setNo responseStatus]
+        if {[lindex $status 0] == "NSD"} {
+            z39$i.$setNo nextResultSetPosition 0
+            set code [lindex $status 1]
+            set msg [lindex $status 2]
+            set addinfo [lindex $status 3]
+            html {<dt>} [lindex $targets($hist($setNo,$i,host)) 0] 
+            html "<dd>Error: $msg: $addinfo (code $code)<br>\n"
+        }
+    }
+    html "\n<br>"
 }
 
 proc display-result-set-m-server {setNo} {
@@ -1205,31 +1418,35 @@ proc display-result-set-m-server {setNo} {
     global useIcons
     global zstatus
     global targets
+    global env
+    global sessionId
 
     set not $hist($setNo,0,host)
     html "<dl>\n"
     for {set i 1} {$i <= $not} {incr i} {
         if {$zstatus($i) != 2} continue
-        html "<dt><h3>" [lindex $targets($hist($setNo,$i,host)) 0] ": "
         set status [z39$i.$setNo responseStatus]
         if {[lindex $status 0] == "NSD"} {
+            html "<dt><h3>" [lindex $targets($hist($setNo,$i,host)) 0] ": "
             z39$i.$setNo nextResultSetPosition 0
             set code [lindex $status 1]
             set msg [lindex $status 2]
             set addinfo [lindex $status 3]
             html "Error</h3>\n<dd>NSD$code: $msg: $addinfo"
         } else {
+            html {<dt><a href="http:} $env(SCRIPT_NAME)
+            html / $sessionId {/search.egw/} $setNo + $i + 1
+            html + $hist($setNo,maxPresent) {">}
+            html "<h3>" [lindex $targets($hist($setNo,$i,host)) 0] "</a>: "
             set r [z39$i.$setNo resultCount]
-            html "$r hits</h3>\n<dd>\n<ul>\n"
+            html "$r hits</h3>\n<dd>\n"
             
             if {$hist($setNo,$i,offset) > $hist($setNo,maxPresent)} {
-                display-rec 1 $hist($setNo,maxPresent) \
-                        display-brief $setNo $i
+                set nor $hist($setNo,maxPresent)
             } else {
-                display-rec 1 $hist($setNo,$i,offset) \
-                        display-brief $setNo $i
+                set nor $hist($setNo,$i,offset)
             }
-            html "</ul>"
+            display-rec 1 $nor display-$hist($setNo,format) $setNo $i
         }
         html "\n"
     }
@@ -1322,8 +1539,8 @@ proc z39history {} {
     global sessionId
     global targets
     global html3
+    global scriptQuery
 
-    set targetNo 0
     if {![info exists nextSetNo]} {
         return
     }
@@ -1339,67 +1556,77 @@ proc z39history {} {
         html {<dl>} "\n"
     }
     for {set setNo 1} {$setNo < $nextSetNo} {incr setNo} {
-        if {$hist($setNo,scan) > 0} continue
-        set host $hist($setNo,0,host)
-        if {$html3} {
-            html {<td align=left>}
-        } else {
-            html {<dt> }
+        if {[info exists hist($setNo,scan)]} {
+            if {$hist($setNo,scan) > 0} continue
         }
-        html [lindex $targets($host) 0]
-        if {$html3} {
-            html {<td align=left>} [join $hist($setNo,0,database)]
+        if {[info exists hist($setNo,1,host)]} {
+            set start 1
+            set end $hist($setNo,0,host)
         } else {
-            if {[llength [lindex $targets($host) 1]] > 1} {
-                html ": "
-                foreach b $hist($setNo,0,database) {
-                    html " $b"
+            set start 0
+            set end 0
+        }
+        for {set i $start} {$i <= $end} {incr i} {
+            if {$html3} {
+                html {<td align=left>}
+            } else {
+                html {<dt> }
+            }
+            set host $hist($setNo,$i,host)
+            html [lindex $targets($host) 0]
+            if {$html3} {
+                html {<td align=left>} [join $hist($setNo,$i,database)]
+            } else {
+                if {[llength [lindex $targets($host) 1]] > 1} {
+                    html ": "
+                    foreach b $hist($setNo,$i,database) {
+                        html " $b"
+                    }
                 }
+                html {. }
             }
-            html {. }
-        }
-        if {$html3} {
-            html {<td align=right>}
-        }
-        if {[info exists hist($setNo,hits)]} {
-            html { <a href="http:} $env(SCRIPT_NAME)
-            html / $sessionId {/search.egw/} $setNo + $targetNo + 1
-            html + $hist($setNo,maxPresent)
-            if {1} {
-                html {">} $hist($setNo,hits) {</a>}
+            if {$html3} {
+                html {<td align=right>}
+            }
+            if {[info exists hist($setNo,$i,hits)]} {
+                html { <a href="http:} $env(SCRIPT_NAME)
+                html / $sessionId {/search.egw/} $setNo + $i + 1
+                html + $hist($setNo,maxPresent)
+                html {">} $hist($setNo,$i,hits) {</a>}
             } else {
-                html {">Result</a>: } $hist($setNo,hits) { hits.}
+                if {$html3} {
+                    html {Failed}
+                } else {
+                    html {Search failed.}
+                }
             }
-        } else {
             if {$html3} {
-                html {Failed}
+                html {<td align=left>}
             } else {
-                html {Search failed.}
+                html "<dd>\n"
             }
-        }
-        if {$html3} {
-            html {<td align=left>}
-        } else {
-            html "<dd>\n"
-        }
-        html { <a href="http:} $env(SCRIPT_NAME)
-        html / $sessionId {/query.egw/} $host + $setNo
-        if {$html3} {
-            html {">}
-        } else {
-            html {">Query</a>: }
-        }
-        set op {}
-        for {set i 1} {$i <= 3} {incr i} {
-            if {[string length $hist($setNo,form,entry$i)] > 0} {
-                html " <b>" [join $op " "] "</b> "
-                html [join $hist($setNo,form,menu$i)] "=" 
-                html $hist($setNo,form,entry$i)
-                set op $hist($setNo,form,logic$i)
+            html { <a href="http:} $env(SCRIPT_NAME)
+            html / $sessionId / $scriptQuery {;/} $setNo + $host
+            if {$html3} {
+                html {">}
+            } else {
+                html {">Query</a>: }
+            }
+            set op {}
+            for {set j 1} {$j <= 3} {incr j} {
+                if {[string length $hist($setNo,form,entry$j)] > 0} {
+                    html " <b>" [join $op " "] "</b> "
+                set pre [join $hist($setNo,form,menu$j)]
+                    if {[string length $pre] > 0} {
+                        html $pre "="
+                    }
+                    html $hist($setNo,form,entry$j)
+                    set op $hist($setNo,form,logic$j)
+                }
+            }
+            if {$html3} {
+                html {</a><tr>} "\n"
             }
-        }
-        if {$html3} {
-            html {</a><tr>} "\n"
         }
     }
     if {$html3} {
@@ -1414,27 +1641,30 @@ proc displayError {msga msgb} {
     html "<p><center>\n"
     html {<img src="/egwgif/noway.gif" alt="Error">}
     html "<h2>" $msga "</h2>\n"
-    if {$msgb != ""} {
+    if {[string length $msgb] > 0} {
         html "<h3>" $msgb "</h3>\n"
     }
     html "</center><p>\n"
 }
 
-proc button-europagate {} {
+proc button-main {} {
     global useIcons
     html {<a href="http://europagate.dtv.dk/">}
     if {$useIcons} {
         html {<img src="/egwgif/button-egw.gif" alt="Europagate" border=0></a>}
     } else {
-        html {Europagate</a> | }
+        html {Europagate</a>}
     }
 }
 
-proc button-define-target {more} {
+proc button-define-target {} {
     global useIcons
     global env
     global sessionId
 
+    if {!$useIcons} {
+        html "\n | "
+    }
     html {<a href="http:} $env(SCRIPT_NAME)
     html / $sessionId {/tform.egw}
     if {$useIcons} {
@@ -1442,46 +1672,39 @@ proc button-define-target {more} {
 	html {alt="Define Target" border=0></a>}
     } else {
         html {">Define Target</a>}
-        if {$more} {
-            html " | \n"
-        } else {
-            html "\n"
-        }
     }
 }
 
-proc button-new-target {more} {
+proc button-new-target {} {
     global useIcons
     global env
     global sessionId
-    global mMode
+    global scriptTarget
 
-    html {<a href="http:} $env(SCRIPT_NAME)
-    html / $sessionId 
-    if {$mMode} {
-        html {/mtargets.egw}
-    } else {
-        html {/targets.egw}
+    if {[string length $scriptTarget] == 0} return
+
+    if {!$useIcons} {
+        html "\n | "
     }
+    html {<a href="http:} $env(SCRIPT_NAME)
+    html / $sessionId / $scriptTarget
     if {$useIcons} {
         html {"><img src="/egwgif/button-new-target.gif" }
 	html {alt="New Target" border=0></a>}
     } else {
         html {">New Target</a>}
-        if {$more} {
-            html " | \n"
-        } else {
-            html "\n"
-        }
     }
 }
 
-proc button-view-history {more} {
+proc button-view-history {} {
     global useIcons
     global env
     global sessionId
     global nextSetNo
 
+    if {!$useIcons} {
+        html "\n | "
+    }
     html {<a href="http:} $env(SCRIPT_NAME)
     html / $sessionId {/history.egw;}
     catch { html "/" $nextSetNo}
@@ -1490,48 +1713,63 @@ proc button-view-history {more} {
         html {border=0></a>}
     } else {
         html {">View History</a>}
-        if {$more} {
-            html " | \n"
-        } else {
-            html "\n"
-        }
     }
 }
 
-proc button-new-query {more setNo} {
+proc button-new-query {setNo} {
     global useIcons
     global env
     global sessionId
     global hist
-    global mMode
+    global scriptQuery
 
-    html {<a href="http:} $env(SCRIPT_NAME)
-    html / $sessionId 
-    if {$mMode} {
-        html {/mquery.egw/} $setNo
-    } else {
-        html {/query.egw/} $hist($setNo,0,host) + $setNo
+    if {!$useIcons} {
+        html "\n | "
     }
-    html {">}
+    html {<a href="http:} $env(SCRIPT_NAME)
+    html / $sessionId / $scriptQuery {;/} $setNo + $hist($setNo,0,host) {">}
+
     if {$useIcons} {
         html {<img src="/egwgif/button-new-query.gif" }
 	html {alt="New Query" border=0></a>}
     } else {
         html {New Query</a>}
-        if {$more} {
-            html " | \n"
-        } else {
-            html "\n"
-        }
     }
 }
 
-proc button-scan-window {more setNo} {
+proc button-result-set {setNo tno} {
     global useIcons
     global env
     global sessionId
     global hist
 
+    if {!$useIcons} {
+        html "\n | "
+    }
+    html {<a href="http:} $env(SCRIPT_NAME) / $sessionId 
+    if {$tno > 0} {
+        html {/msearch.egw/} $setNo
+    } else {
+        html {/search.egw/} $setNo + $tno
+    }
+    html + 1 + $hist($setNo,maxPresent)
+    if {$useIcons} {
+        html {"><img src="/egwgif/button-result-set.gif" }
+	html {alt="Result Set" border=0></a>}
+    } else {
+        html {">Result Set</a>}
+    }
+}
+
+proc button-scan-window {setNo} {
+    global useIcons
+    global env
+    global sessionId
+    global hist
+
+    if {!$useIcons} {
+        html "\n | "
+    }
     set targetNo 0
     html {<a href="http:} $env(SCRIPT_NAME)
     html / $sessionId {/search.egw/} $setNo + $targetNo + {scan} {">}
@@ -1540,11 +1778,6 @@ proc button-scan-window {more setNo} {
 	html {alt="Scan" border=0></a>}
     } else {
         html {Scan</a>}
-        if {$more} {
-            html " | \n"
-        } else {
-            html "\n"
-        }
     }
 }
 
@@ -1577,7 +1810,7 @@ proc splitDatabaseSpec {host} {
 }
 
 proc mergeHostSpec {host databases} {
-    return ${host}.[join $databases -]
+    return ${host}/[join $databases -]
 }
 
 proc mkAssoc {assoc host} {
@@ -1598,4 +1831,63 @@ proc mkAssoc {assoc host} {
             ir $assoc
         }
     }
-}
\ No newline at end of file
+}
+
+proc serverList {headlineProc targetProc} {
+    global targets
+    global groupsDescription
+   
+    proc targetsCmp {l r} {
+        global targets
+        return [string compare [string tolower [lindex $targets($l) 0]] \
+                               [string tolower [lindex $targets($r) 0]]]
+    }
+    proc groupCmp {l r} {
+        global groupsOrder
+        if {[catch {set lo $groupsOrder($l)}]} {
+            set lo 10
+        }
+        if {[catch {set ro $groupsOrder($r)}]} {
+            set ro 10
+        }
+        return [expr $lo - $ro]
+    }
+    
+    foreach tt [array names targets] {
+        lappend groupsTmp([lindex $targets($tt) 6]) $tt
+    }
+    set gts [lsort -command groupCmp [array names groupsTmp]]
+    foreach gt $gts {
+        if {[info exists groupsDescription($gt)]} {
+            eval $headlineProc [list $groupsDescription($gt)]
+        } else {
+            eval $headlineProc $gt
+        }
+        set tn [lsort -command targetsCmp $groupsTmp($gt)]
+        foreach t $tn {
+            eval $targetProc $t
+        }
+    }
+
+    rename targetsCmp {}
+}
+
+proc session-lost {} {
+    global useIcons
+
+    html {<head><title>WWW/Z39.50 Gateway: Session Expired</title></head>}
+    html \n {<body>}
+    set useIcons 1
+    button-main
+    html {<h1>Session Expired</h1>}
+    html {Your session has expired. Please reload the gateways' }
+    html {front page.<br><br>} \n
+    set useIcons 0
+    button-main
+    html {</body></html>}
+}
+
+if {[info exists utilExtension]} {
+    source $utilExtension
+}
+