X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fz39util.tcl;h=8aa211841379d96488b96fd8da9fd2b42e1f4bca;hb=3acf7ded1eac12a1027c9e9ec379d41f930fb85b;hp=1de9d26a9d91eec77b17b3ad722a1009e3ce85ff;hpb=ba37ce207c47ac1fa27bb46df7dc54f72740bb96;p=egate.git

diff --git a/www/z39util.tcl b/www/z39util.tcl
index 1de9d26..8aa2118 100644
--- a/www/z39util.tcl
+++ b/www/z39util.tcl
@@ -1,5 +1,5 @@
 #
-# $Id: z39util.tcl,v 1.17 1996/01/03 15:19:52 adam Exp $
+# $Id: z39util.tcl,v 1.48 1997/02/24 10:05:20 adam Exp $
 #
 proc saveState {} {
     uplevel #0 {
@@ -65,15 +65,13 @@ 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 {<li>}
     set type [$zset type $no]
     if {$type == "SD"} {
+        html {<li>}
         set err [lindex [$zset diag $no] 1]
         set add [lindex [$zset diag $no] 2]
         if {$add != {}} {
@@ -85,17 +83,34 @@ proc display-brief {zset no tno} {
     if {$type != "DB"} {
         return
     }
+    html {<li>}
     set rtype [$zset recordType $no]
-    if {$rtype == "SUTRS"} {
-        html [join [$zset getSutrs $no]]
-        html "<br>\n"
-        return
-    } 
+    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
+        }
+    }
     if {![catch {
         set author [$zset getMarc $no field 100 * a]
-        set title [lindex [$zset getMarc $no field 245 * a] 0]
-        set year [lindex [$zset getMarc $no field 260 * c] 0]
-    } ] } {
+        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 {">}
         set p 0
         foreach a $author {
             if {$p} {
@@ -104,41 +119,175 @@ proc display-brief {zset no tno} {
             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 {<a href="http:} $env(SCRIPT_NAME) /
-        html $sessionId {/showfull.egw/} $setNo + $tno + $no + full {">}
-        if {[string length $title] == 0} {
-            html {No title}
-        } else {
-            html $title
+	set nope 1
+        foreach v $title {
+            html $v
+            set nope 0
         }
-        html {</a>} " <i> ${year} </i>"
+        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] == 1} {
+            html "; Score " $nscore
+        }
+    } else {
+        html { <a href="http:} $env(SCRIPT_NAME) /
+        html $sessionId {/showfull.egw/} $setNo + $targetNo + $no + full {">}
+        html {No Title}
+        html {</a> }
+        html "Error: " $dispError "\n"
     }
     html "<br>\n"
 }
 
-proc display-raw {zset no tno} {
+proc display-brief {zset no setNo targetNo} {
+    global env
+    global sessionId
+
     set type [$zset type $no]
     if {$type == "SD"} {
+        html {<li>}
         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"
+        html "${no} Error ${err}${add} <br>\n"
         return
     }
     if {$type != "DB"} {
         return
     }
+    html {<li>}
     set rtype [$zset recordType $no]
-    if {$rtype == "SUTRS"} {
-        html [join [$zset getSutrs $no]] "<br>\n"
-        return
-    } 
+    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
+        }
+    }
+    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 { <a href="http:} $env(SCRIPT_NAME) /
+        html $sessionId {/showfull.egw/} $setNo + $targetNo + $no + full {">}
+        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 {<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} {
+                set nope 0
+                html [string range $v 0 38] "..."
+            } elseif {[string length $v] > 0} {
+                set nope 0
+                html $v
+            } else {
+                html "No Title"
+            }
+	}
+        html {</a> }
+    } else {
+        html { <a href="http:} $env(SCRIPT_NAME) /
+        html $sessionId {/showfull.egw/} $setNo + $targetNo + $no + full {">}
+        html {No Title}
+        html {</a> }
+        html "Error: " $dispError "\n"
+    }
+    html "<br>\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 "<h3>${no}</h3>\n"
+            html "Error ${err}${add} <br>\n"
+            return
+        }
+        DB {
+        }
+        default {
+            return
+        }
+    }
+    set rtype [$zset recordType $no]
+    switch $rtype {
+        SUTRS {
+            html "<xmp>\n" [join [$zset getSutrs $no]] "\n</xmp>\n"
+            return
+        } 
+    }
     if {[catch {set r [$zset getMarc $no line * * *]}]} {
         html "Unknown record type: $rtype <br>\n"
         return
@@ -167,7 +316,7 @@ proc display-raw {zset no tno} {
             }
             html $data
         }
-        htmlr {<br>}
+        html "<br>\n"
     }
 }
 
@@ -256,29 +405,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} <br>\n"
-        return
-    }
-    if {$type != "DB"} {
-        return
-    }
-    set rtype [$zset recordType $no]
-    if {$rtype == "SUTRS"} {
-        html [join [$zset getSutrs $no]] "<br>\n"
-        return
-    } 
-    if {[catch {set r [$zset getMarc $no line * * *]}]} {
-        html "Unknown record type: $rtype <br>\n"
-        return
-    }
+proc display-full-marc {zset no setNo targetNo} {
+    global env
+    global hist
+    global sessionId
+
     html "<dl>\n"
     set n [dl-marc-field $zset $no 700 a "Author" "Authors" "<br>\n"]
     if {$n == 0} {
@@ -286,8 +417,17 @@ proc display-full {zset no tno} {
     }
     set n [dl-marc-field $zset $no 710 a "Corporate Name" {} ", "]
     if {$n == 0} {
-        set n [dl-marc-field $zset $no 710 a "Corporate Name" {} ", "]
+        set n [dl-marc-field $zset $no 110 a "Corporate Name" {} ", "]
     }
+    set n [dl-marc-field $zset $no 711 a "Meeting Name" {} ", "]
+    if {$n > 0} {
+	dd-marc-field $zset $no 711 {[bndc]} " " ""
+    } else {
+        set n [dl-marc-field $zset $no 111 a "Meeting Name" {} ", "]
+	if {$n > 0} {
+	    dd-marc-field $zset $no 111 {[bndc]} " " " "
+	}
+    } 
     set n [dl-marc-field $zset $no 245 {a} "Title" {} " "]
     if {$n > 0} {
         dd-marc-field $zset $no 245 b "<em>" "</em>"
@@ -351,40 +491,65 @@ proc display-full {zset no tno} {
         if {"x$sp" == "x"} {
             set sp $url
         }
-        html {<dd><a href="} $url {">} [join $sp] "</a>\n"
+        html {<dd><a href="} [join $url] {">} [join $sp] "</a>\n"
     }
     dl-marc-field $zset $no 037 {[abc]} "Acquisition" {} "<br>\n"
     dl-marc-field $zset $no 037 {[f6]} "Form of issue" {} "<br>\n"
     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-rec {from to dfunc tno} {
-    global setNo
-
-    if {$tno > 0} {
-        while {$from <= $to} { 
-            eval "$dfunc z39${tno}.${setNo} $from $tno"
-            incr from
+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
         }
-    } else {
-        while {$from <= $to} { 
-            eval "$dfunc z39.${setNo} $from 0"
-            incr from
+        DB {
         }
+        default {
+            return
+        }
+    }
+    set rtype [$zset recordType $no]
+    switch $rtype {
+        SUTRS {
+            html "<pre>" [join [$zset getSutrs $no]] "</pre><br>\n"
+            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} { 
+        eval "$dfunc z39${targetNo}.${setNo} $from $setNo $targetNo"
+        incr from
     }
 }
 
 proc build-scan {t i} {
     global targets
 
-    set term [wform entry$i]
+    set term [egw_form entry$i]
     if {$term != ""} {
-        set field [wform menu$i]
+        set field [join [egw_form menu$i]]
+        set attr {Title}
         foreach x [lindex $targets($t) 2] {
             if {[lindex $x 0] == $field} {
                 set attr [lindex $x 1]
@@ -401,26 +566,31 @@ proc build-query {t ilines} {
     set op {}
     set q {}
     for {set i 1} {$i <= $ilines} {incr i} {
-        set term [wform entry$i]
-        if {[string length $term] > 0} {
-            set field [wform menu$i]
-            foreach x [lindex $targets($t) 2] {
-                if {[lindex $x 0] == $field} {
-                    set attr [lindex $x 1]
-                }
+        set term [join [egw_form entry$i]]
+        if {[string length $term] == 0} continue
+        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]
             }
-            switch $op {
+        }
+        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}" }
+            { set q "@and $q ${attr} \"${term}\""; egw_log debug AND }
             Or
-                { set q "@or $q ${attr} ${term}" }
-            {And not}
-                { set q "@not $q ${attr} ${term}" }
+            { set q "@or $q ${attr} \"${term}\""; egw_log debug OR }
             {}
-                { set q "${attr} ${term}" }
-            }
-            set op [wform logic$i]
+            { 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
 }
@@ -430,69 +600,60 @@ 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 ""
     }
     set zs $zz.s$scanNo.$setNo
     $zz callback ok-response
     $zz failback fail-response
-    if {$oldHost != $host} {
+    set thisHost [splitHostSpec $host]
+    if {[string compare $oldHost $thisHost]} {
         catch [list $zz disconnect]
 
         set sessionWait 0
-        if {[catch [list $zz connect $host]]} {
-            displayError "Cannot connect to target" $host
+        if {[catch [list $zz connect $thisHost]]} {
+            displayError "Cannot connect to target" $thisHost
             return 0
         } elseif {$sessionWait == 0} {
-            if {[catch {zwait sessionWait 300}]} {
+            if {[catch {egw_wait sessionWait 300}]} {
 		$zz disconnect
-                displayError "Cannot connect to target" $host
+                displayError "Cannot connect to target" $thisHost
                 return 0
             }
             if {$sessionWait != 1} {
-                displayError "Cannot connect to target" $host
+                displayError "Cannot connect to target" $thisHost
                 return 0
             }
         }
         $zz idAuthentication $idAuth
         set sessionWait 0
         if {[catch {$zz init}]} {
-            displayError "Cannot initialize target" $host
+            displayError "Cannot initialize target" $thisHost
 	    $zz disconnect
             return 0
         }
-        if {[catch {zwait sessionWait 60}]} {
-            displayError "Cannot initialize target" $host
+        if {[catch {egw_wait sessionWait 60}]} {
+            displayError "Cannot initialize target" $thisHost
 	    $zz disconnect
             return 0
         }
         if {$sessionWait != "1"} {
-            displayError "Cannot initialize target" $host
+            displayError "Cannot initialize target" $thisHost
 	    $zz disconnect
             return 0
         }
         if {![$zz initResult]} {
             set u [$zz userInformationField]
             $zz disconnect
-            displayError "Cannot initialize target $host" $u
+            displayError "Cannot initialize target $thisHost" $u
             return 0
         }
     } else {
@@ -509,11 +670,12 @@ proc z39scan {setNo scanNo tno scanLines scanPos cache} {
 
     $zz callback [list scan-response $zs]
 
+    egw_log debug "scan: ${scanAttr} ${scanTerm}"
     set sessionWait 0
     $zs scan "${scanAttr} ${scanTerm}"
 
-    if {[catch {zwait sessionWait 600}]} {
-        wlog debug "timeout/cancel in scan"
+    if {[catch {egw_wait sessionWait 60}]} {
+        egw_log debug "timeout/cancel in scan"
         displayError "Timeout in scan" {}
         html "</body></html>\n"
         $zz disconnect
@@ -535,12 +697,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]
         
@@ -558,16 +717,31 @@ proc display-scan {setNo scanNo tno} {
             set hist($setNo,[expr $scanNo + 1],scanTerm) $t
         }
     }
+    html {<table width=500 border=0><tr>}
+    html {<td align=left><b>Scan term</b>}
+    html {<td align=right><b>Hits</b>}
+    html {<tr>} \n
+
     for {set i 0} {$i < $m} {incr i} {
-        regsub -all {\ } [lindex [$zs scanLine $i] 1] + tterm
-        html {<a href="http:} $env(SCRIPT_NAME)
-        html / $sessionId {/query.egw/} $hist($setNo,host) + $setNo +
-        html $hist($setNo,scan) +  $tterm {">}
+        html {<td align=left>}
+        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 $hist($setNo,scan) +  $tterm {">}
+        } else {
+            regsub -all {\ } [lindex [$zs scanLine $i] 1] + tterm
+            html {<a href="http:} $env(SCRIPT_NAME)
+            html / $sessionId {/search.egw/} $setNo + $tno +
+            html hyper + $tterm {">}
+        }
         html [lindex [$zs scanLine $i] 1]
-        html {</a>: <em>}
+        html {</a>} 
+        html {<td align=right>}
         html [lindex [$zs scanLine $i] 2]
-        html "</em><br>\n"
+        html {<tr>} \n
     }
+    html {</table} \n
 }
 
 proc z39search {setNo piggy tno elements} {
@@ -575,77 +749,70 @@ 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
-    if {$oldHost != $host} {
+    set thisHost [splitHostSpec $host]
+    if {[string compare $oldHost $thisHost]} {
         catch [list $zz disconnect]
 
         set sessionWait 0
-        if {[catch [list $zz connect $host]]} {
-            displayError "Cannot connect to target" $host
+        if {[catch [list $zz connect $thisHost]]} {
+            displayError "Cannot connect to target" $thisHost
             return 0
         } elseif {$sessionWait == 0} {
-            if {[catch {zwait sessionWait 300}]} {
+            if {[catch {egw_wait sessionWait 300}]} {
 		$zz disconnect
-                displayError "Cannot connect to target" $host
+                displayError "Cannot connect to target" $thisHost
                 return 0
             }
             if {$sessionWait != 1} {
-                displayError "Cannot connect to target" $host
+                displayError "Cannot connect to target" $thisHost
                 return 0
             }
         }
         $zz idAuthentication $idAuth
         set sessionWait 0
         if {[catch {$zz init}]} {
-            displayError "Cannot initialize target" $host
+            displayError "Cannot initialize target" $thisHost
 	    $zz disconnect
             return 0
         }
-        if {[catch {zwait sessionWait 60}]} {
-            displayError "Cannot initialize target" $host
+        if {$sessionWait == 0 && [catch {egw_wait sessionWait 60}]} {
+            displayError "Cannot initialize target" $thisHost
 	    $zz disconnect
             return 0
         }
         if {$sessionWait != "1"} {
-            displayError "Cannot initialize target" $host
+            displayError "Cannot initialize target" $thisHost
 	    $zz disconnect
             return 0
         }
         if {![$zz initResult]} {
             set u [$zz userInformationField]
             $zz disconnect
-            displayError "Cannot initialize target $host" $u
+            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
     
+    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 {}
     }
@@ -653,11 +820,9 @@ proc z39search {setNo piggy tno elements} {
     $zz.$setNo mediumSetElementSetNames $elements
     $zz.$setNo recordElements $elements
 
-    wlog debug "database=$database"
+    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
@@ -669,10 +834,16 @@ proc z39search {setNo piggy tno elements} {
         $zz.$setNo mediumSetPresentNumber 0
     }
     set sessionWait 0
-    $zz.$setNo search $query
+    egw_log debug "search: $query"
 
-    if {[catch {zwait sessionWait 600}]} {
-        wlog debug "timeout/cancel in search"
+    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 "</body></html>\n"
         $zz disconnect
@@ -687,7 +858,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
 }
 
@@ -695,17 +866,22 @@ proc init-m-response {i} {
     global zstatus
     global zleft
 
-    wlog debug "init-m-response"
+    egw_log debug "init-m-response"
 
-    set zstatus($i) 1
     incr zleft -1
+    if {![z39$i initResult]} {
+        set zstatus($i) -1
+        z39$i disconnect
+        return
+    }
+    set zstatus($i) 1
 }
 
 proc connect-m-response {i} {
     global zstatus
     global zleft
 
-    wlog debug "connect-m-response"
+    egw_log debug "connect-m-response"
     z39$i callback [list init-m-response $i]
     if {[catch {z39$i init}]} {
         set zstatus($i) -1
@@ -717,36 +893,72 @@ proc fail-m-response {i} {
     global zstatus
     global zleft
     
-    wlog debug "fail-m-response"
+    egw_log debug "fail-m-response"
     set zstatus($i) -1
     incr zleft -1
 }
 
-proc search-m-response {setNo i} {
+proc search-m-response {setNo i start number} {
     global zleft
     global zstatus
+    global hist
 
-    incr zleft -1
-    set zstatus($i) 2
+    egw_log debug "search-m-response"
+    set status [z39$i.$setNo responseStatus]
+    egw_log debug "search-m-response1"
+    if {[lindex $status 0] == "OK"} {
+        set nor 0
+    } elseif {[lindex $status 0] == "DBOSD"} {
+        set nor [z39$i.$setNo numberOfRecordsReturned]
+    } else {
+        egw_log debug "search-m-response2"
+        incr zleft -1
+        set zstatus($i) 2
+        return
+    }
+    set hist($setNo,$i,hits) [z39$i.$setNo resultCount]
+    egw_log debug "search-m-response3"
+    set hist($setNo,$i,offset) [expr $start + $nor -1]
+    if {[expr $nor + $start] > [z39$i.$setNo resultCount]} {
+        egw_log debug "search-m-response4"
+        incr zleft -1
+        set zstatus($i) 2
+        return
+    }
+    egw_log debug "search-m-response5"
+    if {$nor >= $number} {
+        egw_log debug "search-m-response6 nor=$nor number=$number"
+        incr zleft -1
+        set zstatus($i) 2
+        return
+    }
+    egw_log debug "search-m-response7"
+    set start [expr $start + $nor]
+    set number [expr $number - $nor]
+    if {[expr $start + $number - 1] > [z39$i.$setNo resultCount]} {
+        set number [expr [z39$i.$setNo resultCount] - $start + 1]
+    }
+    z39$i callback [list search-m-response $setNo $i $start $number]
+    egw_log debug "mpresent start=$number number=$number"
+    z39$i.$setNo present $start $number
 }
 
-proc z39msearch {setNo piggy elements} {
+proc z39msearch {setNo elements start number cache} {
     global zleft
     global zstatus
     global hist
     global targets
+    global debug
 
     set not $hist($setNo,0,host)
 
+    egw_log debug "z39msearch start=$start number=$number elements=$elements"
     for {set i 1} {$i <= $not} {incr i} {
         set host $hist($setNo,$i,host)
-        if {[catch {z39 failback fail-response}]} {
-            ir z39$i
-        }
-        if {[catch {set oldHost [z39$i connect]}]} {
-            set oldHost ""
-        }
-        if {$oldHost != $host} {
+        mkAssoc z39$i $host
+        set oldHost [z39$i connect]
+        set thisHost [splitHostSpec $host]
+        if {[string compare $oldHost $thisHost]} {
             catch {z39$i disconnect}
         }
         z39$i callback [list connect-m-response $i]
@@ -756,29 +968,57 @@ proc z39msearch {setNo piggy elements} {
     for {set i 1} {$i <= $not} {incr i} {
         set oldHost [z39$i connect]
         set host $hist($setNo,$i,host)
-        if {$oldHost == $host} {
-            set zstatus($i) 1
+        set thisHost [splitHostSpec $host]
+        if {![string compare $oldHost $thisHost]} {
             continue
         }
+        egw_log debug "old=$oldHost this=$thisHost"
         z39$i idAuthentication $hist($setNo,$i,idAuthentication)
-        html "Connecting to target " $host " <br>\n"
         set zstatus($i) -1
-        if {![catch {z39$i connect $host}]} {
+        if {![catch {z39$i connect $thisHost}]} {
             incr zleft
         } 
     }
     while {$zleft > 0} {
-        wlog debug "Waiting for init response"
-        if {[catch {zwait zleft 10}]} {
+        egw_log debug "Waiting for init response"
+        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
         }
     }
     set zleft 0
     for {set i 1} {$i <= $not} {incr i} {
-        html "host " $hist($setNo,$i,host) ": "
-        if {$zstatus($i) >= 1} {
-            html "ok <br>\n"
+        set host $hist($setNo,$i,host)
+        if {$debug} {
+            html "host " [splitHostSpec $host] ": "
+        }
+        egw_log debug "i=$i zstatus=$zstatus($i)"
+        if {$zstatus($i) < 1} {
+            if {$debug} {
+                html "fail<br>\n"
+            }
+            continue
+        }
+        if {[catch [list z39$i.$setNo preferredRecordSyntax]]} {
+            if {$debug} {
+                html "ok<br>\n"
+            }
+
             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)
 
@@ -789,38 +1029,99 @@ proc z39msearch {setNo piggy elements} {
             }
             z39$i.$setNo smallSetElementSetNames $thisElements
             z39$i.$setNo mediumSetElementSetNames $thisElements
+            z39$i.$setNo elementSetNames $thisElements
             z39$i.$setNo recordElements $thisElements
 
-            z39$i.$setNo preferredRecordSyntax USMARC
-            z39$i callback [list search-m-response $setNo $i]
+            z39$i callback [list search-m-response $setNo $i $start $number]
 
-            if {$piggy} {
+            if {$start == 1} {
                 z39$i.$setNo largeSetLowerBound 999999
                 z39$i.$setNo smallSetUpperBound 0
-                z39$i.$setNo mediumSetPresentNumber $hist($setNo,maxPresent)
+                z39$i.$setNo mediumSetPresentNumber $number
             } else {
                 z39$i.$setNo largeSetLowerBound 2
                 z39$i.$setNo smallSetUpperBound 0
                 z39$i.$setNo mediumSetPresentNumber 0
             }
             set zstatus($i) 1
-            wlog debug "search " $hist($setNo,$i,query)
-            z39$i.$setNo search $hist($setNo,$i,query)
             incr zleft
+            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]
+            } else {
+                set tnumber $number
+            }
+            if {![lindex $targets($hist($setNo,$i,host)) 5]} {
+                set thisElements {}
+            } else {
+                set thisElements $elements
+            }
+            z39$i.$setNo smallSetElementSetNames $thisElements
+            z39$i.$setNo mediumSetElementSetNames $thisElements
+            z39$i.$setNo elementSetNames $thisElements
+            z39$i.$setNo recordElements $thisElements
+
+            for {set n 0} {$n < $tnumber} {incr n} {
+                if {[z39$i.$setNo recordType [expr $start + $n]] == ""} {
+                    if {$n > 0} {
+                        egw_log debug "failed on $n"
+                    }
+                    if {$debug} {
+                        html "no record at #" [expr $start + $n]
+                        html " el=-" $thisElements "-"
+                    }
+                    break
+                }
+            }
+            if {$n == $tnumber} {
+                if {$debug} {
+                    html "cached<br>\n"
+                }
+                continue
+            }
+            
+            html "present<br>\n"
+            z39$i callback [list search-m-response $setNo $i $start $tnumber]
+            incr zleft
+            egw_log debug "mpresent start=$start number=$tnumber"
+            z39$i.$setNo present $start $tnumber
         } else {
-            html "fail <br>\n"
+            if {$debug} {
+                html "ok<br>\n"
+            }
         }
     }
+
+
     while {$zleft > 0} {
-        wlog debug "Waiting for search response"
-        if {[catch {zwait zleft 30}]} {
+        egw_log debug "Waiting for search/present response"
+        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
         }
     }
     for {set i 1} {$i <= $not} {incr i} {
         if {$zstatus($i) != 2} continue
         set status [z39$i.$setNo responseStatus]
-        if {[lindex $status 0] != "NSD"} {
+        if {0 && [lindex $status 0] != "NSD"} {
             set hist($setNo,$i,offset) [z39$i.$setNo numberOfRecordsReturned]
         }
     }
@@ -831,13 +1132,8 @@ proc z39present {setNo tno setOffset setMax dfunc elements} {
     global sessionWait
     global targets
 
-    if {$tno > 0} {
-        set zz z39$tno
-        set host $hist($setNo,$tno,host)
-    } else {
-        set zz z39
-        set host $hist($setNo,host)
-    }
+    set zz z39$tno
+    set host $hist($setNo,$tno,host)
 
     if {![lindex $targets($host) 5]} {
         set elements {}
@@ -851,15 +1147,15 @@ proc z39present {setNo tno setOffset setMax dfunc elements} {
 
     while {$setMax > 0 && $toGet > 0} {
         for {set got 0} {$got < $toGet} {incr got} {
-            if {[$zz.$setNo type [expr $setOffset + $got]] == ""} {
+            if {[$zz.$setNo recordType [expr $setOffset + $got]] == ""} {
                 break
             }
         }
         if {$got < $toGet} {
             set sessionWait 0
             $zz.$setNo present $setOffset $toGet
-            if {[catch {zwait sessionWait 300}]} {
-                wlog debug "timeout/cancel in present"
+            if {[catch {egw_wait sessionWait 300}]} {
+                egw_log debug "timeout/cancel in present"
 		$zz disconnect
                 break
 	    }
@@ -874,139 +1170,600 @@ proc z39present {setNo tno setOffset setMax dfunc elements} {
                 break
             }
         }
-        display-rec $setOffset [expr $got + $setOffset - 1] $dfunc $tno
+        display-rec $setOffset [expr $got + $setOffset - 1] $dfunc $setNo $tno
         set setOffset [expr $got + $setOffset]
         set toGet [expr 1 + $setMax - $setOffset]
-        wflush
+        egw_flush
     }
 }
 
+proc buttons-result-set-s {setNo targetNo setMax startPos after} {
+    global sessionId
+    global useIcons
+    global env
+    global hist
+
+    set zz z39$targetNo
+    html "<p>\n"
+    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" }
+            html {alt="Next Records" border=0></a>}
+        } else {
+            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)]
+        html + [expr $startPos - 1]
+        if {$useIcons} {
+            html {"><img src="/egwgif/button-previous-records.gif" }
+	    html {alt="Previous Records" border=0></a>}
+        } else {
+            html {">Previous Records</a>} 
+        }
+    }
+    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
+    global zstatus
+    global targets
+
+    set not $hist($setNo,0,host)
+    for {set i 1} {$i <= $not} {incr i} {
+        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] USmarc]} {
+                set score [z39$i.$setNo getMarc $j field 999 * r]
+                if {[scan $score %d score] != 1} {
+                    set score 10
+                }
+            } else {
+                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"
+    } 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} {
+    global hist
+    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
+        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"
+            
+            if {$hist($setNo,$i,offset) > $hist($setNo,maxPresent)} {
+                set nor $hist($setNo,maxPresent)
+            } else {
+                set nor $hist($setNo,$i,offset)
+            }
+            display-rec 1 $nor display-$hist($setNo,format) $setNo $i
+        }
+        html "\n"
+    }
+    html "</dl>\n"
+}
+
+proc display-result-set-m {setNo} {
+    global hist
+    global useIcons
+    global zstatus
+    global targets
+
+    egw_log debug "sort=$hist($setNo,sort)"
+    switch $hist($setNo,sort) {
+        score {
+            display-result-set-m-score $setNo
+        }
+        default {
+            display-result-set-m-server $setNo
+        }
+    }
+}
+
+proc display-result-set-s {setNo targetNo startPos endPos} {
+    global hist
+    global useIcons
+
+    set zz z39$targetNo
+    set host $hist($setNo,$targetNo,host)
+    set idAuth $hist($setNo,$targetNo,idAuthentication)
+    set database $hist($setNo,$targetNo,database)
+    set query $hist($setNo,$targetNo,query)
+
+    set useIcons 1
+
+    if {$startPos == ""} {
+        if {[z39search $setNo 1 $targetNo B] != "1"} {
+            return
+        }
+        set r [$zz.$setNo resultCount]
+
+        set setMax [$zz.$setNo resultCount]
+        if {$setMax > $hist($setNo,maxPresent)} {
+            set setMax $hist($setNo,maxPresent)
+        }
+        buttons-result-set-s $setNo $targetNo $setMax $startPos 0
+
+        set setOffset [$zz.$setNo numberOfRecordsReturned]
+        if {$setMax > 0} {
+            html {<h3> Records 1-} $setMax " out of $r</h3>\n"
+        } else {
+            html "<h3> No hits</h3>\n"
+        }
+        egw_flush
+        html "<ul>\n"
+        display-rec 1 $setMax display-brief $setNo $targetNo
+        incr setOffset
+
+    } else {
+        if {[z39search $setNo 0 $targetNo B] != "1"} {
+            return 
+        }
+        set r [$zz.$setNo resultCount]
+        set setOffset $startPos
+        set setMax [$zz.$setNo resultCount]
+        if {$setMax > $endPos} {
+            set setMax $endPos
+        }
+        buttons-result-set-s $setNo $targetNo $setMax $startPos 0
+        if {$setMax > 0} {
+            html {<h3> Records } $startPos {-} $setMax " out of $r</h3>\n"
+        } else {
+            html "<h3> No hits</h3>\n"
+        }
+        egw_flush
+        html "<ul>\n"
+    }
+    if {$setMax > 0} {
+        z39present $setNo $targetNo $setOffset $setMax display-brief B
+    }
+    html "</ul>\n"
+    set useIcons 0
+    buttons-result-set-s $setNo $targetNo $setMax $startPos 1
+}
+
 proc z39history {} {
     global nextSetNo
     global hist
     global env
     global sessionId
     global targets
+    global html3
+    global scriptQuery
 
     if {![info exists nextSetNo]} {
         return
     }
-    html "<h2>History</h2><dl><br>\n"
+    html "<h2>History</h2><br>\n"
+    if {$html3} {
+        html {<table width=500 border=1><tr>}
+        html {<td align=center><b>Target</b>}
+        html {<td align=center><b>Database</b>}
+        html {<td align=center><b>Hits</b>}
+        html {<td align=center><b>Query</b>}
+        html {<tr>} "\n"
+    } else {
+        html {<dl>} "\n"
+    }
     for {set setNo 1} {$setNo < $nextSetNo} {incr setNo} {
-        if {$hist($setNo,scan) > 0} continue
-        html {<dt> <a href="http:} $env(SCRIPT_NAME)
-        html / $sessionId {/search.egw/} $setNo + 1
-        html + $hist($setNo,maxPresent)
-        html {"> } [lindex $targets($hist($setNo,host)) 0]
-        if {[llength $hist($setNo,database)] > 1} {
-            html ": "
-            foreach b $hist($setNo,database) {
-                html " $b"
-            }
+        if {[info exists hist($setNo,scan)]} {
+            if {$hist($setNo,scan) > 0} continue
         }
-        html "</a> -- "
-        if {[info exists hist($setNo,hits)]} {
-            html $hist($setNo,hits) " hits"
+        if {[info exists hist($setNo,1,host)]} {
+            set start 1
+            set end $hist($setNo,0,host)
         } else {
-            html failed
+            set start 0
+            set end 0
         }
-        html "<dd>\n"
-        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 $hist($setNo,form,menu$i) "=" $hist($setNo,form,entry$i)
-                set op $hist($setNo,form,logic$i)
+        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 {. }
+            }
+            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 {
+                if {$html3} {
+                    html {Failed}
+                } else {
+                    html {Search failed.}
+                }
+            }
+            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 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"
             }
         }
     }
-    html "</dl>\n"
+    if {$html3} {
+        html {</table><p>}
+    } else {
+        html {</dl>}
+    }
+    html "\n"
 }
 
 proc displayError {msga msgb} {
     html "<p><center>\n"
-    html {<img src="/gif/noway.gif" alt="Error">}
+    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="/gif/button-egw.gif" alt="Europagate" border=0></a>}
+        html {<img src="/egwgif/button-egw.gif" alt="Europagate" border=0></a>}
     } else {
-        html {Europagate | }
+        html {Europagate</a>}
     }
 }
 
-proc button-new-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 "\n | "
+        html {User Feedback</a>}
+    }    
+}
+
+proc button-define-target {} {
     global useIcons
     global env
     global sessionId
 
+    if {!$useIcons} {
+        html "\n | "
+    }
     html {<a href="http:} $env(SCRIPT_NAME)
-    html / $sessionId {/targets.egw}
+    html / $sessionId {/tform.egw}
     if {$useIcons} {
-        html {"><img src="/gif/button-new-target.gif" }
+        html {"><img src="/egwgif/button-define-target.gif" }
+	html {alt="Define Target" border=0></a>}
+    } else {
+        html {">Define Target</a>}
+    }
+}
+
+proc button-new-target {} {
+    global useIcons
+    global env
+    global sessionId
+    global scriptTarget
+
+    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}
+    html / $sessionId {/history.egw;}
+    catch { html "/" $nextSetNo}
     if {$useIcons} {
-        html {"><img src="/gif/button-view-history.gif" alt="View History" }
+        html {"><img src="/egwgif/button-view-history.gif" alt="View History" }
         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 scriptQuery
 
+    if {!$useIcons} {
+        html "\n | "
+    }
     html {<a href="http:} $env(SCRIPT_NAME)
-    html / $sessionId {/query.egw/} $hist($setNo,host) + $setNo {">}
+    html / $sessionId / $scriptQuery {;/} $setNo + $hist($setNo,0,host) {">}
+
     if {$useIcons} {
-        html {<img src="/gif/button-new-query.gif" }
+        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-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} {">}
+    if {$useIcons} {
+        html {<img src="/egwgif/button-scan-window.gif" }
+	html {alt="Scan" border=0></a>}
+    } else {
+        html {Scan</a>}
     }
 }
 
 proc maintenance {} {
     html {<hr>This page is maintained by }
-    html {<a href="mailto:pwh@dtv.dk"> Peter Wad Hansen </a>.}
-    html {Last modified 3. 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>}
-}
\ No newline at end of file
+    html {<a href="mailto:nobody"> Nobody </a>.}
+    html {Last modified x x x. <br>}
+}
+
+proc splitHostSpec {host} {
+    set i [string first / $host]
+    if {$i > 1} {
+        incr i -1
+        return [string range $host 0 $i]
+    }
+    return $host
+}
+
+proc splitDatabaseSpec {host} {
+    set i [string first / $host]
+    if {$i > 1} {
+        incr i
+        regsub -all -- - [string range $host $i end] { } res
+        return $res
+    }
+    regsub -all -- - $host {} res
+    return $res
+}
+
+proc mergeHostSpec {host databases} {
+    return ${host}/[join $databases -]
+}
+
+proc mkAssoc {assoc host} {
+    global targets
+
+    if {[catch {$assoc failback fail-response}]} {
+        ir $assoc
+        $assoc maximumRecordSize 1000000
+    } else {
+        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 {
+            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
+}
+