X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fz39util.tcl;h=19c75f3e4681c26f36fb594a98940d88b1009d53;hb=8475d385a59bc414a07804de7de9692edc022364;hp=e50db2ba3809ed080d704b73c4af72579eee1701;hpb=a4571caef991e968e3c20b515490b7923306a1cf;p=egate.git

diff --git a/www/z39util.tcl b/www/z39util.tcl
index e50db2b..19c75f3 100644
--- a/www/z39util.tcl
+++ b/www/z39util.tcl
@@ -1,5 +1,5 @@
 #
-# $Id: z39util.tcl,v 1.39 1996/03/12 16:30:30 adam Exp $
+# $Id: z39util.tcl,v 1.46 1996/08/28 09:36:03 adam Exp $
 #
 proc saveState {} {
     uplevel #0 {
@@ -92,20 +92,6 @@ proc display-medium {zset no setNo targetNo} {
             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]
@@ -120,6 +106,7 @@ proc display-medium {zset no setNo targetNo} {
 	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 {">}
@@ -161,6 +148,9 @@ proc display-medium {zset no setNo targetNo} {
             html "No Title"
         }
         html {</a> }
+        if {[scan $score %d nscore] == 1} {
+            html "; Score " $nscore
+        }
     } else {
         html { <a href="http:} $env(SCRIPT_NAME) /
         html $sessionId {/showfull.egw/} $setNo + $targetNo + $no + full {">}
@@ -198,17 +188,6 @@ proc display-brief {zset no setNo targetNo} {
             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]
@@ -306,10 +285,6 @@ proc display-raw {zset no setNo targetNo} {
             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"
@@ -521,116 +496,11 @@ proc display-full-marc {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) "</dl><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>}
-    }
-    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 {
@@ -655,10 +525,6 @@ proc display-full {zset no setNo targetNo} {
             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"
@@ -700,38 +566,29 @@ proc build-query {t ilines} {
     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 $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 {![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
-                { set q "@and $q ${attr} \"${term}\"" }
-                Or
-                { set q "@or $q ${attr} \"${term}\"" }
-                {And not}
-                { set q "@not $q ${attr} \"${term}\"" }
-                {}
-                { set q "${attr} \"${term}\"" }
+        set field [join [egw_form menu$i]]
+        catch {unset attr}
+        foreach x [lindex $targets($t) 2] {
+            if {![string compare [lindex $x 0] $field]} {
+                set attr [lindex $x 1]
             }
-            set op [egw_form logic$i]
         }
+        if {![info exists attr]} {
+            egw_log debug "attr failed for $t"
+            set attr [lindex [lindex [lindex $targets($t) 2] 0] 1]
+        }
+        egw_log debug "op=${op}"
+        switch $op {
+            And
+            { set q "@and $q ${attr} \"${term}\""; egw_log debug AND }
+            Or
+            { set q "@or $q ${attr} \"${term}\""; egw_log debug OR }
+            {}
+            { set q "${attr} \"${term}\""; egw_log debug NOPE }
+            default
+           { set q "@not $q ${attr} \"${term}\""; egw_log debug ANDNOT }
+        }
+        set op [egw_form logic$i]
     }
     return $q
 }
@@ -868,7 +725,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 / $scriptQuery / $setNo + $hist($setNo,host) +
+            html / $sessionId / $scriptQuery {;/} $setNo + $hist($setNo,host) +
             html $hist($setNo,scan) +  $tterm {">}
         } else {
             regsub -all {\ } [lindex [$zs scanLine $i] 1] + tterm
@@ -946,24 +803,14 @@ 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 {![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]"
-    }
+    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 {}
     }
@@ -1009,7 +856,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
 }
 
@@ -1133,7 +980,20 @@ proc z39msearch {setNo elements start number cache} {
     }
     while {$zleft > 0} {
         egw_log debug "Waiting for init response"
-        if {[catch {egw_wait zleft 20}]} {
+        if {[catch {egw_wait zleft 20} reason]} {
+            if {![string compare $reason cancel]} {
+                for {set i 1} {$i <= $not} {incr i} {
+                    set zstatus($i) -1
+                    catch {z39$i disconnect}
+                }
+                return
+            } else {
+                for {set i 1} {$i <= $not} {incr i} {
+                    if {$zstatus($i) == -1} {
+                        catch {z39$i disconnect}
+                    }
+                }
+            }
             break
         }
     }
@@ -1155,13 +1015,9 @@ proc z39msearch {setNo elements start number cache} {
                 html "ok<br>\n"
             }
 
-            if {![string compare [lindex $targets($host) 1] WAIS]} {
-                wais-set z39$i.$setNo z39$i
-            } else {
-                ir-set z39$i.$setNo z39$i
-                z39$i.$setNo preferredRecordSyntax [lindex $targets($host) 1]
-                egw_log debug "set syntax to [lindex $targets($host) 1]"
-            }
+            ir-set z39$i.$setNo z39$i
+            z39$i.$setNo preferredRecordSyntax [lindex $targets($host) 1]
+            egw_log debug "set syntax to [lindex $targets($host) 1]"
             set hist($setNo,$i,offset) 0
             eval z39$i.$setNo databaseNames $hist($setNo,$i,database)
 
@@ -1240,9 +1096,24 @@ proc z39msearch {setNo elements start number cache} {
             }
         }
     }
+
+
     while {$zleft > 0} {
         egw_log debug "Waiting for search/present response"
-        if {[catch {egw_wait zleft 60}]} {
+        if {[catch {egw_wait zleft 60} reason]} {
+            if {![string compare $reason cancel]} {
+                for {set i 1} {$i <= $not} {incr i} {
+                    catch {z39$i disconnect}
+                    set zstatus($i) -1
+                }
+                return
+            } else {
+                for {set i 1} {$i <= $not} {incr i} {
+                    if {$zstatus($i) != 2} {
+                        catch {z39$i disconnect}
+                    }
+                }
+            }
             break
         }
     }
@@ -1343,9 +1214,12 @@ proc buttons-result-set-s {setNo targetNo setMax startPos after} {
             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"
 }
@@ -1365,35 +1239,46 @@ proc display-result-set-m-score {setNo} {
         if {$zstatus($i) != 2} continue
         set status [z39$i.$setNo responseStatus]
         if {[lindex $status 0] != "DBOSD"} continue        
-        if {$hist($setNo,$i,offset) > $hist($setNo,maxPresent)} {
-            set nor $hist($setNo,maxPresent)
-        } else {
-            set nor $hist($setNo,$i,offset)
-        }
+        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]
-                if {$score > 0} {
-                    lappend scoreArray [list $score $i $j]
+            if {![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 10 $i $j]
+                set score 10
+            }
+            if {$score > 0} {
+                lappend scoreArray [list $score $i $j]
             }
         }
     }
     if {![info exists scoreArray]} {
         html "<br><h3>Search produced no result</h3><br>\n"
-        return
+    } 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"
     }
-    set scoreSorted [lsort -command score-sort $scoreArray]
-
-    html "<ul>\n"
-    foreach r $scoreSorted {
-        set i [lindex $r 1]
-        set j [lindex $r 2]
-        display-$hist($setNo,format) z39$i.$setNo $j $setNo $i
+    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 "</ul><br>\n"
+    html "\n<br>"
 }
 
 proc display-result-set-m-server {setNo} {
@@ -1401,20 +1286,26 @@ 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"
             
@@ -1518,7 +1409,6 @@ proc z39history {} {
     global html3
     global scriptQuery
 
-    set targetNo 0
     if {![info exists nextSetNo]} {
         return
     }
@@ -1534,67 +1424,80 @@ 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 / $scriptQuery / $setNo + $host
-        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 <= 10} {incr j} {
+                if {![info exists hist($setNo,form,entry$j)]} {
+                    break
+                }
+                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} {
@@ -1625,7 +1528,19 @@ proc button-main {} {
     }
 }
 
-proc button-define-target {more} {
+proc button-feedback {} {
+    global useIcons
+
+    html {<a href="http://europagate.dtv.dk/wwwquest.html">}
+    if {$useIcons} {
+        html {<img src="/egwgif/button-user-feedback.gif" alt="User Feedback"
+        border=0></a>}
+    } else {
+        html {User Feedback</a>}
+    }    
+}
+
+proc button-define-target {} {
     global useIcons
     global env
     global sessionId
@@ -1643,11 +1558,10 @@ proc button-define-target {more} {
     }
 }
 
-proc button-new-target {more} {
+proc button-new-target {} {
     global useIcons
     global env
     global sessionId
-    global mMode
     global scriptTarget
 
     if {[string length $scriptTarget] == 0} return
@@ -1665,7 +1579,7 @@ proc button-new-target {more} {
     }
 }
 
-proc button-view-history {more} {
+proc button-view-history {} {
     global useIcons
     global env
     global sessionId
@@ -1685,19 +1599,18 @@ proc button-view-history {more} {
     }
 }
 
-proc button-new-query {more setNo} {
+proc button-new-query {setNo} {
     global useIcons
     global env
     global sessionId
     global hist
-    global mMode
     global scriptQuery
 
     if {!$useIcons} {
         html "\n | "
     }
     html {<a href="http:} $env(SCRIPT_NAME)
-    html / $sessionId / $scriptQuery / $setNo + $hist($setNo,0,host) {">}
+    html / $sessionId / $scriptQuery {;/} $setNo + $hist($setNo,0,host) {">}
 
     if {$useIcons} {
         html {<img src="/egwgif/button-new-query.gif" }
@@ -1707,7 +1620,31 @@ proc button-new-query {more setNo} {
     }
 }
 
-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
@@ -1729,10 +1666,8 @@ proc button-scan-window {more setNo} {
 
 proc maintenance {} {
     html {<hr>This page is maintained by }
-    html {<a href="mailto:pwh@dtv.dk"> Peter Wad Hansen </a>.}
-    html {Last modified 29. january 1996. <br>}
-    html {<em> This and the following pages are under construction and }
-    html {will continue to be so until the end of January 1996.</em>}
+    html {<a href="mailto:nobody"> Nobody </a>.}
+    html {Last modified x x x. <br>}
 }
 
 proc splitHostSpec {host} {
@@ -1763,22 +1698,70 @@ proc mkAssoc {assoc host} {
     global targets
 
     if {[catch {$assoc failback fail-response}]} {
-        if {![string compare [lindex $targets($host) 1] WAIS]} {
-            wais $assoc
-        } else {
-            ir $assoc
-        }
+        ir $assoc
+        $assoc maximumRecordSize 1000000
     } else {
-        if {![string compare [lindex $targets($host) 1] WAIS]} {
-            if {[$assoc comstack] == "wais"} return
-            wais $assoc
+        if {[$assoc comstack] == "tcpip"} return
+        ir $assoc
+        $assoc maximumRecordSize 1000000
+    }
+}
+
+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 {
-            if {[$assoc comstack] == "tcpip"} return
-            ir $assoc
+            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
-}
\ No newline at end of file
+}
+