X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2Fz39util.tcl;h=ca41b996fb5c25c49afe78562da19d1fe5e3d1b7;hb=fa0ddb755d3a836e4e13cc05a6ba3eb6b0010958;hp=51d3e1836a330dbed4735043c49962acaddc5ecf;hpb=cd42e5ba6964c47e437820310d91284c74f11bc5;p=egate.git

diff --git a/www/z39util.tcl b/www/z39util.tcl
index 51d3e18..ca41b99 100644
--- a/www/z39util.tcl
+++ b/www/z39util.tcl
@@ -1,5 +1,5 @@
 #
-# $Id: z39util.tcl,v 1.22 1996/01/23 14:22:03 adam Exp $
+# $Id: z39util.tcl,v 1.24 1996/01/24 14:14:20 adam Exp $
 #
 proc saveState {} {
     uplevel #0 {
@@ -208,7 +208,7 @@ proc display-raw {zset no tno} {
             }
             html $data
         }
-        htmlr {<br>}
+        html "<br>\n"
     }
 }
 
@@ -432,9 +432,9 @@ proc display-rec {from to dfunc tno} {
 proc build-scan {t i} {
     global targets
 
-    set term [wform entry$i]
+    set term [egw_form entry$i]
     if {$term != ""} {
-        set field [join [wform menu$i]]
+        set field [join [egw_form menu$i]]
         set attr {Title}
         foreach x [lindex $targets($t) 2] {
             if {[lindex $x 0] == $field} {
@@ -452,9 +452,9 @@ proc build-query {t ilines} {
     set op {}
     set q {}
     for {set i 1} {$i <= $ilines} {incr i} {
-        set term [join [wform entry$i]]
+        set term [join [egw_form entry$i]]
         if {[string length $term] > 0} {
-            set field [join [wform menu$i]]
+            set field [join [egw_form menu$i]]
             foreach x [lindex $targets($t) 2] {
                 if {[lindex $x 0] == $field} {
                     set attr [lindex $x 1]
@@ -470,7 +470,7 @@ proc build-query {t ilines} {
             {}
                 { set q "${attr} ${term}" }
             }
-            set op [wform logic$i]
+            set op [egw_form logic$i]
         }
     }
     return $q
@@ -513,7 +513,7 @@ proc z39scan {setNo scanNo tno scanLines scanPos cache} {
             displayError "Cannot connect to target" $host
             return 0
         } elseif {$sessionWait == 0} {
-            if {[catch {zwait sessionWait 300}]} {
+            if {[catch {egw_wait sessionWait 300}]} {
 		$zz disconnect
                 displayError "Cannot connect to target" $host
                 return 0
@@ -530,7 +530,7 @@ proc z39scan {setNo scanNo tno scanLines scanPos cache} {
 	    $zz disconnect
             return 0
         }
-        if {[catch {zwait sessionWait 60}]} {
+        if {[catch {egw_wait sessionWait 60}]} {
             displayError "Cannot initialize target" $host
 	    $zz disconnect
             return 0
@@ -563,8 +563,8 @@ proc z39scan {setNo scanNo tno scanLines scanPos cache} {
     set sessionWait 0
     $zs scan "${scanAttr} ${scanTerm}"
 
-    if {[catch {zwait sessionWait 60}]} {
-        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
@@ -655,7 +655,7 @@ proc z39search {setNo piggy tno elements} {
             displayError "Cannot connect to target" $host
             return 0
         } elseif {$sessionWait == 0} {
-            if {[catch {zwait sessionWait 300}]} {
+            if {[catch {egw_wait sessionWait 300}]} {
 		$zz disconnect
                 displayError "Cannot connect to target" $host
                 return 0
@@ -672,7 +672,7 @@ proc z39search {setNo piggy tno elements} {
 	    $zz disconnect
             return 0
         }
-        if {[catch {zwait sessionWait 60}]} {
+        if {[catch {egw_wait sessionWait 60}]} {
             displayError "Cannot initialize target" $host
 	    $zz disconnect
             return 0
@@ -704,7 +704,7 @@ 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
@@ -722,8 +722,8 @@ proc z39search {setNo piggy tno elements} {
     set sessionWait 0
     $zz.$setNo search $query
 
-    if {[catch {zwait sessionWait 600}]} {
-        wlog debug "timeout/cancel in search"
+    if {[catch {egw_wait sessionWait 600}]} {
+        egw_log debug "timeout/cancel in search"
         displayError "Timeout in search" {}
         html "</body></html>\n"
         $zz disconnect
@@ -746,7 +746,7 @@ 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
@@ -756,7 +756,7 @@ 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
@@ -768,7 +768,7 @@ 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
 }
@@ -819,8 +819,8 @@ proc z39msearch {setNo piggy elements} {
         } 
     }
     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 10}]} {
             break
         }
     }
@@ -855,7 +855,7 @@ proc z39msearch {setNo piggy elements} {
                 z39$i.$setNo mediumSetPresentNumber 0
             }
             set zstatus($i) 1
-            wlog debug "search " $hist($setNo,$i,query)
+            egw_log debug "search " $hist($setNo,$i,query)
             z39$i.$setNo search $hist($setNo,$i,query)
             incr zleft
         } else {
@@ -863,8 +863,8 @@ proc z39msearch {setNo piggy elements} {
         }
     }
     while {$zleft > 0} {
-        wlog debug "Waiting for search response"
-        if {[catch {zwait zleft 30}]} {
+        egw_log debug "Waiting for search response"
+        if {[catch {egw_wait zleft 30}]} {
             break
         }
     }
@@ -909,8 +909,8 @@ proc z39present {setNo tno setOffset setMax dfunc elements} {
         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
 	    }
@@ -928,7 +928,7 @@ proc z39present {setNo tno setOffset setMax dfunc elements} {
         display-rec $setOffset [expr $got + $setOffset - 1] $dfunc $tno
         set setOffset [expr $got + $setOffset]
         set toGet [expr 1 + $setMax - $setOffset]
-        wflush
+        egw_flush
     }
 }
 
@@ -998,6 +998,26 @@ proc button-europagate {} {
     }
 }
 
+proc button-define-target {more} {
+    global useIcons
+    global env
+    global sessionId
+
+    html {<a href="http:} $env(SCRIPT_NAME)
+    html / $sessionId {/tform.egw}
+    if {$useIcons} {
+        html {"><img src="/egwgif/button-define-target.gif" }
+	html {alt="New Target" border=0></a>}
+    } else {
+        html {">New Target</a>}
+        if {$more} {
+            html " | \n"
+        } else {
+            html "\n"
+        }
+    }
+}
+
 proc button-new-target {more} {
     global useIcons
     global env
@@ -1085,7 +1105,7 @@ 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 9. january 1996. <br>}
+    html {Last modified 24. 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>}
 }